rpms/cegui/devel cegui-0.6.0-fixweaksymbol.patch, NONE, 1.1 cegui-0.6.0-release-as-so-ver.patch, NONE, 1.1 cegui-0.6.0-system-tinyxml.patch, NONE, 1.1 cegui-0.6.0-system-tolua++.patch, NONE, 1.1 cegui-0.6.0-userverso.patch, NONE, 1.1 .cvsignore, 1.3, 1.4 cegui.spec, 1.9, 1.10 sources, 1.3, 1.4 cegui-0.5.0-fixweaksymbol.patch, 1.1, NONE cegui-0.5.0-lua51.patch, 1.1, NONE cegui-0.5.0-userverso.patch, 1.1, NONE cegui-0.5.0-xerces-c-2.8.patch, 1.1, NONE
Hans de Goede (jwrdegoede)
fedora-extras-commits at redhat.com
Mon May 19 12:03:19 UTC 2008
Author: jwrdegoede
Update of /cvs/extras/rpms/cegui/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv26066
Modified Files:
.cvsignore cegui.spec sources
Added Files:
cegui-0.6.0-fixweaksymbol.patch
cegui-0.6.0-release-as-so-ver.patch
cegui-0.6.0-system-tinyxml.patch
cegui-0.6.0-system-tolua++.patch cegui-0.6.0-userverso.patch
Removed Files:
cegui-0.5.0-fixweaksymbol.patch cegui-0.5.0-lua51.patch
cegui-0.5.0-userverso.patch cegui-0.5.0-xerces-c-2.8.patch
Log Message:
* Sun May 18 2008 Hans de Goede <j.w.r.degoede at hhs.nl> 0.6.0-1
- New upstream release 0.6.0
- No ABI stability, use full versioned (libtool -release) sonames
- Use system tolua++, change license tag to match
- Use system tinyxml
cegui-0.6.0-fixweaksymbol.patch:
--- NEW FILE cegui-0.6.0-fixweaksymbol.patch ---
diff -up CEGUI-0.6.0/ImageCodecModules/DevILImageCodec/Makefile.am~ CEGUI-0.6.0/ImageCodecModules/DevILImageCodec/Makefile.am
--- CEGUI-0.6.0/ImageCodecModules/DevILImageCodec/Makefile.am~ 2008-05-18 22:10:04.000000000 +0200
+++ CEGUI-0.6.0/ImageCodecModules/DevILImageCodec/Makefile.am 2008-05-18 22:10:04.000000000 +0200
@@ -2,15 +2,12 @@ INCLUDES=-I$(top_srcdir)/include $(DevIL
pkgincludedir=$(prefix)/include/CEGUI/ImageCodecModules/DevILImageCodec
-libCEGUIDevILImageCodec_la_LIBADD =
-
if MINGW32_BUILD
libCEGUIDevILImageCodec_la_CPPFLAGS = -DCEGUIDEVILIMAGECODEC_EXPORTS
libCEGUIDevILImageCodec_la_LDFLAGS = -no-undefined -avoid-version
-libCEGUIDevILImageCodec_la_LIBADD += -L$(top_builddir)/src -lCEGUIBase
endif
-libCEGUIDevILImageCodec_la_LIBADD += $(DevIL_LIBS)
+libCEGUIDevILImageCodec_la_LIBADD = $(DevIL_LIBS) ../../src/libCEGUIBase.la
lib_LTLIBRARIES=libCEGUIDevILImageCodec.la
diff -up CEGUI-0.6.0/ImageCodecModules/FreeImageImageCodec/Makefile.am.foobar CEGUI-0.6.0/ImageCodecModules/FreeImageImageCodec/Makefile.am
--- CEGUI-0.6.0/ImageCodecModules/FreeImageImageCodec/Makefile.am.foobar 2008-02-08 21:50:51.000000000 +0100
+++ CEGUI-0.6.0/ImageCodecModules/FreeImageImageCodec/Makefile.am 2008-05-18 12:15:16.000000000 +0200
@@ -1,15 +1,12 @@
INCLUDES=-I$(top_srcdir)/include $(FreeImage_CFLAGS)
pkgincludedir=$(prefix)/include/CEGUI/ImageCodecModules/FreeImageImageCodec
-libCEGUIFreeImageImageCodec_la_LIBADD =
-
if MINGW32_BUILD
libCEGUIFreeImageImageCodec_la_CPPFLAGS = -DCEGUIFREEIMAGEIMAGECODEC_EXPORTS
libCEGUIFreeImageImageCodec_la_LDFLAGS = -no-undefined -avoid-version
-libCEGUIFreeImageImageCodec_la_LIBADD += -L$(top_builddir)/src -lCEGUIBase
endif
-libCEGUIFreeImageImageCodec_la_LIBADD += $(FreeImage_LIBS)
+libCEGUIFreeImageImageCodec_la_LIBADD = $(FreeImage_LIBS) ../../src/libCEGUIBase.la
lib_LTLIBRARIES=libCEGUIFreeImageImageCodec.la
diff -up CEGUI-0.6.0/ImageCodecModules/SILLYImageCodec/Makefile.am.foobar CEGUI-0.6.0/ImageCodecModules/SILLYImageCodec/Makefile.am
--- CEGUI-0.6.0/ImageCodecModules/SILLYImageCodec/Makefile.am.foobar 2008-02-08 21:50:51.000000000 +0100
+++ CEGUI-0.6.0/ImageCodecModules/SILLYImageCodec/Makefile.am 2008-05-18 12:15:54.000000000 +0200
@@ -1,15 +1,12 @@
INCLUDES=-I$(top_srcdir)/include $(SILLY_CFLAGS)
pkgincludedir=$(prefix)/include/CEGUI/ImageCodecModules/SILLYImageCodec
-libCEGUISILLYImageCodec_la_LIBADD =
-
if MINGW32_BUILD
libCEGUISILLYImageCodec_la_CPPFLAGS = -DCEGUISILLYIMAGECODEC_EXPORTS
libCEGUISILLYImageCodec_la_LDFLAGS = -no-undefined -avoid-version
-libCEGUISILLYImageCodec_la_LIBADD += -L$(top_builddir)/src -lCEGUIBase
endif
-libCEGUISILLYImageCodec_la_LIBADD += $(SILLY_LIBS)
+libCEGUISILLYImageCodec_la_LIBADD = $(SILLY_LIBS) ../../src/libCEGUIBase.la
lib_LTLIBRARIES=libCEGUISILLYImageCodec.la
diff -up CEGUI-0.6.0/ImageCodecModules/TGAImageCodec/Makefile.am.foobar CEGUI-0.6.0/ImageCodecModules/TGAImageCodec/Makefile.am
--- CEGUI-0.6.0/ImageCodecModules/TGAImageCodec/Makefile.am.foobar 2008-02-08 21:50:51.000000000 +0100
+++ CEGUI-0.6.0/ImageCodecModules/TGAImageCodec/Makefile.am 2008-05-18 12:16:16.000000000 +0200
@@ -4,11 +4,11 @@ pkgincludedir=$(prefix)/include/CEGUI/Im
if MINGW32_BUILD
libCEGUITGAImageCodec_la_CPPFLAGS = -DCEGUITGAIMAGECODEC_EXPORTS
libCEGUITGAImageCodec_la_LDFLAGS = -no-undefined -avoid-version
-libCEGUITGAImageCodec_la_LIBADD = -L$(top_builddir)/src -lCEGUIBase
endif
lib_LTLIBRARIES=libCEGUITGAImageCodec.la
libCEGUITGAImageCodec_la_SOURCES = CEGUITGAImageCodec.cpp CEGUITGAImageCodecModule.cpp
+libCEGUITGAImageCodec_la_LIBADD = ../../src/libCEGUIBase.la
pkginclude_HEADERS = CEGUITGAImageCodec.h CEGUITGAImageCodecModule.h
diff -up CEGUI-0.6.0/RendererModules/OpenGLGUIRenderer/Makefile.am.foobar CEGUI-0.6.0/RendererModules/OpenGLGUIRenderer/Makefile.am
--- CEGUI-0.6.0/RendererModules/OpenGLGUIRenderer/Makefile.am.foobar 2008-02-08 21:50:51.000000000 +0100
+++ CEGUI-0.6.0/RendererModules/OpenGLGUIRenderer/Makefile.am 2008-05-18 12:21:19.000000000 +0200
@@ -3,15 +3,13 @@ pkgincludedir=$(prefix)/include/CEGUI/Re
pkginclude_HEADERS = openglrenderer.h opengltexture.h
libCEGUIOpenGLRenderer_la_LDFLAGS =
-libCEGUIOpenGLRenderer_la_LIBADD =
if MINGW32_BUILD
libCEGUIOpenGLRenderer_la_CPPFLAGS = -DOPENGL_GUIRENDERER_EXPORTS
libCEGUIOpenGLRenderer_la_LDFLAGS += -no-undefined
-libCEGUIOpenGLRenderer_la_LIBADD += -L$(top_builddir)/src -lCEGUIBase
endif
-libCEGUIOpenGLRenderer_la_LIBADD += $(OpenGL_LIBS)
+libCEGUIOpenGLRenderer_la_LIBADD = $(OpenGL_LIBS) ../../src/libCEGUIBase.la
libCEGUIOpenGLRenderer_la_LDFLAGS += -version-info @CEGUI_OPENGL_VERSION_INFO@
diff -up CEGUI-0.6.0/ScriptingModules/CEGUILua/LuaScriptModule/src/Makefile.am.foobar CEGUI-0.6.0/ScriptingModules/CEGUILua/LuaScriptModule/src/Makefile.am
--- CEGUI-0.6.0/ScriptingModules/CEGUILua/LuaScriptModule/src/Makefile.am.foobar 2008-02-09 17:09:17.000000000 +0100
+++ CEGUI-0.6.0/ScriptingModules/CEGUILua/LuaScriptModule/src/Makefile.am 2008-05-18 12:20:09.000000000 +0200
@@ -8,9 +8,6 @@ libCEGUILuaScriptModule_la_CPPFLAGS = $(
if MINGW32_BUILD
libCEGUILuaScriptModule_la_CPPFLAGS += -DCEGUILUA_EXPORTS
libCEGUILuaScriptModule_la_LDFLAGS += -no-undefined -avoid-version
-libCEGUILuaScriptModule_la_LIBADD = -L$(top_builddir)/src/ \
- -L$(top_builddir)/ScriptingModules/CEGUILua/tolua++ \
- -lCEGUIBase -lCEGUItoluapp $(Lua_LIBS)
endif
libCEGUILuaScriptModule_la_LDFLAGS += -version-info @CEGUI_VERSION_INFO@
@@ -22,5 +19,6 @@ libCEGUILuaScriptModule_la_SOURCES = lua
CEGUILua.cpp \
CEGUILuaFunctor.cpp \
required.cpp
+libCEGUILuaScriptModule_la_LIBADD = ../../../../src/libCEGUIBase.la ../../tolua++/libCEGUItoluapp.la
noinst_HEADERS = required.h
diff -up CEGUI-0.6.0/XMLParserModules/TinyXMLParser/Makefile.am.foobar CEGUI-0.6.0/XMLParserModules/TinyXMLParser/Makefile.am
--- CEGUI-0.6.0/XMLParserModules/TinyXMLParser/Makefile.am.foobar 2008-02-08 21:50:51.000000000 +0100
+++ CEGUI-0.6.0/XMLParserModules/TinyXMLParser/Makefile.am 2008-05-18 12:16:36.000000000 +0200
@@ -3,7 +3,6 @@ INCLUDES = -I$(top_srcdir)/include
if MINGW32_BUILD
libCEGUITinyXMLParser_la_CPPFLAGS = -DCEGUITINYXMLPARSER_EXPORTS
libCEGUITinyXMLParser_la_LDFLAGS = -no-undefined -avoid-version
-libCEGUITinyXMLParser_la_LIBADD = -L$(top_builddir)/src -lCEGUIBase
endif
lib_LTLIBRARIES=libCEGUITinyXMLParser.la
@@ -14,6 +13,7 @@ libCEGUITinyXMLParser_la_SOURCES = CEGUI
ceguitinyxml/tinyxml.cpp \
ceguitinyxml/tinyxmlerror.cpp \
ceguitinyxml/tinyxmlparser.cpp
+libCEGUITinyXMLParser_la_LIBADD = ../../src/libCEGUIBase.la
pkgincludedir=$(prefix)/include/CEGUI/XMLParserModules/TinyXMLParser
pkginclude_HEADERS = CEGUITinyXMLParser.h CEGUITinyXMLParserModule.h
diff -up CEGUI-0.6.0/XMLParserModules/XercesParser/Makefile.am.foobar CEGUI-0.6.0/XMLParserModules/XercesParser/Makefile.am
--- CEGUI-0.6.0/XMLParserModules/XercesParser/Makefile.am.foobar 2008-02-08 21:50:51.000000000 +0100
+++ CEGUI-0.6.0/XMLParserModules/XercesParser/Makefile.am 2008-05-18 12:16:52.000000000 +0200
@@ -1,14 +1,11 @@
INCLUDES = -I$(top_srcdir)/include $(xerces_CFLAGS)
-libCEGUIXercesParser_la_LIBADD =
-
if MINGW32_BUILD
libCEGUIXercesParser_la_CPPFLAGS = -DCEGUIXERCESPARSER_EXPORTS
libCEGUIXercesParser_la_LDFLAGS = -no-undefined -avoid-version
-libCEGUIXercesParser_la_LIBADD += -L$(top_builddir)/src -lCEGUIBase
endif
-libCEGUIXercesParser_la_LIBADD += $(xerces_LIBS)
+libCEGUIXercesParser_la_LIBADD = $(xerces_LIBS) ../../src/libCEGUIBase.la
lib_LTLIBRARIES=libCEGUIXercesParser.la
diff -up CEGUI-0.6.0/XMLParserModules/expatParser/Makefile.am.foobar CEGUI-0.6.0/XMLParserModules/expatParser/Makefile.am
--- CEGUI-0.6.0/XMLParserModules/expatParser/Makefile.am.foobar 2008-02-08 21:50:51.000000000 +0100
+++ CEGUI-0.6.0/XMLParserModules/expatParser/Makefile.am 2008-05-18 12:17:03.000000000 +0200
@@ -1,14 +1,11 @@
INCLUDES = -I$(top_srcdir)/include $(expat_CFLAGS)
-libCEGUIExpatParser_la_LIBADD =
-
if MINGW32_BUILD
libCEGUIExpatParser_la_CPPFLAGS = -DCEGUIEXPATPARSER_EXPORTS
libCEGUIExpatParser_la_LDFLAGS = -no-undefined -avoid-version
-libCEGUIExpatParser_la_LIBADD += -L$(top_builddir)/src -lCEGUIBase
endif
-libCEGUIExpatParser_la_LIBADD += $(expat_LIBS)
+libCEGUIExpatParser_la_LIBADD = $(expat_LIBS) ../../src/libCEGUIBase.la
lib_LTLIBRARIES=libCEGUIExpatParser.la
diff -up CEGUI-0.6.0/XMLParserModules/libxmlParser/Makefile.am.foobar CEGUI-0.6.0/XMLParserModules/libxmlParser/Makefile.am
--- CEGUI-0.6.0/XMLParserModules/libxmlParser/Makefile.am.foobar 2008-02-08 21:50:51.000000000 +0100
+++ CEGUI-0.6.0/XMLParserModules/libxmlParser/Makefile.am 2008-05-18 12:17:16.000000000 +0200
@@ -1,14 +1,11 @@
INCLUDES = -I$(top_srcdir)/include $(libxml_CFLAGS)
-libCEGUILibxmlParser_la_LIBADD =
-
if MINGW32_BUILD
libCEGUILibxmlParser_la_CPPFLAGS = -DCEGUILIBXMLPARSER_EXPORTS
libCEGUILibxmlParser_la_LDFLAGS = -no-undefined -avoid-version
-libCEGUILibxmlParser_la_LIBADD += -L$(top_builddir)/src -lCEGUIBase
endif
-libCEGUILibxmlParser_la_LIBADD += $(libxml_LIBS)
+libCEGUILibxmlParser_la_LIBADD = $(libxml_LIBS) ../../src/libCEGUIBase.la
lib_LTLIBRARIES=libCEGUILibxmlParser.la
diff -up CEGUI-0.6.0/WindowRendererSets/Falagard/src/Makefile.am~ CEGUI-0.6.0/WindowRendererSets/Falagard/src/Makefile.am
--- CEGUI-0.6.0/WindowRendererSets/Falagard/src/Makefile.am~ 2008-05-18 22:15:43.000000000 +0200
+++ CEGUI-0.6.0/WindowRendererSets/Falagard/src/Makefile.am 2008-05-18 22:15:43.000000000 +0200
@@ -6,11 +6,12 @@ libCEGUIFalagardWRBase_la_LDFLAGS =
if MINGW32_BUILD
libCEGUIFalagardWRBase_la_CPPFLAGS = -DFALAGARDWRBASE_EXPORTS -DCEGUIWRMODULE_EXPORTS
libCEGUIFalagardWRBase_la_LDFLAGS += -no-undefined -avoid-version
-libCEGUIFalagardWRBase_la_LIBADD = -L$(top_builddir)/src/ -lCEGUIBase
endif
libCEGUIFalagardWRBase_la_LDFLAGS += -version-info @CEGUI_VERSION_INFO@
+libCEGUIFalagardWRBase_la_LIBADD = ../../../src/libCEGUIBase.la
+
lib_LTLIBRARIES=libCEGUIFalagardWRBase.la
libCEGUIFalagardWRBase_la_SOURCES = FalButton.cpp \
diff -up CEGUI-0.6.0/ImageCodecModules/DevILImageCodec/Makefile.in.foobar CEGUI-0.6.0/ImageCodecModules/DevILImageCodec/Makefile.in
--- CEGUI-0.6.0/ImageCodecModules/DevILImageCodec/Makefile.in.foobar 2008-03-25 11:04:27.000000000 +0100
+++ CEGUI-0.6.0/ImageCodecModules/DevILImageCodec/Makefile.in 2008-05-18 12:11:00.000000000 +0200
@@ -225,7 +225,7 @@ xerces_CFLAGS = @xerces_CFLAGS@
xerces_LIBS = @xerces_LIBS@
INCLUDES = -I$(top_srcdir)/include $(DevIL_CFLAGS)
-libCEGUIDevILImageCodec_la_LIBADD = $(am__append_1) $(DevIL_LIBS)
+libCEGUIDevILImageCodec_la_LIBADD = $(am__append_1) $(DevIL_LIBS) ../../src/libCEGUIBase.la
@MINGW32_BUILD_TRUE at libCEGUIDevILImageCodec_la_CPPFLAGS = -DCEGUIDEVILIMAGECODEC_EXPORTS
@MINGW32_BUILD_TRUE at libCEGUIDevILImageCodec_la_LDFLAGS = -no-undefined -avoid-version
diff -up CEGUI-0.6.0/ImageCodecModules/FreeImageImageCodec/Makefile.in.foobar CEGUI-0.6.0/ImageCodecModules/FreeImageImageCodec/Makefile.in
--- CEGUI-0.6.0/ImageCodecModules/FreeImageImageCodec/Makefile.in.foobar 2008-03-25 11:04:27.000000000 +0100
+++ CEGUI-0.6.0/ImageCodecModules/FreeImageImageCodec/Makefile.in 2008-05-18 12:11:00.000000000 +0200
@@ -224,7 +224,7 @@ xerces_CFLAGS = @xerces_CFLAGS@
xerces_LIBS = @xerces_LIBS@
INCLUDES = -I$(top_srcdir)/include $(FreeImage_CFLAGS)
-libCEGUIFreeImageImageCodec_la_LIBADD = $(am__append_1) $(FreeImage_LIBS)
+libCEGUIFreeImageImageCodec_la_LIBADD = $(am__append_1) $(FreeImage_LIBS) ../../src/libCEGUIBase.la
@MINGW32_BUILD_TRUE at libCEGUIFreeImageImageCodec_la_CPPFLAGS = -DCEGUIFREEIMAGEIMAGECODEC_EXPORTS
@MINGW32_BUILD_TRUE at libCEGUIFreeImageImageCodec_la_LDFLAGS = -no-undefined -avoid-version
diff -up CEGUI-0.6.0/ImageCodecModules/SILLYImageCodec/Makefile.in.foobar CEGUI-0.6.0/ImageCodecModules/SILLYImageCodec/Makefile.in
--- CEGUI-0.6.0/ImageCodecModules/SILLYImageCodec/Makefile.in.foobar 2008-03-25 11:04:28.000000000 +0100
+++ CEGUI-0.6.0/ImageCodecModules/SILLYImageCodec/Makefile.in 2008-05-18 12:11:00.000000000 +0200
@@ -224,7 +224,7 @@ xerces_CFLAGS = @xerces_CFLAGS@
xerces_LIBS = @xerces_LIBS@
INCLUDES = -I$(top_srcdir)/include $(SILLY_CFLAGS)
-libCEGUISILLYImageCodec_la_LIBADD = $(am__append_1) $(SILLY_LIBS)
+libCEGUISILLYImageCodec_la_LIBADD = $(am__append_1) $(SILLY_LIBS) ../../src/libCEGUIBase.la
@MINGW32_BUILD_TRUE at libCEGUISILLYImageCodec_la_CPPFLAGS = -DCEGUISILLYIMAGECODEC_EXPORTS
@MINGW32_BUILD_TRUE at libCEGUISILLYImageCodec_la_LDFLAGS = -no-undefined -avoid-version
diff -up CEGUI-0.6.0/ImageCodecModules/TGAImageCodec/Makefile.in.foobar CEGUI-0.6.0/ImageCodecModules/TGAImageCodec/Makefile.in
--- CEGUI-0.6.0/ImageCodecModules/TGAImageCodec/Makefile.in.foobar 2008-03-25 11:04:28.000000000 +0100
+++ CEGUI-0.6.0/ImageCodecModules/TGAImageCodec/Makefile.in 2008-05-18 12:11:00.000000000 +0200
@@ -225,7 +225,8 @@ INCLUDES = -I$(top_srcdir)/include
@MINGW32_BUILD_TRUE at libCEGUITGAImageCodec_la_CPPFLAGS = -DCEGUITGAIMAGECODEC_EXPORTS
@MINGW32_BUILD_TRUE at libCEGUITGAImageCodec_la_LDFLAGS = -no-undefined -avoid-version
- at MINGW32_BUILD_TRUE@libCEGUITGAImageCodec_la_LIBADD = -L$(top_builddir)/src -lCEGUIBase
+
+libCEGUITGAImageCodec_la_LIBADD = ../../src/libCEGUIBase.la
lib_LTLIBRARIES = libCEGUITGAImageCodec.la
libCEGUITGAImageCodec_la_SOURCES = CEGUITGAImageCodec.cpp CEGUITGAImageCodecModule.cpp
diff -up CEGUI-0.6.0/RendererModules/OpenGLGUIRenderer/Makefile.in.foobar CEGUI-0.6.0/RendererModules/OpenGLGUIRenderer/Makefile.in
--- CEGUI-0.6.0/RendererModules/OpenGLGUIRenderer/Makefile.in.foobar 2008-03-25 11:04:28.000000000 +0100
+++ CEGUI-0.6.0/RendererModules/OpenGLGUIRenderer/Makefile.in 2008-05-18 12:11:00.000000000 +0200
@@ -228,7 +228,7 @@ pkginclude_HEADERS = openglrenderer.h op
libCEGUIOpenGLRenderer_la_LDFLAGS = $(am__append_1) -version-info @CEGUI_OPENGL_VERSION_INFO@
-libCEGUIOpenGLRenderer_la_LIBADD = $(am__append_2) $(OpenGL_LIBS)
+libCEGUIOpenGLRenderer_la_LIBADD = $(am__append_2) $(OpenGL_LIBS) ../../src/libCEGUIBase.la
@MINGW32_BUILD_TRUE at libCEGUIOpenGLRenderer_la_CPPFLAGS = -DOPENGL_GUIRENDERER_EXPORTS
diff -up CEGUI-0.6.0/ScriptingModules/CEGUILua/LuaScriptModule/src/Makefile.in.foobar CEGUI-0.6.0/ScriptingModules/CEGUILua/LuaScriptModule/src/Makefile.in
--- CEGUI-0.6.0/ScriptingModules/CEGUILua/LuaScriptModule/src/Makefile.in.foobar 2008-03-25 11:04:30.000000000 +0100
+++ CEGUI-0.6.0/ScriptingModules/CEGUILua/LuaScriptModule/src/Makefile.in 2008-05-18 12:11:00.000000000 +0200
@@ -230,10 +230,7 @@ INCLUDES = -I$(top_srcdir)/include \
libCEGUILuaScriptModule_la_LDFLAGS = $(am__append_2) -version-info @CEGUI_VERSION_INFO@
libCEGUILuaScriptModule_la_CPPFLAGS = $(Lua_CFLAGS) $(am__append_1)
- at MINGW32_BUILD_TRUE@libCEGUILuaScriptModule_la_LIBADD = -L$(top_builddir)/src/ \
- at MINGW32_BUILD_TRUE@ -L$(top_builddir)/ScriptingModules/CEGUILua/tolua++ \
- at MINGW32_BUILD_TRUE@ -lCEGUIBase -lCEGUItoluapp $(Lua_LIBS)
-
+libCEGUILuaScriptModule_la_LIBADD = ../../../../src/libCEGUIBase.la ../../tolua++/libCEGUItoluapp.la
lib_LTLIBRARIES = libCEGUILuaScriptModule.la
diff -up CEGUI-0.6.0/XMLParserModules/TinyXMLParser/Makefile.in.foobar CEGUI-0.6.0/XMLParserModules/TinyXMLParser/Makefile.in
--- CEGUI-0.6.0/XMLParserModules/TinyXMLParser/Makefile.in.foobar 2008-03-25 11:04:31.000000000 +0100
+++ CEGUI-0.6.0/XMLParserModules/TinyXMLParser/Makefile.in 2008-05-18 12:11:00.000000000 +0200
@@ -226,7 +226,8 @@ INCLUDES = -I$(top_srcdir)/include
@MINGW32_BUILD_TRUE at libCEGUITinyXMLParser_la_CPPFLAGS = -DCEGUITINYXMLPARSER_EXPORTS
@MINGW32_BUILD_TRUE at libCEGUITinyXMLParser_la_LDFLAGS = -no-undefined -avoid-version
- at MINGW32_BUILD_TRUE@libCEGUITinyXMLParser_la_LIBADD = -L$(top_builddir)/src -lCEGUIBase
+
+libCEGUITinyXMLParser_la_LIBADD = ../../src/libCEGUIBase.la
lib_LTLIBRARIES = libCEGUITinyXMLParser.la
diff -up CEGUI-0.6.0/XMLParserModules/XercesParser/Makefile.in.foobar CEGUI-0.6.0/XMLParserModules/XercesParser/Makefile.in
--- CEGUI-0.6.0/XMLParserModules/XercesParser/Makefile.in.foobar 2008-03-25 11:04:31.000000000 +0100
+++ CEGUI-0.6.0/XMLParserModules/XercesParser/Makefile.in 2008-05-18 12:11:00.000000000 +0200
@@ -224,7 +224,7 @@ xerces_CFLAGS = @xerces_CFLAGS@
xerces_LIBS = @xerces_LIBS@
INCLUDES = -I$(top_srcdir)/include $(xerces_CFLAGS)
-libCEGUIXercesParser_la_LIBADD = $(am__append_1) $(xerces_LIBS)
+libCEGUIXercesParser_la_LIBADD = $(am__append_1) $(xerces_LIBS) ../../src/libCEGUIBase.la
@MINGW32_BUILD_TRUE at libCEGUIXercesParser_la_CPPFLAGS = -DCEGUIXERCESPARSER_EXPORTS
@MINGW32_BUILD_TRUE at libCEGUIXercesParser_la_LDFLAGS = -no-undefined -avoid-version
diff -up CEGUI-0.6.0/XMLParserModules/expatParser/Makefile.in.foobar CEGUI-0.6.0/XMLParserModules/expatParser/Makefile.in
--- CEGUI-0.6.0/XMLParserModules/expatParser/Makefile.in.foobar 2008-03-25 11:04:31.000000000 +0100
+++ CEGUI-0.6.0/XMLParserModules/expatParser/Makefile.in 2008-05-18 12:11:00.000000000 +0200
@@ -224,7 +224,7 @@ xerces_CFLAGS = @xerces_CFLAGS@
xerces_LIBS = @xerces_LIBS@
INCLUDES = -I$(top_srcdir)/include $(expat_CFLAGS)
-libCEGUIExpatParser_la_LIBADD = $(am__append_1) $(expat_LIBS)
+libCEGUIExpatParser_la_LIBADD = $(am__append_1) $(expat_LIBS) ../../src/libCEGUIBase.la
@MINGW32_BUILD_TRUE at libCEGUIExpatParser_la_CPPFLAGS = -DCEGUIEXPATPARSER_EXPORTS
@MINGW32_BUILD_TRUE at libCEGUIExpatParser_la_LDFLAGS = -no-undefined -avoid-version
diff -up CEGUI-0.6.0/XMLParserModules/libxmlParser/Makefile.in.foobar CEGUI-0.6.0/XMLParserModules/libxmlParser/Makefile.in
--- CEGUI-0.6.0/XMLParserModules/libxmlParser/Makefile.in.foobar 2008-03-25 11:04:31.000000000 +0100
+++ CEGUI-0.6.0/XMLParserModules/libxmlParser/Makefile.in 2008-05-18 12:11:00.000000000 +0200
@@ -225,7 +225,7 @@ xerces_CFLAGS = @xerces_CFLAGS@
xerces_LIBS = @xerces_LIBS@
INCLUDES = -I$(top_srcdir)/include $(libxml_CFLAGS)
-libCEGUILibxmlParser_la_LIBADD = $(am__append_1) $(libxml_LIBS)
+libCEGUILibxmlParser_la_LIBADD = $(am__append_1) $(libxml_LIBS) ../../src/libCEGUIBase.la
@MINGW32_BUILD_TRUE at libCEGUILibxmlParser_la_CPPFLAGS = -DCEGUILIBXMLPARSER_EXPORTS
@MINGW32_BUILD_TRUE at libCEGUILibxmlParser_la_LDFLAGS = -no-undefined -avoid-version
diff -up CEGUI-0.6.0/WindowRendererSets/Falagard/src/Makefile.in~ CEGUI-0.6.0/WindowRendererSets/Falagard/src/Makefile.in
--- CEGUI-0.6.0/WindowRendererSets/Falagard/src/Makefile.in~ 2008-05-18 22:15:58.000000000 +0200
+++ CEGUI-0.6.0/WindowRendererSets/Falagard/src/Makefile.in 2008-05-18 22:15:58.000000000 +0200
@@ -229,7 +229,8 @@ INCLUDES = -I$(top_srcdir)/include \
libCEGUIFalagardWRBase_la_LDFLAGS = $(am__append_1) -version-info @CEGUI_VERSION_INFO@
@MINGW32_BUILD_TRUE at libCEGUIFalagardWRBase_la_CPPFLAGS = -DFALAGARDWRBASE_EXPORTS -DCEGUIWRMODULE_EXPORTS
- at MINGW32_BUILD_TRUE@libCEGUIFalagardWRBase_la_LIBADD = -L$(top_builddir)/src/ -lCEGUIBase
+
+libCEGUIFalagardWRBase_la_LIBADD = ../../../src/libCEGUIBase.la
lib_LTLIBRARIES = libCEGUIFalagardWRBase.la
cegui-0.6.0-release-as-so-ver.patch:
--- NEW FILE cegui-0.6.0-release-as-so-ver.patch ---
diff -up CEGUI-0.6.0/ImageCodecModules/CoronaImageCodec/Makefile.am~ CEGUI-0.6.0/ImageCodecModules/CoronaImageCodec/Makefile.am
--- CEGUI-0.6.0/ImageCodecModules/CoronaImageCodec/Makefile.am~ 2008-05-18 22:18:51.000000000 +0200
+++ CEGUI-0.6.0/ImageCodecModules/CoronaImageCodec/Makefile.am 2008-05-18 22:18:51.000000000 +0200
@@ -7,6 +7,8 @@ if MINGW32_BUILD
libCEGUICoronaImageCodec_la_CPPFLAGS = -DCEGUICORONAIMAGECODEC_EXPORTS
libCEGUICoronaImageCodec_la_LDFLAGS = -no-undefined -avoid-version
libCEGUICoronaImageCodec_la_LIBADD += -L$(top_builddir)/src -lCEGUIBase
+else
+libCEGUICoronaImageCodec_la_LDFLAGS = -release @PACKAGE_VERSION@
endif
libCEGUICoronaImageCodec_la_LIBADD += $(Corona_LIBS)
diff -up CEGUI-0.6.0/ImageCodecModules/DevILImageCodec/Makefile.am~ CEGUI-0.6.0/ImageCodecModules/DevILImageCodec/Makefile.am
--- CEGUI-0.6.0/ImageCodecModules/DevILImageCodec/Makefile.am~ 2008-05-18 22:19:17.000000000 +0200
+++ CEGUI-0.6.0/ImageCodecModules/DevILImageCodec/Makefile.am 2008-05-18 22:19:17.000000000 +0200
@@ -5,6 +5,8 @@ pkgincludedir=$(prefix)/include/CEGUI/Im
if MINGW32_BUILD
libCEGUIDevILImageCodec_la_CPPFLAGS = -DCEGUIDEVILIMAGECODEC_EXPORTS
libCEGUIDevILImageCodec_la_LDFLAGS = -no-undefined -avoid-version
+else
+libCEGUIDevILImageCodec_la_LDFLAGS = -release @PACKAGE_VERSION@
endif
libCEGUIDevILImageCodec_la_LIBADD = $(DevIL_LIBS) ../../src/libCEGUIBase.la
diff -up CEGUI-0.6.0/ImageCodecModules/FreeImageImageCodec/Makefile.am~ CEGUI-0.6.0/ImageCodecModules/FreeImageImageCodec/Makefile.am
--- CEGUI-0.6.0/ImageCodecModules/FreeImageImageCodec/Makefile.am~ 2008-05-18 22:21:15.000000000 +0200
+++ CEGUI-0.6.0/ImageCodecModules/FreeImageImageCodec/Makefile.am 2008-05-18 22:21:15.000000000 +0200
@@ -4,6 +4,8 @@ pkgincludedir=$(prefix)/include/CEGUI/Im
if MINGW32_BUILD
libCEGUIFreeImageImageCodec_la_CPPFLAGS = -DCEGUIFREEIMAGEIMAGECODEC_EXPORTS
libCEGUIFreeImageImageCodec_la_LDFLAGS = -no-undefined -avoid-version
+else
+libCEGUIFreeImageImageCodec_la_LDFLAGS = -release @PACKAGE_VERSION@
endif
libCEGUIFreeImageImageCodec_la_LIBADD = $(FreeImage_LIBS) ../../src/libCEGUIBase.la
diff -up CEGUI-0.6.0/ImageCodecModules/SILLYImageCodec/Makefile.am~ CEGUI-0.6.0/ImageCodecModules/SILLYImageCodec/Makefile.am
--- CEGUI-0.6.0/ImageCodecModules/SILLYImageCodec/Makefile.am~ 2008-05-18 22:22:01.000000000 +0200
+++ CEGUI-0.6.0/ImageCodecModules/SILLYImageCodec/Makefile.am 2008-05-18 22:22:01.000000000 +0200
@@ -4,6 +4,8 @@ pkgincludedir=$(prefix)/include/CEGUI/Im
if MINGW32_BUILD
libCEGUISILLYImageCodec_la_CPPFLAGS = -DCEGUISILLYIMAGECODEC_EXPORTS
libCEGUISILLYImageCodec_la_LDFLAGS = -no-undefined -avoid-version
+else
+libCEGUISILLYImageCodec_la_LDFLAGS = -release @PACKAGE_VERSION@
endif
libCEGUISILLYImageCodec_la_LIBADD = $(SILLY_LIBS) ../../src/libCEGUIBase.la
diff -up CEGUI-0.6.0/ImageCodecModules/TGAImageCodec/Makefile.am~ CEGUI-0.6.0/ImageCodecModules/TGAImageCodec/Makefile.am
--- CEGUI-0.6.0/ImageCodecModules/TGAImageCodec/Makefile.am~ 2008-05-18 22:22:43.000000000 +0200
+++ CEGUI-0.6.0/ImageCodecModules/TGAImageCodec/Makefile.am 2008-05-18 22:22:43.000000000 +0200
@@ -4,6 +4,8 @@ pkgincludedir=$(prefix)/include/CEGUI/Im
if MINGW32_BUILD
libCEGUITGAImageCodec_la_CPPFLAGS = -DCEGUITGAIMAGECODEC_EXPORTS
libCEGUITGAImageCodec_la_LDFLAGS = -no-undefined -avoid-version
+else
+libCEGUITGAImageCodec_la_LDFLAGS = -release @PACKAGE_VERSION@
endif
lib_LTLIBRARIES=libCEGUITGAImageCodec.la
diff -up CEGUI-0.6.0/RendererModules/OpenGLGUIRenderer/Makefile.am~ CEGUI-0.6.0/RendererModules/OpenGLGUIRenderer/Makefile.am
--- CEGUI-0.6.0/RendererModules/OpenGLGUIRenderer/Makefile.am~ 2008-05-18 22:26:10.000000000 +0200
+++ CEGUI-0.6.0/RendererModules/OpenGLGUIRenderer/Makefile.am 2008-05-18 22:26:10.000000000 +0200
@@ -11,7 +11,7 @@ endif
libCEGUIOpenGLRenderer_la_LIBADD = $(OpenGL_LIBS) ../../src/libCEGUIBase.la
-libCEGUIOpenGLRenderer_la_LDFLAGS += -version-info @CEGUI_OPENGL_VERSION_INFO@
+libCEGUIOpenGLRenderer_la_LDFLAGS += -release @PACKAGE_VERSION@
lib_LTLIBRARIES=libCEGUIOpenGLRenderer.la
libCEGUIOpenGLRenderer_la_SOURCES = openglrenderer.cpp opengltexture.cpp
diff -up CEGUI-0.6.0/ScriptingModules/CEGUILua/LuaScriptModule/src/Makefile.am~ CEGUI-0.6.0/ScriptingModules/CEGUILua/LuaScriptModule/src/Makefile.am
--- CEGUI-0.6.0/ScriptingModules/CEGUILua/LuaScriptModule/src/Makefile.am~ 2008-05-18 22:25:50.000000000 +0200
+++ CEGUI-0.6.0/ScriptingModules/CEGUILua/LuaScriptModule/src/Makefile.am 2008-05-18 22:25:50.000000000 +0200
@@ -10,7 +10,7 @@ libCEGUILuaScriptModule_la_CPPFLAGS += -
libCEGUILuaScriptModule_la_LDFLAGS += -no-undefined -avoid-version
endif
-libCEGUILuaScriptModule_la_LDFLAGS += -version-info @CEGUI_VERSION_INFO@
+libCEGUILuaScriptModule_la_LDFLAGS += -release @PACKAGE_VERSION@
lib_LTLIBRARIES = libCEGUILuaScriptModule.la
diff -up CEGUI-0.6.0/ScriptingModules/CEGUILua/tolua++/Makefile.am~ CEGUI-0.6.0/ScriptingModules/CEGUILua/tolua++/Makefile.am
--- CEGUI-0.6.0/ScriptingModules/CEGUILua/tolua++/Makefile.am~ 2008-05-19 08:47:42.000000000 +0200
+++ CEGUI-0.6.0/ScriptingModules/CEGUILua/tolua++/Makefile.am 2008-05-19 08:47:42.000000000 +0200
@@ -7,7 +7,7 @@ libCEGUItoluapp_la_CPPFLAGS = -DTOLUA_EX
libCEGUItoluapp_la_LDFLAGS += -no-undefined
endif
-libCEGUItoluapp_la_LDFLAGS += -version-info @CEGUI_VERSION_INFO@
+libCEGUItoluapp_la_LDFLAGS += -release @PACKAGE_VERSION@
lib_LTLIBRARIES = libCEGUItoluapp.la
diff -up CEGUI-0.6.0/WindowRendererSets/Falagard/src/Makefile.am~ CEGUI-0.6.0/WindowRendererSets/Falagard/src/Makefile.am
--- CEGUI-0.6.0/WindowRendererSets/Falagard/src/Makefile.am~ 2008-05-18 22:25:17.000000000 +0200
+++ CEGUI-0.6.0/WindowRendererSets/Falagard/src/Makefile.am 2008-05-18 22:25:17.000000000 +0200
@@ -8,7 +8,7 @@ libCEGUIFalagardWRBase_la_CPPFLAGS = -DF
libCEGUIFalagardWRBase_la_LDFLAGS += -no-undefined -avoid-version
endif
-libCEGUIFalagardWRBase_la_LDFLAGS += -version-info @CEGUI_VERSION_INFO@
+libCEGUIFalagardWRBase_la_LDFLAGS += -release @PACKAGE_VERSION@
libCEGUIFalagardWRBase_la_LIBADD = ../../../src/libCEGUIBase.la
diff -up CEGUI-0.6.0/XMLParserModules/TinyXMLParser/Makefile.am~ CEGUI-0.6.0/XMLParserModules/TinyXMLParser/Makefile.am
--- CEGUI-0.6.0/XMLParserModules/TinyXMLParser/Makefile.am~ 2008-05-18 22:23:24.000000000 +0200
+++ CEGUI-0.6.0/XMLParserModules/TinyXMLParser/Makefile.am 2008-05-18 22:23:24.000000000 +0200
@@ -3,6 +3,8 @@ INCLUDES = -I$(top_srcdir)/include
if MINGW32_BUILD
libCEGUITinyXMLParser_la_CPPFLAGS = -DCEGUITINYXMLPARSER_EXPORTS
libCEGUITinyXMLParser_la_LDFLAGS = -no-undefined -avoid-version
+else
+libCEGUITinyXMLParser_la_LDFLAGS = -release @PACKAGE_VERSION@
endif
lib_LTLIBRARIES=libCEGUITinyXMLParser.la
diff -up CEGUI-0.6.0/XMLParserModules/XercesParser/Makefile.am~ CEGUI-0.6.0/XMLParserModules/XercesParser/Makefile.am
--- CEGUI-0.6.0/XMLParserModules/XercesParser/Makefile.am~ 2008-05-18 22:23:57.000000000 +0200
+++ CEGUI-0.6.0/XMLParserModules/XercesParser/Makefile.am 2008-05-18 22:23:57.000000000 +0200
@@ -3,6 +3,8 @@ INCLUDES = -I$(top_srcdir)/include $(xer
if MINGW32_BUILD
libCEGUIXercesParser_la_CPPFLAGS = -DCEGUIXERCESPARSER_EXPORTS
libCEGUIXercesParser_la_LDFLAGS = -no-undefined -avoid-version
+else
+libCEGUIXercesParser_la_LDFLAGS = -release @PACKAGE_VERSION@
endif
libCEGUIXercesParser_la_LIBADD = $(xerces_LIBS) ../../src/libCEGUIBase.la
diff -up CEGUI-0.6.0/XMLParserModules/expatParser/Makefile.am~ CEGUI-0.6.0/XMLParserModules/expatParser/Makefile.am
--- CEGUI-0.6.0/XMLParserModules/expatParser/Makefile.am~ 2008-05-18 22:24:22.000000000 +0200
+++ CEGUI-0.6.0/XMLParserModules/expatParser/Makefile.am 2008-05-18 22:24:22.000000000 +0200
@@ -3,6 +3,8 @@ INCLUDES = -I$(top_srcdir)/include $(exp
if MINGW32_BUILD
libCEGUIExpatParser_la_CPPFLAGS = -DCEGUIEXPATPARSER_EXPORTS
libCEGUIExpatParser_la_LDFLAGS = -no-undefined -avoid-version
+else
+libCEGUIExpatParser_la_LDFLAGS = -release @PACKAGE_VERSION@
endif
libCEGUIExpatParser_la_LIBADD = $(expat_LIBS) ../../src/libCEGUIBase.la
diff -up CEGUI-0.6.0/XMLParserModules/libxmlParser/Makefile.am~ CEGUI-0.6.0/XMLParserModules/libxmlParser/Makefile.am
--- CEGUI-0.6.0/XMLParserModules/libxmlParser/Makefile.am~ 2008-05-18 22:24:58.000000000 +0200
+++ CEGUI-0.6.0/XMLParserModules/libxmlParser/Makefile.am 2008-05-18 22:24:58.000000000 +0200
@@ -3,6 +3,8 @@ INCLUDES = -I$(top_srcdir)/include $(lib
if MINGW32_BUILD
libCEGUILibxmlParser_la_CPPFLAGS = -DCEGUILIBXMLPARSER_EXPORTS
libCEGUILibxmlParser_la_LDFLAGS = -no-undefined -avoid-version
+else
+libCEGUILibxmlParser_la_LDFLAGS = -release @PACKAGE_VERSION@
endif
libCEGUILibxmlParser_la_LIBADD = $(libxml_LIBS) ../../src/libCEGUIBase.la
diff -up CEGUI-0.6.0/src/Makefile.am~ CEGUI-0.6.0/src/Makefile.am
--- CEGUI-0.6.0/src/Makefile.am~ 2008-05-18 22:26:54.000000000 +0200
+++ CEGUI-0.6.0/src/Makefile.am 2008-05-18 22:26:54.000000000 +0200
@@ -7,7 +7,7 @@ libCEGUIBase_la_CPPFLAGS = -DCEGUIBASE_E
libCEGUIBase_la_LDFLAGS += -shared -no-undefined
endif
-libCEGUIBase_la_LDFLAGS += -version-info @CEGUI_VERSION_INFO@
+libCEGUIBase_la_LDFLAGS += -release @PACKAGE_VERSION@
libCEGUIBase_la_LIBADD = $(freetype2_LIBS) $(pcre_LIBS)
lib_LTLIBRARIES=libCEGUIBase.la
diff -up CEGUI-0.6.0/ImageCodecModules/DevILImageCodec/Makefile.in~ CEGUI-0.6.0/ImageCodecModules/DevILImageCodec/Makefile.in
--- CEGUI-0.6.0/ImageCodecModules/DevILImageCodec/Makefile.in~ 2008-05-18 22:20:08.000000000 +0200
+++ CEGUI-0.6.0/ImageCodecModules/DevILImageCodec/Makefile.in 2008-05-18 22:20:08.000000000 +0200
@@ -229,6 +229,7 @@ libCEGUIDevILImageCodec_la_LIBADD = $(am
@MINGW32_BUILD_TRUE at libCEGUIDevILImageCodec_la_CPPFLAGS = -DCEGUIDEVILIMAGECODEC_EXPORTS
@MINGW32_BUILD_TRUE at libCEGUIDevILImageCodec_la_LDFLAGS = -no-undefined -avoid-version
+ at MINGW32_BUILD_FALSE@libCEGUIDevILImageCodec_la_LDFLAGS = -release @PACKAGE_VERSION@
lib_LTLIBRARIES = libCEGUIDevILImageCodec.la
diff -up CEGUI-0.6.0/ImageCodecModules/FreeImageImageCodec/Makefile.in~ CEGUI-0.6.0/ImageCodecModules/FreeImageImageCodec/Makefile.in
--- CEGUI-0.6.0/ImageCodecModules/FreeImageImageCodec/Makefile.in~ 2008-05-18 22:21:13.000000000 +0200
+++ CEGUI-0.6.0/ImageCodecModules/FreeImageImageCodec/Makefile.in 2008-05-18 22:21:13.000000000 +0200
@@ -228,6 +228,7 @@ libCEGUIFreeImageImageCodec_la_LIBADD =
@MINGW32_BUILD_TRUE at libCEGUIFreeImageImageCodec_la_CPPFLAGS = -DCEGUIFREEIMAGEIMAGECODEC_EXPORTS
@MINGW32_BUILD_TRUE at libCEGUIFreeImageImageCodec_la_LDFLAGS = -no-undefined -avoid-version
+ at MINGW32_BUILD_FALSE@libCEGUIFreeImageImageCodec_la_LDFLAGS = -release @PACKAGE_VERSION@
lib_LTLIBRARIES = libCEGUIFreeImageImageCodec.la
diff -up CEGUI-0.6.0/ImageCodecModules/SILLYImageCodec/Makefile.in~ CEGUI-0.6.0/ImageCodecModules/SILLYImageCodec/Makefile.in
--- CEGUI-0.6.0/ImageCodecModules/SILLYImageCodec/Makefile.in~ 2008-05-18 22:21:59.000000000 +0200
+++ CEGUI-0.6.0/ImageCodecModules/SILLYImageCodec/Makefile.in 2008-05-18 22:21:59.000000000 +0200
@@ -228,6 +228,7 @@ libCEGUISILLYImageCodec_la_LIBADD = $(am
@MINGW32_BUILD_TRUE at libCEGUISILLYImageCodec_la_CPPFLAGS = -DCEGUISILLYIMAGECODEC_EXPORTS
@MINGW32_BUILD_TRUE at libCEGUISILLYImageCodec_la_LDFLAGS = -no-undefined -avoid-version
+ at MINGW32_BUILD_FALSE@libCEGUISILLYImageCodec_la_LDFLAGS = -release @PACKAGE_VERSION@
lib_LTLIBRARIES = libCEGUISILLYImageCodec.la
diff -up CEGUI-0.6.0/ImageCodecModules/TGAImageCodec/Makefile.in~ CEGUI-0.6.0/ImageCodecModules/TGAImageCodec/Makefile.in
--- CEGUI-0.6.0/ImageCodecModules/TGAImageCodec/Makefile.in~ 2008-05-18 22:22:40.000000000 +0200
+++ CEGUI-0.6.0/ImageCodecModules/TGAImageCodec/Makefile.in 2008-05-18 22:22:40.000000000 +0200
@@ -225,6 +225,7 @@ INCLUDES = -I$(top_srcdir)/include
@MINGW32_BUILD_TRUE at libCEGUITGAImageCodec_la_CPPFLAGS = -DCEGUITGAIMAGECODEC_EXPORTS
@MINGW32_BUILD_TRUE at libCEGUITGAImageCodec_la_LDFLAGS = -no-undefined -avoid-version
+ at MINGW32_BUILD_FALSE@libCEGUITGAImageCodec_la_LDFLAGS = -release @PACKAGE_VERSION@
libCEGUITGAImageCodec_la_LIBADD = ../../src/libCEGUIBase.la
diff -up CEGUI-0.6.0/RendererModules/OpenGLGUIRenderer/Makefile.in~ CEGUI-0.6.0/RendererModules/OpenGLGUIRenderer/Makefile.in
--- CEGUI-0.6.0/RendererModules/OpenGLGUIRenderer/Makefile.in~ 2008-05-18 22:26:17.000000000 +0200
+++ CEGUI-0.6.0/RendererModules/OpenGLGUIRenderer/Makefile.in 2008-05-18 22:26:17.000000000 +0200
@@ -226,7 +226,7 @@ xerces_LIBS = @xerces_LIBS@
INCLUDES = -I$(top_srcdir)/include -I$(top_srcdir) $(OpenGL_CFLAGS)
pkginclude_HEADERS = openglrenderer.h opengltexture.h
-libCEGUIOpenGLRenderer_la_LDFLAGS = $(am__append_1) -version-info @CEGUI_OPENGL_VERSION_INFO@
+libCEGUIOpenGLRenderer_la_LDFLAGS = $(am__append_1) -release @PACKAGE_VERSION@
libCEGUIOpenGLRenderer_la_LIBADD = $(am__append_2) $(OpenGL_LIBS) ../../src/libCEGUIBase.la
diff -up CEGUI-0.6.0/ScriptingModules/CEGUILua/LuaScriptModule/src/Makefile.in~ CEGUI-0.6.0/ScriptingModules/CEGUILua/LuaScriptModule/src/Makefile.in
--- CEGUI-0.6.0/ScriptingModules/CEGUILua/LuaScriptModule/src/Makefile.in~ 2008-05-18 22:25:59.000000000 +0200
+++ CEGUI-0.6.0/ScriptingModules/CEGUILua/LuaScriptModule/src/Makefile.in 2008-05-18 22:25:59.000000000 +0200
@@ -228,7 +228,7 @@ INCLUDES = -I$(top_srcdir)/include \
-I$(top_srcdir)/ScriptingModules/CEGUILua/LuaScriptModule/include
-libCEGUILuaScriptModule_la_LDFLAGS = $(am__append_2) -version-info @CEGUI_VERSION_INFO@
+libCEGUILuaScriptModule_la_LDFLAGS = $(am__append_2) -release @PACKAGE_VERSION@
libCEGUILuaScriptModule_la_CPPFLAGS = $(Lua_CFLAGS) $(am__append_1)
libCEGUILuaScriptModule_la_LIBADD = ../../../../src/libCEGUIBase.la ../../tolua++/libCEGUItoluapp.la
diff -up CEGUI-0.6.0/ScriptingModules/CEGUILua/tolua++/Makefile.in~ CEGUI-0.6.0/ScriptingModules/CEGUILua/tolua++/Makefile.in
--- CEGUI-0.6.0/ScriptingModules/CEGUILua/tolua++/Makefile.in~ 2008-05-19 08:47:52.000000000 +0200
+++ CEGUI-0.6.0/ScriptingModules/CEGUILua/tolua++/Makefile.in 2008-05-19 08:47:52.000000000 +0200
@@ -224,7 +224,7 @@ xerces_CFLAGS = @xerces_CFLAGS@
xerces_LIBS = @xerces_LIBS@
INCLUDES = $(Lua_CFLAGS) -I$(top_srcdir)/ScriptingModules/CEGUILua/tolua++
-libCEGUItoluapp_la_LDFLAGS = $(am__append_1) -version-info @CEGUI_VERSION_INFO@
+libCEGUItoluapp_la_LDFLAGS = $(am__append_1) -release @PACKAGE_VERSION@
@MINGW32_BUILD_TRUE at libCEGUItoluapp_la_CPPFLAGS = -DTOLUA_EXPORTS
diff -up CEGUI-0.6.0/WindowRendererSets/Falagard/src/Makefile.in~ CEGUI-0.6.0/WindowRendererSets/Falagard/src/Makefile.in
--- CEGUI-0.6.0/WindowRendererSets/Falagard/src/Makefile.in~ 2008-05-18 22:25:39.000000000 +0200
+++ CEGUI-0.6.0/WindowRendererSets/Falagard/src/Makefile.in 2008-05-18 22:25:39.000000000 +0200
@@ -226,7 +226,7 @@ INCLUDES = -I$(top_srcdir)/include \
-I$(top_srcdir)/WindowRendererSets/Falagard/include
-libCEGUIFalagardWRBase_la_LDFLAGS = $(am__append_1) -version-info @CEGUI_VERSION_INFO@
+libCEGUIFalagardWRBase_la_LDFLAGS = $(am__append_1) -release @PACKAGE_VERSION@
@MINGW32_BUILD_TRUE at libCEGUIFalagardWRBase_la_CPPFLAGS = -DFALAGARDWRBASE_EXPORTS -DCEGUIWRMODULE_EXPORTS
diff -up CEGUI-0.6.0/XMLParserModules/TinyXMLParser/Makefile.in~ CEGUI-0.6.0/XMLParserModules/TinyXMLParser/Makefile.in
--- CEGUI-0.6.0/XMLParserModules/TinyXMLParser/Makefile.in~ 2008-05-18 22:23:23.000000000 +0200
+++ CEGUI-0.6.0/XMLParserModules/TinyXMLParser/Makefile.in 2008-05-18 22:23:23.000000000 +0200
@@ -226,6 +226,7 @@ INCLUDES = -I$(top_srcdir)/include
@MINGW32_BUILD_TRUE at libCEGUITinyXMLParser_la_CPPFLAGS = -DCEGUITINYXMLPARSER_EXPORTS
@MINGW32_BUILD_TRUE at libCEGUITinyXMLParser_la_LDFLAGS = -no-undefined -avoid-version
+ at MINGW32_BUILD_FALSE@libCEGUITinyXMLParser_la_LDFLAGS = -release @PACKAGE_VERSION@
libCEGUITinyXMLParser_la_LIBADD = ../../src/libCEGUIBase.la
diff -up CEGUI-0.6.0/XMLParserModules/XercesParser/Makefile.in~ CEGUI-0.6.0/XMLParserModules/XercesParser/Makefile.in
--- CEGUI-0.6.0/XMLParserModules/XercesParser/Makefile.in~ 2008-05-18 22:23:55.000000000 +0200
+++ CEGUI-0.6.0/XMLParserModules/XercesParser/Makefile.in 2008-05-18 22:23:55.000000000 +0200
@@ -228,6 +228,7 @@ libCEGUIXercesParser_la_LIBADD = $(am__a
@MINGW32_BUILD_TRUE at libCEGUIXercesParser_la_CPPFLAGS = -DCEGUIXERCESPARSER_EXPORTS
@MINGW32_BUILD_TRUE at libCEGUIXercesParser_la_LDFLAGS = -no-undefined -avoid-version
+ at MINGW32_BUILD_FALSE@libCEGUIXercesParser_la_LDFLAGS = -release @PACKAGE_VERSION@
lib_LTLIBRARIES = libCEGUIXercesParser.la
diff -up CEGUI-0.6.0/XMLParserModules/expatParser/Makefile.in~ CEGUI-0.6.0/XMLParserModules/expatParser/Makefile.in
--- CEGUI-0.6.0/XMLParserModules/expatParser/Makefile.in~ 2008-05-18 22:24:21.000000000 +0200
+++ CEGUI-0.6.0/XMLParserModules/expatParser/Makefile.in 2008-05-18 22:24:21.000000000 +0200
@@ -228,6 +228,7 @@ libCEGUIExpatParser_la_LIBADD = $(am__ap
@MINGW32_BUILD_TRUE at libCEGUIExpatParser_la_CPPFLAGS = -DCEGUIEXPATPARSER_EXPORTS
@MINGW32_BUILD_TRUE at libCEGUIExpatParser_la_LDFLAGS = -no-undefined -avoid-version
+ at MINGW32_BUILD_FALSE@libCEGUIExpatParser_la_LDFLAGS = -release @PACKAGE_VERSION@
lib_LTLIBRARIES = libCEGUIExpatParser.la
diff -up CEGUI-0.6.0/XMLParserModules/libxmlParser/Makefile.in~ CEGUI-0.6.0/XMLParserModules/libxmlParser/Makefile.in
--- CEGUI-0.6.0/XMLParserModules/libxmlParser/Makefile.in~ 2008-05-18 22:24:56.000000000 +0200
+++ CEGUI-0.6.0/XMLParserModules/libxmlParser/Makefile.in 2008-05-18 22:24:56.000000000 +0200
@@ -229,6 +229,7 @@ libCEGUILibxmlParser_la_LIBADD = $(am__a
@MINGW32_BUILD_TRUE at libCEGUILibxmlParser_la_CPPFLAGS = -DCEGUILIBXMLPARSER_EXPORTS
@MINGW32_BUILD_TRUE at libCEGUILibxmlParser_la_LDFLAGS = -no-undefined -avoid-version
+ at MINGW32_BUILD_FALSE@libCEGUILibxmlParser_la_LDFLAGS = -release @PACKAGE_VERSION@
lib_LTLIBRARIES = libCEGUILibxmlParser.la
diff -up CEGUI-0.6.0/src/Makefile.in~ CEGUI-0.6.0/src/Makefile.in
--- CEGUI-0.6.0/src/Makefile.in~ 2008-05-18 22:27:02.000000000 +0200
+++ CEGUI-0.6.0/src/Makefile.in 2008-05-18 22:27:02.000000000 +0200
@@ -224,7 +224,7 @@ xerces_CFLAGS = @xerces_CFLAGS@
xerces_LIBS = @xerces_LIBS@
INCLUDES = -I$(top_srcdir)/include -I$(top_srcdir) $(freetype2_CFLAGS) $(pcre_CFLAGS)
-libCEGUIBase_la_LDFLAGS = $(am__append_1) -version-info @CEGUI_VERSION_INFO@
+libCEGUIBase_la_LDFLAGS = $(am__append_1) -release @PACKAGE_VERSION@
@MINGW32_BUILD_TRUE at libCEGUIBase_la_CPPFLAGS = -DCEGUIBASE_EXPORTS
libCEGUIBase_la_LIBADD = $(freetype2_LIBS) $(pcre_LIBS)
cegui-0.6.0-system-tinyxml.patch:
--- NEW FILE cegui-0.6.0-system-tinyxml.patch ---
diff -up CEGUI-0.6.0/XMLParserModules/TinyXMLParser/CEGUITinyXMLParser.cpp~ CEGUI-0.6.0/XMLParserModules/TinyXMLParser/CEGUITinyXMLParser.cpp
--- CEGUI-0.6.0/XMLParserModules/TinyXMLParser/CEGUITinyXMLParser.cpp~ 2008-05-19 11:10:43.000000000 +0200
+++ CEGUI-0.6.0/XMLParserModules/TinyXMLParser/CEGUITinyXMLParser.cpp 2008-05-19 11:10:43.000000000 +0200
@@ -31,19 +31,19 @@
#include "CEGUIXMLHandler.h"
#include "CEGUIXMLAttributes.h"
#include "CEGUILogger.h"
-#include "ceguitinyxml/tinyxml.h"
+#include <tinyxml.h>
// Start of CEGUI namespace section
namespace CEGUI
{
- class TinyXMLDocument : public CEGUITinyXML::TiXmlDocument
+ class TinyXMLDocument : public TiXmlDocument
{
public:
TinyXMLDocument(XMLHandler& handler, const String& filename, const String& schemaName, const String& resourceGroup);
~TinyXMLDocument()
{}
protected:
- void processElement(const CEGUITinyXML::TiXmlElement* element);
+ void processElement(const TiXmlElement* element);
private:
XMLHandler* d_handler;
@@ -68,9 +68,9 @@ namespace CEGUI
try
{
// Parse the document
- CEGUITinyXML::TiXmlDocument doc;
+ TiXmlDocument doc;
doc.Parse((const char*)buf);
- const CEGUITinyXML::TiXmlElement* currElement = doc.RootElement();
+ const TiXmlElement* currElement = doc.RootElement();
if (currElement)
{
// function called recursively to parse xml data
@@ -89,12 +89,12 @@ namespace CEGUI
}
- void TinyXMLDocument::processElement(const CEGUITinyXML::TiXmlElement* element)
+ void TinyXMLDocument::processElement(const TiXmlElement* element)
{
// build attributes block for the element
XMLAttributes attrs;
- const CEGUITinyXML::TiXmlAttribute *currAttr = element->FirstAttribute();
+ const TiXmlAttribute *currAttr = element->FirstAttribute();
while (currAttr)
{
attrs.add((utf8*)currAttr->Name(), (utf8*)currAttr->Value());
@@ -105,15 +105,15 @@ namespace CEGUI
d_handler->elementStart((utf8*)element->Value(), attrs);
// do children
- const CEGUITinyXML::TiXmlNode* childNode = element->FirstChild();
+ const TiXmlNode* childNode = element->FirstChild();
while (childNode)
{
switch(childNode->Type())
{
- case CEGUITinyXML::TiXmlNode::ELEMENT:
+ case TiXmlNode::ELEMENT:
processElement(childNode->ToElement());
break;
- case CEGUITinyXML::TiXmlNode::TEXT:
+ case TiXmlNode::TEXT:
if (childNode->ToText()->Value() != '\0')
d_handler->text((utf8*)childNode->ToText()->Value());
break;
@@ -146,7 +146,7 @@ namespace CEGUI
{
// This used to prevent deletion of line ending in the middle of a text.
// WhiteSpace cleaning will be available throught the use of String methods directly
- //CEGUITinyXML::TiXmlDocument::SetCondenseWhiteSpace(false);
+ //TiXmlDocument::SetCondenseWhiteSpace(false);
return true;
}
diff -up CEGUI-0.6.0/XMLParserModules/TinyXMLParser/Makefile.am~ CEGUI-0.6.0/XMLParserModules/TinyXMLParser/Makefile.am
--- CEGUI-0.6.0/XMLParserModules/TinyXMLParser/Makefile.am~ 2008-05-19 11:08:09.000000000 +0200
+++ CEGUI-0.6.0/XMLParserModules/TinyXMLParser/Makefile.am 2008-05-19 11:11:22.000000000 +0200
@@ -10,15 +10,8 @@ endif
lib_LTLIBRARIES=libCEGUITinyXMLParser.la
libCEGUITinyXMLParser_la_SOURCES = CEGUITinyXMLParser.cpp \
- CEGUITinyXMLParserModule.cpp \
- ceguitinyxml/tinystr.cpp \
- ceguitinyxml/tinyxml.cpp \
- ceguitinyxml/tinyxmlerror.cpp \
- ceguitinyxml/tinyxmlparser.cpp
-libCEGUITinyXMLParser_la_LIBADD = ../../src/libCEGUIBase.la
+ CEGUITinyXMLParserModule.cpp
+libCEGUITinyXMLParser_la_LIBADD = ../../src/libCEGUIBase.la -ltinyxml
pkgincludedir=$(prefix)/include/CEGUI/XMLParserModules/TinyXMLParser
pkginclude_HEADERS = CEGUITinyXMLParser.h CEGUITinyXMLParserModule.h
-
-noinst_HEADERS = ceguitinyxml/tinystr.h \
- ceguitinyxml/tinyxml.h
diff -up CEGUI-0.6.0/XMLParserModules/TinyXMLParser/Makefile.in~ CEGUI-0.6.0/XMLParserModules/TinyXMLParser/Makefile.in
--- CEGUI-0.6.0/XMLParserModules/TinyXMLParser/Makefile.in~ 2008-05-19 11:10:10.000000000 +0200
+++ CEGUI-0.6.0/XMLParserModules/TinyXMLParser/Makefile.in 2008-05-19 11:11:30.000000000 +0200
@@ -228,22 +228,15 @@ INCLUDES = -I$(top_srcdir)/include
@MINGW32_BUILD_TRUE at libCEGUITinyXMLParser_la_LDFLAGS = -no-undefined -avoid-version
@MINGW32_BUILD_FALSE at libCEGUITinyXMLParser_la_LDFLAGS = -release @PACKAGE_VERSION@
-libCEGUITinyXMLParser_la_LIBADD = ../../src/libCEGUIBase.la
+libCEGUITinyXMLParser_la_LIBADD = ../../src/libCEGUIBase.la -ltinyxml
lib_LTLIBRARIES = libCEGUITinyXMLParser.la
libCEGUITinyXMLParser_la_SOURCES = CEGUITinyXMLParser.cpp \
- CEGUITinyXMLParserModule.cpp \
- ceguitinyxml/tinystr.cpp \
- ceguitinyxml/tinyxml.cpp \
- ceguitinyxml/tinyxmlerror.cpp \
- ceguitinyxml/tinyxmlparser.cpp
+ CEGUITinyXMLParserModule.cpp
pkginclude_HEADERS = CEGUITinyXMLParser.h CEGUITinyXMLParserModule.h
-noinst_HEADERS = ceguitinyxml/tinystr.h \
- ceguitinyxml/tinyxml.h
-
subdir = XMLParserModules/TinyXMLParser
ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
@@ -255,11 +248,7 @@ LTLIBRARIES = $(lib_LTLIBRARIES)
@MINGW32_BUILD_FALSE at libCEGUITinyXMLParser_la_DEPENDENCIES =
am_libCEGUITinyXMLParser_la_OBJECTS = \
libCEGUITinyXMLParser_la-CEGUITinyXMLParser.lo \
- libCEGUITinyXMLParser_la-CEGUITinyXMLParserModule.lo \
- libCEGUITinyXMLParser_la-tinystr.lo \
- libCEGUITinyXMLParser_la-tinyxml.lo \
- libCEGUITinyXMLParser_la-tinyxmlerror.lo \
- libCEGUITinyXMLParser_la-tinyxmlparser.lo
+ libCEGUITinyXMLParser_la-CEGUITinyXMLParserModule.lo
libCEGUITinyXMLParser_la_OBJECTS = \
$(am_libCEGUITinyXMLParser_la_OBJECTS)
@@ -268,11 +257,7 @@ depcomp = $(SHELL) $(top_srcdir)/depcomp
am__depfiles_maybe = depfiles
@AMDEP_TRUE at DEP_FILES = \
@AMDEP_TRUE@ ./$(DEPDIR)/libCEGUITinyXMLParser_la-CEGUITinyXMLParser.Plo \
- at AMDEP_TRUE@ ./$(DEPDIR)/libCEGUITinyXMLParser_la-CEGUITinyXMLParserModule.Plo \
- at AMDEP_TRUE@ ./$(DEPDIR)/libCEGUITinyXMLParser_la-tinystr.Plo \
- at AMDEP_TRUE@ ./$(DEPDIR)/libCEGUITinyXMLParser_la-tinyxml.Plo \
- at AMDEP_TRUE@ ./$(DEPDIR)/libCEGUITinyXMLParser_la-tinyxmlerror.Plo \
- at AMDEP_TRUE@ ./$(DEPDIR)/libCEGUITinyXMLParser_la-tinyxmlparser.Plo
+ at AMDEP_TRUE@ ./$(DEPDIR)/libCEGUITinyXMLParser_la-CEGUITinyXMLParserModule.Plo
CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
$(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS)
LTCXXCOMPILE = $(LIBTOOL) --mode=compile $(CXX) $(DEFS) \
@@ -336,10 +321,6 @@ distclean-compile:
@AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/libCEGUITinyXMLParser_la-CEGUITinyXMLParser.Plo at am__quote@
@AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/libCEGUITinyXMLParser_la-CEGUITinyXMLParserModule.Plo at am__quote@
- at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/libCEGUITinyXMLParser_la-tinystr.Plo at am__quote@
- at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/libCEGUITinyXMLParser_la-tinyxml.Plo at am__quote@
- at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/libCEGUITinyXMLParser_la-tinyxmlerror.Plo at am__quote@
- at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/libCEGUITinyXMLParser_la-tinyxmlparser.Plo at am__quote@
.cpp.o:
@am__fastdepCXX_TRUE@ if $(CXXCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" \
@@ -440,138 +421,6 @@ libCEGUITinyXMLParser_la-CEGUITinyXMLPar
@AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
@am__fastdepCXX_FALSE@ $(LIBTOOL) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libCEGUITinyXMLParser_la_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o libCEGUITinyXMLParser_la-CEGUITinyXMLParserModule.lo `test -f 'CEGUITinyXMLParserModule.cpp' || echo '$(srcdir)/'`CEGUITinyXMLParserModule.cpp
-libCEGUITinyXMLParser_la-tinystr.o: ceguitinyxml/tinystr.cpp
- at am__fastdepCXX_TRUE@ if $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libCEGUITinyXMLParser_la_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT libCEGUITinyXMLParser_la-tinystr.o -MD -MP -MF "$(DEPDIR)/libCEGUITinyXMLParser_la-tinystr.Tpo" \
- at am__fastdepCXX_TRUE@ -c -o libCEGUITinyXMLParser_la-tinystr.o `test -f 'ceguitinyxml/tinystr.cpp' || echo '$(srcdir)/'`ceguitinyxml/tinystr.cpp; \
- at am__fastdepCXX_TRUE@ then mv -f "$(DEPDIR)/libCEGUITinyXMLParser_la-tinystr.Tpo" "$(DEPDIR)/libCEGUITinyXMLParser_la-tinystr.Po"; \
- at am__fastdepCXX_TRUE@ else rm -f "$(DEPDIR)/libCEGUITinyXMLParser_la-tinystr.Tpo"; exit 1; \
- at am__fastdepCXX_TRUE@ fi
- at AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='ceguitinyxml/tinystr.cpp' object='libCEGUITinyXMLParser_la-tinystr.o' libtool=no @AMDEPBACKSLASH@
- at AMDEP_TRUE@@am__fastdepCXX_FALSE@ depfile='$(DEPDIR)/libCEGUITinyXMLParser_la-tinystr.Po' tmpdepfile='$(DEPDIR)/libCEGUITinyXMLParser_la-tinystr.TPo' @AMDEPBACKSLASH@
- at AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
- at am__fastdepCXX_FALSE@ $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libCEGUITinyXMLParser_la_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o libCEGUITinyXMLParser_la-tinystr.o `test -f 'ceguitinyxml/tinystr.cpp' || echo '$(srcdir)/'`ceguitinyxml/tinystr.cpp
-
-libCEGUITinyXMLParser_la-tinystr.obj: ceguitinyxml/tinystr.cpp
- at am__fastdepCXX_TRUE@ if $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libCEGUITinyXMLParser_la_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT libCEGUITinyXMLParser_la-tinystr.obj -MD -MP -MF "$(DEPDIR)/libCEGUITinyXMLParser_la-tinystr.Tpo" \
- at am__fastdepCXX_TRUE@ -c -o libCEGUITinyXMLParser_la-tinystr.obj `if test -f 'ceguitinyxml/tinystr.cpp'; then $(CYGPATH_W) 'ceguitinyxml/tinystr.cpp'; else $(CYGPATH_W) '$(srcdir)/ceguitinyxml/tinystr.cpp'; fi`; \
- at am__fastdepCXX_TRUE@ then mv -f "$(DEPDIR)/libCEGUITinyXMLParser_la-tinystr.Tpo" "$(DEPDIR)/libCEGUITinyXMLParser_la-tinystr.Po"; \
- at am__fastdepCXX_TRUE@ else rm -f "$(DEPDIR)/libCEGUITinyXMLParser_la-tinystr.Tpo"; exit 1; \
- at am__fastdepCXX_TRUE@ fi
- at AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='ceguitinyxml/tinystr.cpp' object='libCEGUITinyXMLParser_la-tinystr.obj' libtool=no @AMDEPBACKSLASH@
- at AMDEP_TRUE@@am__fastdepCXX_FALSE@ depfile='$(DEPDIR)/libCEGUITinyXMLParser_la-tinystr.Po' tmpdepfile='$(DEPDIR)/libCEGUITinyXMLParser_la-tinystr.TPo' @AMDEPBACKSLASH@
- at AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
- at am__fastdepCXX_FALSE@ $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libCEGUITinyXMLParser_la_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o libCEGUITinyXMLParser_la-tinystr.obj `if test -f 'ceguitinyxml/tinystr.cpp'; then $(CYGPATH_W) 'ceguitinyxml/tinystr.cpp'; else $(CYGPATH_W) '$(srcdir)/ceguitinyxml/tinystr.cpp'; fi`
-
-libCEGUITinyXMLParser_la-tinystr.lo: ceguitinyxml/tinystr.cpp
- at am__fastdepCXX_TRUE@ if $(LIBTOOL) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libCEGUITinyXMLParser_la_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT libCEGUITinyXMLParser_la-tinystr.lo -MD -MP -MF "$(DEPDIR)/libCEGUITinyXMLParser_la-tinystr.Tpo" \
- at am__fastdepCXX_TRUE@ -c -o libCEGUITinyXMLParser_la-tinystr.lo `test -f 'ceguitinyxml/tinystr.cpp' || echo '$(srcdir)/'`ceguitinyxml/tinystr.cpp; \
- at am__fastdepCXX_TRUE@ then mv -f "$(DEPDIR)/libCEGUITinyXMLParser_la-tinystr.Tpo" "$(DEPDIR)/libCEGUITinyXMLParser_la-tinystr.Plo"; \
- at am__fastdepCXX_TRUE@ else rm -f "$(DEPDIR)/libCEGUITinyXMLParser_la-tinystr.Tpo"; exit 1; \
- at am__fastdepCXX_TRUE@ fi
- at AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='ceguitinyxml/tinystr.cpp' object='libCEGUITinyXMLParser_la-tinystr.lo' libtool=yes @AMDEPBACKSLASH@
- at AMDEP_TRUE@@am__fastdepCXX_FALSE@ depfile='$(DEPDIR)/libCEGUITinyXMLParser_la-tinystr.Plo' tmpdepfile='$(DEPDIR)/libCEGUITinyXMLParser_la-tinystr.TPlo' @AMDEPBACKSLASH@
- at AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
- at am__fastdepCXX_FALSE@ $(LIBTOOL) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libCEGUITinyXMLParser_la_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o libCEGUITinyXMLParser_la-tinystr.lo `test -f 'ceguitinyxml/tinystr.cpp' || echo '$(srcdir)/'`ceguitinyxml/tinystr.cpp
-
-libCEGUITinyXMLParser_la-tinyxml.o: ceguitinyxml/tinyxml.cpp
- at am__fastdepCXX_TRUE@ if $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libCEGUITinyXMLParser_la_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT libCEGUITinyXMLParser_la-tinyxml.o -MD -MP -MF "$(DEPDIR)/libCEGUITinyXMLParser_la-tinyxml.Tpo" \
- at am__fastdepCXX_TRUE@ -c -o libCEGUITinyXMLParser_la-tinyxml.o `test -f 'ceguitinyxml/tinyxml.cpp' || echo '$(srcdir)/'`ceguitinyxml/tinyxml.cpp; \
- at am__fastdepCXX_TRUE@ then mv -f "$(DEPDIR)/libCEGUITinyXMLParser_la-tinyxml.Tpo" "$(DEPDIR)/libCEGUITinyXMLParser_la-tinyxml.Po"; \
- at am__fastdepCXX_TRUE@ else rm -f "$(DEPDIR)/libCEGUITinyXMLParser_la-tinyxml.Tpo"; exit 1; \
- at am__fastdepCXX_TRUE@ fi
- at AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='ceguitinyxml/tinyxml.cpp' object='libCEGUITinyXMLParser_la-tinyxml.o' libtool=no @AMDEPBACKSLASH@
- at AMDEP_TRUE@@am__fastdepCXX_FALSE@ depfile='$(DEPDIR)/libCEGUITinyXMLParser_la-tinyxml.Po' tmpdepfile='$(DEPDIR)/libCEGUITinyXMLParser_la-tinyxml.TPo' @AMDEPBACKSLASH@
- at AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
- at am__fastdepCXX_FALSE@ $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libCEGUITinyXMLParser_la_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o libCEGUITinyXMLParser_la-tinyxml.o `test -f 'ceguitinyxml/tinyxml.cpp' || echo '$(srcdir)/'`ceguitinyxml/tinyxml.cpp
-
-libCEGUITinyXMLParser_la-tinyxml.obj: ceguitinyxml/tinyxml.cpp
- at am__fastdepCXX_TRUE@ if $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libCEGUITinyXMLParser_la_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT libCEGUITinyXMLParser_la-tinyxml.obj -MD -MP -MF "$(DEPDIR)/libCEGUITinyXMLParser_la-tinyxml.Tpo" \
- at am__fastdepCXX_TRUE@ -c -o libCEGUITinyXMLParser_la-tinyxml.obj `if test -f 'ceguitinyxml/tinyxml.cpp'; then $(CYGPATH_W) 'ceguitinyxml/tinyxml.cpp'; else $(CYGPATH_W) '$(srcdir)/ceguitinyxml/tinyxml.cpp'; fi`; \
- at am__fastdepCXX_TRUE@ then mv -f "$(DEPDIR)/libCEGUITinyXMLParser_la-tinyxml.Tpo" "$(DEPDIR)/libCEGUITinyXMLParser_la-tinyxml.Po"; \
- at am__fastdepCXX_TRUE@ else rm -f "$(DEPDIR)/libCEGUITinyXMLParser_la-tinyxml.Tpo"; exit 1; \
- at am__fastdepCXX_TRUE@ fi
- at AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='ceguitinyxml/tinyxml.cpp' object='libCEGUITinyXMLParser_la-tinyxml.obj' libtool=no @AMDEPBACKSLASH@
- at AMDEP_TRUE@@am__fastdepCXX_FALSE@ depfile='$(DEPDIR)/libCEGUITinyXMLParser_la-tinyxml.Po' tmpdepfile='$(DEPDIR)/libCEGUITinyXMLParser_la-tinyxml.TPo' @AMDEPBACKSLASH@
- at AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
- at am__fastdepCXX_FALSE@ $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libCEGUITinyXMLParser_la_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o libCEGUITinyXMLParser_la-tinyxml.obj `if test -f 'ceguitinyxml/tinyxml.cpp'; then $(CYGPATH_W) 'ceguitinyxml/tinyxml.cpp'; else $(CYGPATH_W) '$(srcdir)/ceguitinyxml/tinyxml.cpp'; fi`
-
-libCEGUITinyXMLParser_la-tinyxml.lo: ceguitinyxml/tinyxml.cpp
- at am__fastdepCXX_TRUE@ if $(LIBTOOL) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libCEGUITinyXMLParser_la_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT libCEGUITinyXMLParser_la-tinyxml.lo -MD -MP -MF "$(DEPDIR)/libCEGUITinyXMLParser_la-tinyxml.Tpo" \
- at am__fastdepCXX_TRUE@ -c -o libCEGUITinyXMLParser_la-tinyxml.lo `test -f 'ceguitinyxml/tinyxml.cpp' || echo '$(srcdir)/'`ceguitinyxml/tinyxml.cpp; \
- at am__fastdepCXX_TRUE@ then mv -f "$(DEPDIR)/libCEGUITinyXMLParser_la-tinyxml.Tpo" "$(DEPDIR)/libCEGUITinyXMLParser_la-tinyxml.Plo"; \
- at am__fastdepCXX_TRUE@ else rm -f "$(DEPDIR)/libCEGUITinyXMLParser_la-tinyxml.Tpo"; exit 1; \
- at am__fastdepCXX_TRUE@ fi
- at AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='ceguitinyxml/tinyxml.cpp' object='libCEGUITinyXMLParser_la-tinyxml.lo' libtool=yes @AMDEPBACKSLASH@
- at AMDEP_TRUE@@am__fastdepCXX_FALSE@ depfile='$(DEPDIR)/libCEGUITinyXMLParser_la-tinyxml.Plo' tmpdepfile='$(DEPDIR)/libCEGUITinyXMLParser_la-tinyxml.TPlo' @AMDEPBACKSLASH@
- at AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
- at am__fastdepCXX_FALSE@ $(LIBTOOL) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libCEGUITinyXMLParser_la_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o libCEGUITinyXMLParser_la-tinyxml.lo `test -f 'ceguitinyxml/tinyxml.cpp' || echo '$(srcdir)/'`ceguitinyxml/tinyxml.cpp
-
-libCEGUITinyXMLParser_la-tinyxmlerror.o: ceguitinyxml/tinyxmlerror.cpp
- at am__fastdepCXX_TRUE@ if $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libCEGUITinyXMLParser_la_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT libCEGUITinyXMLParser_la-tinyxmlerror.o -MD -MP -MF "$(DEPDIR)/libCEGUITinyXMLParser_la-tinyxmlerror.Tpo" \
- at am__fastdepCXX_TRUE@ -c -o libCEGUITinyXMLParser_la-tinyxmlerror.o `test -f 'ceguitinyxml/tinyxmlerror.cpp' || echo '$(srcdir)/'`ceguitinyxml/tinyxmlerror.cpp; \
- at am__fastdepCXX_TRUE@ then mv -f "$(DEPDIR)/libCEGUITinyXMLParser_la-tinyxmlerror.Tpo" "$(DEPDIR)/libCEGUITinyXMLParser_la-tinyxmlerror.Po"; \
- at am__fastdepCXX_TRUE@ else rm -f "$(DEPDIR)/libCEGUITinyXMLParser_la-tinyxmlerror.Tpo"; exit 1; \
- at am__fastdepCXX_TRUE@ fi
- at AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='ceguitinyxml/tinyxmlerror.cpp' object='libCEGUITinyXMLParser_la-tinyxmlerror.o' libtool=no @AMDEPBACKSLASH@
- at AMDEP_TRUE@@am__fastdepCXX_FALSE@ depfile='$(DEPDIR)/libCEGUITinyXMLParser_la-tinyxmlerror.Po' tmpdepfile='$(DEPDIR)/libCEGUITinyXMLParser_la-tinyxmlerror.TPo' @AMDEPBACKSLASH@
- at AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
- at am__fastdepCXX_FALSE@ $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libCEGUITinyXMLParser_la_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o libCEGUITinyXMLParser_la-tinyxmlerror.o `test -f 'ceguitinyxml/tinyxmlerror.cpp' || echo '$(srcdir)/'`ceguitinyxml/tinyxmlerror.cpp
-
-libCEGUITinyXMLParser_la-tinyxmlerror.obj: ceguitinyxml/tinyxmlerror.cpp
- at am__fastdepCXX_TRUE@ if $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libCEGUITinyXMLParser_la_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT libCEGUITinyXMLParser_la-tinyxmlerror.obj -MD -MP -MF "$(DEPDIR)/libCEGUITinyXMLParser_la-tinyxmlerror.Tpo" \
- at am__fastdepCXX_TRUE@ -c -o libCEGUITinyXMLParser_la-tinyxmlerror.obj `if test -f 'ceguitinyxml/tinyxmlerror.cpp'; then $(CYGPATH_W) 'ceguitinyxml/tinyxmlerror.cpp'; else $(CYGPATH_W) '$(srcdir)/ceguitinyxml/tinyxmlerror.cpp'; fi`; \
- at am__fastdepCXX_TRUE@ then mv -f "$(DEPDIR)/libCEGUITinyXMLParser_la-tinyxmlerror.Tpo" "$(DEPDIR)/libCEGUITinyXMLParser_la-tinyxmlerror.Po"; \
- at am__fastdepCXX_TRUE@ else rm -f "$(DEPDIR)/libCEGUITinyXMLParser_la-tinyxmlerror.Tpo"; exit 1; \
- at am__fastdepCXX_TRUE@ fi
- at AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='ceguitinyxml/tinyxmlerror.cpp' object='libCEGUITinyXMLParser_la-tinyxmlerror.obj' libtool=no @AMDEPBACKSLASH@
- at AMDEP_TRUE@@am__fastdepCXX_FALSE@ depfile='$(DEPDIR)/libCEGUITinyXMLParser_la-tinyxmlerror.Po' tmpdepfile='$(DEPDIR)/libCEGUITinyXMLParser_la-tinyxmlerror.TPo' @AMDEPBACKSLASH@
- at AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
- at am__fastdepCXX_FALSE@ $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libCEGUITinyXMLParser_la_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o libCEGUITinyXMLParser_la-tinyxmlerror.obj `if test -f 'ceguitinyxml/tinyxmlerror.cpp'; then $(CYGPATH_W) 'ceguitinyxml/tinyxmlerror.cpp'; else $(CYGPATH_W) '$(srcdir)/ceguitinyxml/tinyxmlerror.cpp'; fi`
-
-libCEGUITinyXMLParser_la-tinyxmlerror.lo: ceguitinyxml/tinyxmlerror.cpp
- at am__fastdepCXX_TRUE@ if $(LIBTOOL) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libCEGUITinyXMLParser_la_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT libCEGUITinyXMLParser_la-tinyxmlerror.lo -MD -MP -MF "$(DEPDIR)/libCEGUITinyXMLParser_la-tinyxmlerror.Tpo" \
- at am__fastdepCXX_TRUE@ -c -o libCEGUITinyXMLParser_la-tinyxmlerror.lo `test -f 'ceguitinyxml/tinyxmlerror.cpp' || echo '$(srcdir)/'`ceguitinyxml/tinyxmlerror.cpp; \
- at am__fastdepCXX_TRUE@ then mv -f "$(DEPDIR)/libCEGUITinyXMLParser_la-tinyxmlerror.Tpo" "$(DEPDIR)/libCEGUITinyXMLParser_la-tinyxmlerror.Plo"; \
- at am__fastdepCXX_TRUE@ else rm -f "$(DEPDIR)/libCEGUITinyXMLParser_la-tinyxmlerror.Tpo"; exit 1; \
- at am__fastdepCXX_TRUE@ fi
- at AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='ceguitinyxml/tinyxmlerror.cpp' object='libCEGUITinyXMLParser_la-tinyxmlerror.lo' libtool=yes @AMDEPBACKSLASH@
- at AMDEP_TRUE@@am__fastdepCXX_FALSE@ depfile='$(DEPDIR)/libCEGUITinyXMLParser_la-tinyxmlerror.Plo' tmpdepfile='$(DEPDIR)/libCEGUITinyXMLParser_la-tinyxmlerror.TPlo' @AMDEPBACKSLASH@
- at AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
- at am__fastdepCXX_FALSE@ $(LIBTOOL) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libCEGUITinyXMLParser_la_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o libCEGUITinyXMLParser_la-tinyxmlerror.lo `test -f 'ceguitinyxml/tinyxmlerror.cpp' || echo '$(srcdir)/'`ceguitinyxml/tinyxmlerror.cpp
-
-libCEGUITinyXMLParser_la-tinyxmlparser.o: ceguitinyxml/tinyxmlparser.cpp
- at am__fastdepCXX_TRUE@ if $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libCEGUITinyXMLParser_la_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT libCEGUITinyXMLParser_la-tinyxmlparser.o -MD -MP -MF "$(DEPDIR)/libCEGUITinyXMLParser_la-tinyxmlparser.Tpo" \
- at am__fastdepCXX_TRUE@ -c -o libCEGUITinyXMLParser_la-tinyxmlparser.o `test -f 'ceguitinyxml/tinyxmlparser.cpp' || echo '$(srcdir)/'`ceguitinyxml/tinyxmlparser.cpp; \
- at am__fastdepCXX_TRUE@ then mv -f "$(DEPDIR)/libCEGUITinyXMLParser_la-tinyxmlparser.Tpo" "$(DEPDIR)/libCEGUITinyXMLParser_la-tinyxmlparser.Po"; \
- at am__fastdepCXX_TRUE@ else rm -f "$(DEPDIR)/libCEGUITinyXMLParser_la-tinyxmlparser.Tpo"; exit 1; \
- at am__fastdepCXX_TRUE@ fi
- at AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='ceguitinyxml/tinyxmlparser.cpp' object='libCEGUITinyXMLParser_la-tinyxmlparser.o' libtool=no @AMDEPBACKSLASH@
- at AMDEP_TRUE@@am__fastdepCXX_FALSE@ depfile='$(DEPDIR)/libCEGUITinyXMLParser_la-tinyxmlparser.Po' tmpdepfile='$(DEPDIR)/libCEGUITinyXMLParser_la-tinyxmlparser.TPo' @AMDEPBACKSLASH@
- at AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
- at am__fastdepCXX_FALSE@ $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libCEGUITinyXMLParser_la_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o libCEGUITinyXMLParser_la-tinyxmlparser.o `test -f 'ceguitinyxml/tinyxmlparser.cpp' || echo '$(srcdir)/'`ceguitinyxml/tinyxmlparser.cpp
-
-libCEGUITinyXMLParser_la-tinyxmlparser.obj: ceguitinyxml/tinyxmlparser.cpp
- at am__fastdepCXX_TRUE@ if $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libCEGUITinyXMLParser_la_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT libCEGUITinyXMLParser_la-tinyxmlparser.obj -MD -MP -MF "$(DEPDIR)/libCEGUITinyXMLParser_la-tinyxmlparser.Tpo" \
- at am__fastdepCXX_TRUE@ -c -o libCEGUITinyXMLParser_la-tinyxmlparser.obj `if test -f 'ceguitinyxml/tinyxmlparser.cpp'; then $(CYGPATH_W) 'ceguitinyxml/tinyxmlparser.cpp'; else $(CYGPATH_W) '$(srcdir)/ceguitinyxml/tinyxmlparser.cpp'; fi`; \
- at am__fastdepCXX_TRUE@ then mv -f "$(DEPDIR)/libCEGUITinyXMLParser_la-tinyxmlparser.Tpo" "$(DEPDIR)/libCEGUITinyXMLParser_la-tinyxmlparser.Po"; \
- at am__fastdepCXX_TRUE@ else rm -f "$(DEPDIR)/libCEGUITinyXMLParser_la-tinyxmlparser.Tpo"; exit 1; \
- at am__fastdepCXX_TRUE@ fi
- at AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='ceguitinyxml/tinyxmlparser.cpp' object='libCEGUITinyXMLParser_la-tinyxmlparser.obj' libtool=no @AMDEPBACKSLASH@
- at AMDEP_TRUE@@am__fastdepCXX_FALSE@ depfile='$(DEPDIR)/libCEGUITinyXMLParser_la-tinyxmlparser.Po' tmpdepfile='$(DEPDIR)/libCEGUITinyXMLParser_la-tinyxmlparser.TPo' @AMDEPBACKSLASH@
- at AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
- at am__fastdepCXX_FALSE@ $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libCEGUITinyXMLParser_la_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o libCEGUITinyXMLParser_la-tinyxmlparser.obj `if test -f 'ceguitinyxml/tinyxmlparser.cpp'; then $(CYGPATH_W) 'ceguitinyxml/tinyxmlparser.cpp'; else $(CYGPATH_W) '$(srcdir)/ceguitinyxml/tinyxmlparser.cpp'; fi`
-
-libCEGUITinyXMLParser_la-tinyxmlparser.lo: ceguitinyxml/tinyxmlparser.cpp
- at am__fastdepCXX_TRUE@ if $(LIBTOOL) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libCEGUITinyXMLParser_la_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT libCEGUITinyXMLParser_la-tinyxmlparser.lo -MD -MP -MF "$(DEPDIR)/libCEGUITinyXMLParser_la-tinyxmlparser.Tpo" \
- at am__fastdepCXX_TRUE@ -c -o libCEGUITinyXMLParser_la-tinyxmlparser.lo `test -f 'ceguitinyxml/tinyxmlparser.cpp' || echo '$(srcdir)/'`ceguitinyxml/tinyxmlparser.cpp; \
- at am__fastdepCXX_TRUE@ then mv -f "$(DEPDIR)/libCEGUITinyXMLParser_la-tinyxmlparser.Tpo" "$(DEPDIR)/libCEGUITinyXMLParser_la-tinyxmlparser.Plo"; \
- at am__fastdepCXX_TRUE@ else rm -f "$(DEPDIR)/libCEGUITinyXMLParser_la-tinyxmlparser.Tpo"; exit 1; \
- at am__fastdepCXX_TRUE@ fi
- at AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='ceguitinyxml/tinyxmlparser.cpp' object='libCEGUITinyXMLParser_la-tinyxmlparser.lo' libtool=yes @AMDEPBACKSLASH@
- at AMDEP_TRUE@@am__fastdepCXX_FALSE@ depfile='$(DEPDIR)/libCEGUITinyXMLParser_la-tinyxmlparser.Plo' tmpdepfile='$(DEPDIR)/libCEGUITinyXMLParser_la-tinyxmlparser.TPlo' @AMDEPBACKSLASH@
- at AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
- at am__fastdepCXX_FALSE@ $(LIBTOOL) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libCEGUITinyXMLParser_la_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o libCEGUITinyXMLParser_la-tinyxmlparser.lo `test -f 'ceguitinyxml/tinyxmlparser.cpp' || echo '$(srcdir)/'`ceguitinyxml/tinyxmlparser.cpp
-
mostlyclean-libtool:
-rm -f *.lo
cegui-0.6.0-system-tolua++.patch:
--- NEW FILE cegui-0.6.0-system-tolua++.patch ---
diff -up CEGUI-0.6.0/ScriptingModules/CEGUILua/LuaScriptModule/src/Makefile.am~ CEGUI-0.6.0/ScriptingModules/CEGUILua/LuaScriptModule/src/Makefile.am
--- CEGUI-0.6.0/ScriptingModules/CEGUILua/LuaScriptModule/src/Makefile.am~ 2008-05-19 08:55:13.000000000 +0200
+++ CEGUI-0.6.0/ScriptingModules/CEGUILua/LuaScriptModule/src/Makefile.am 2008-05-19 08:55:13.000000000 +0200
@@ -1,5 +1,4 @@
INCLUDES = -I$(top_srcdir)/include \
- -I$(top_srcdir)/ScriptingModules/CEGUILua/tolua++ \
-I$(top_srcdir)/ScriptingModules/CEGUILua/LuaScriptModule/include
libCEGUILuaScriptModule_la_LDFLAGS =
@@ -19,6 +19,6 @@ libCEGUILuaScriptModule_la_SOURCES = lua
CEGUILua.cpp \
CEGUILuaFunctor.cpp \
required.cpp
-libCEGUILuaScriptModule_la_LIBADD = ../../../../src/libCEGUIBase.la ../../tolua++/libCEGUItoluapp.la
+libCEGUILuaScriptModule_la_LIBADD = ../../../../src/libCEGUIBase.la -ltolua++
noinst_HEADERS = required.h
diff -up CEGUI-0.6.0/ScriptingModules/CEGUILua/LuaScriptModule/src/Makefile.in~ CEGUI-0.6.0/ScriptingModules/CEGUILua/LuaScriptModule/src/Makefile.in
--- CEGUI-0.6.0/ScriptingModules/CEGUILua/LuaScriptModule/src/Makefile.in~ 2008-05-19 08:55:29.000000000 +0200
+++ CEGUI-0.6.0/ScriptingModules/CEGUILua/LuaScriptModule/src/Makefile.in 2008-05-19 08:55:29.000000000 +0200
@@ -224,7 +224,6 @@ target_alias = @target_alias@
xerces_CFLAGS = @xerces_CFLAGS@
xerces_LIBS = @xerces_LIBS@
INCLUDES = -I$(top_srcdir)/include \
- -I$(top_srcdir)/ScriptingModules/CEGUILua/tolua++ \
-I$(top_srcdir)/ScriptingModules/CEGUILua/LuaScriptModule/include
@@ -230,7 +230,7 @@ INCLUDES = -I$(top_srcdir)/include \
libCEGUILuaScriptModule_la_LDFLAGS = $(am__append_2) -release @PACKAGE_VERSION@
libCEGUILuaScriptModule_la_CPPFLAGS = $(Lua_CFLAGS) $(am__append_1)
-libCEGUILuaScriptModule_la_LIBADD = ../../../../src/libCEGUIBase.la ../../tolua++/libCEGUItoluapp.la
+libCEGUILuaScriptModule_la_LIBADD = ../../../../src/libCEGUIBase.la -ltolua++
lib_LTLIBRARIES = libCEGUILuaScriptModule.la
diff -up CEGUI-0.6.0/ScriptingModules/CEGUILua/Makefile.am~ CEGUI-0.6.0/ScriptingModules/CEGUILua/Makefile.am
--- CEGUI-0.6.0/ScriptingModules/CEGUILua/Makefile.am~ 2008-05-19 09:01:23.000000000 +0200
+++ CEGUI-0.6.0/ScriptingModules/CEGUILua/Makefile.am 2008-05-19 09:01:23.000000000 +0200
@@ -1,4 +1,4 @@
if CEGUI_BUILD_TOLUACEGUI
TOLUACEGUI_DIR=tolua++bin
endif
-SUBDIRS = tolua++ $(TOLUACEGUI_DIR) LuaScriptModule
+SUBDIRS = $(TOLUACEGUI_DIR) LuaScriptModule
diff -up CEGUI-0.6.0/ScriptingModules/CEGUILua/Makefile.in~ CEGUI-0.6.0/ScriptingModules/CEGUILua/Makefile.in
--- CEGUI-0.6.0/ScriptingModules/CEGUILua/Makefile.in~ 2008-05-19 09:01:41.000000000 +0200
+++ CEGUI-0.6.0/ScriptingModules/CEGUILua/Makefile.in 2008-05-19 09:01:41.000000000 +0200
@@ -222,7 +222,7 @@ target_alias = @target_alias@
xerces_CFLAGS = @xerces_CFLAGS@
xerces_LIBS = @xerces_LIBS@
@CEGUI_BUILD_TOLUACEGUI_TRUE at TOLUACEGUI_DIR = tolua++bin
-SUBDIRS = tolua++ $(TOLUACEGUI_DIR) LuaScriptModule
+SUBDIRS = $(TOLUACEGUI_DIR) LuaScriptModule
subdir = ScriptingModules/CEGUILua
ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
@@ -236,7 +236,7 @@ RECURSIVE_TARGETS = info-recursive dvi-r
installdirs-recursive install-recursive uninstall-recursive \
check-recursive installcheck-recursive
DIST_COMMON = $(srcdir)/Makefile.in Makefile.am
-DIST_SUBDIRS = tolua++ tolua++bin LuaScriptModule
+DIST_SUBDIRS = tolua++bin LuaScriptModule
all: all-recursive
.SUFFIXES:
cegui-0.6.0-userverso.patch:
--- NEW FILE cegui-0.6.0-userverso.patch ---
--- CEGUI-0.6.0.orig/src/CEGUIDynamicModule.cpp 2008-02-08 23:50:51.000000000 +0300
+++ CEGUI-0.6.0/src/CEGUIDynamicModule.cpp 2008-05-17 16:58:25.000000000 +0400
@@ -87,6 +87,30 @@
if (d_moduleName.substr(0, 3) != "lib")
{
d_moduleName.insert(0, "lib");
+
+ // Insist on opening the versioned .so so that the development package
+ // does not need to be installed
+ if (d_moduleName == "libCEGUIBase.so")
+ {
+ d_moduleName += ".1";
+ }
+ else if (d_moduleName == "libCEGUIFalagardWRBase.so")
+ {
+ d_moduleName += ".1";
+ }
+ else if (d_moduleName == "libCEGUILuaScriptModule.so")
+ {
+ d_moduleName += ".1";
+ }
+ else if (d_moduleName == "libCEGUItoluapp.so")
+ {
+ d_moduleName += ".1";
+ }
+ else
+ {
+ d_moduleName += ".0";
+ }
+
d_handle = DYNLIB_LOAD(d_moduleName.c_str());
}
}
Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/cegui/devel/.cvsignore,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- .cvsignore 21 Jun 2007 23:38:43 -0000 1.3
+++ .cvsignore 19 May 2008 12:02:20 -0000 1.4
@@ -1,2 +1,2 @@
-CEGUI-0.5.0b.tar.gz
-CEGUI-DOCS-0.5.0.tar.gz
+CEGUI-0.6.0.tar.gz
+CEGUI-DOCS-0.6.0.tar.gz
Index: cegui.spec
===================================================================
RCS file: /cvs/extras/rpms/cegui/devel/cegui.spec,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- cegui.spec 13 Feb 2008 18:58:30 -0000 1.9
+++ cegui.spec 19 May 2008 12:02:20 -0000 1.10
@@ -1,23 +1,18 @@
-%define VER 0.5.0
-
Name: cegui
-Version: %{VER}b
-Release: 7%{?dist}
+Version: 0.6.0
+Release: 1%{?dist}
Summary: Free library providing windowing and widgets for graphics APIs / engines
Group: System Environment/Libraries
-# Most of the source is MIT with the exception of the modified and embedded
-# tolua++ which is "Freely redistributable without restriction"
-License: MIT and Freely redistributable without restriction
+License: MIT
URL: http://www.cegui.org.uk
Source0: http://downloads.sourceforge.net/crayzedsgui/CEGUI-%{version}.tar.gz
-Source1: http://downloads.sourceforge.net/crayzedsgui/CEGUI-DOCS-%{VER}.tar.gz
-Patch0: cegui-0.5.0-userverso.patch
-Patch1: cegui-0.5.0-lua51.patch
-Patch2: cegui-0.5.0-fixweaksymbol.patch
-Patch3: cegui-0.5.0-xerces-c-2.8.patch
+Source1: http://downloads.sourceforge.net/crayzedsgui/CEGUI-DOCS-%{version}.tar.gz
+Patch0: cegui-0.6.0-userverso.patch
+Patch1: cegui-0.6.0-fixweaksymbol.patch
+Patch2: cegui-0.6.0-release-as-so-ver.patch
+Patch3: cegui-0.6.0-system-tolua++.patch
+Patch4: cegui-0.6.0-system-tinyxml.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-BuildRequires: autoconf
-BuildRequires: automake17
BuildRequires: DevIL-devel
BuildRequires: expat-devel
BuildRequires: freetype-devel > 2.0.0
@@ -31,6 +26,8 @@
BuildRequires: pkgconfig >= 0.9.0
BuildRequires: SILLY-devel
BuildRequires: xerces-c-devel
+BuildRequires: tolua++-devel
+BuildRequires: tinyxml-devel
%description
Crazy Eddie's GUI System is a free library providing windowing and widgets for
@@ -60,11 +57,12 @@
%prep
-%setup -qb1 -qn CEGUI-%{VER}
+%setup -qb1 -qn CEGUI-%{version}
%patch0 -p1
%patch1 -p1
%patch2 -p1
%patch3 -p1
+%patch4 -p1
# Permission fixes for debuginfo RPM
chmod -x include/falagard/*.h
@@ -74,28 +72,22 @@
# Encoding fixes
iconv -f iso8859-1 AUTHORS -t utf8 > AUTHORS.conv && mv -f AUTHORS.conv AUTHORS
-iconv -f iso8859-1 TODO -t utf8 > TODO.conv && mv -f TODO.conv README
+iconv -f iso8859-1 TODO -t utf8 > TODO.conv && mv -f TODO.conv TODO
iconv -f iso8859-1 README -t utf8 > README.conv && mv -f README.conv README
-# Run automake/autoconf due to patches 1 & 2
-touch INSTALL NEWS
-automake-1.7
-autoconf
-
%build
%configure --disable-static --disable-corona --enable-devil \
--enable-lua-module --disable-irrlicht-renderer --disable-samples \
--with-default-xml-parser=ExpatParser --enable-silly \
--with-default-image-codec=SILLYImageCodec --with-pic
-
-make %{?_smp_mflags} LIBTOOL="/usr/bin/libtool"
+make %{?_smp_mflags}
%install
rm -rf %{buildroot}
-# Strange but FC6 needs libtool here also on x86_64 to avoid rpath problems.
-make install DESTDIR=%{buildroot} LIBTOOL="/usr/bin/libtool"
+make install DESTDIR=%{buildroot}
+find $RPM_BUILD_ROOT -name '*.la' -exec rm -f {} ';'
%clean
@@ -108,18 +100,18 @@
%files
%defattr(-,root,root,-)
-%{_libdir}/libCEGUI*.so.*
-%exclude %{_libdir}/*.la
-%exclude %{_libdir}/*.a
%doc AUTHORS ChangeLog COPYING README TinyXML-License TODO
+%{_libdir}/libCEGUI*-%{version}.so
%files devel
%defattr(-,root,root,-)
%{_libdir}/*.so
+%exclude %{_libdir}/libCEGUI*-%{version}.so
%{_libdir}/pkgconfig/CEGUI-OPENGL.pc
%{_libdir}/pkgconfig/CEGUI.pc
%{_includedir}/CEGUI
+%{_datadir}/CEGUI
%files devel-doc
@@ -127,6 +119,12 @@
%changelog
+* Sun May 18 2008 Hans de Goede <j.w.r.degoede at hhs.nl> 0.6.0-1
+- New upstream release 0.6.0
+- No ABI stability, use full versioned (libtool -release) sonames
+- Use system tolua++, change license tag to match
+- Use system tinyxml
+
* Wed Feb 13 2008 Ian Chapman <packages[AT]amiga-hardware.com> 0.5.0b-7
- Added patch for new xerces-c. Courtesy of Hans de Goede
- Converted some documentation to UTF8
Index: sources
===================================================================
RCS file: /cvs/extras/rpms/cegui/devel/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- sources 21 Jun 2007 23:38:43 -0000 1.3
+++ sources 19 May 2008 12:02:20 -0000 1.4
@@ -1,2 +1,2 @@
-b42322a33c6a06eede76b15f75694a17 CEGUI-0.5.0b.tar.gz
-e268b5812f146ee1ff9ba4c07ff501b7 CEGUI-DOCS-0.5.0.tar.gz
+a7772b20a4e3530298e3e28c4eaec1bb CEGUI-0.6.0.tar.gz
+8abece86ea0b8a52737579ac2e801978 CEGUI-DOCS-0.6.0.tar.gz
--- cegui-0.5.0-fixweaksymbol.patch DELETED ---
--- cegui-0.5.0-lua51.patch DELETED ---
--- cegui-0.5.0-userverso.patch DELETED ---
--- cegui-0.5.0-xerces-c-2.8.patch DELETED ---
More information about the fedora-extras-commits
mailing list