Attachment 305793 Details for Bug 440329 – Updated patch for cegui to new version

[patch] Updated patch for cegui to new version

cegui-0.6.0-fixweaksymbol.patch (text/plain), 7.79 KB, created by Alexey Torkhov on 2008-05-17 08:52:13 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Alexey Torkhov

Created: 2008-05-17 08:52:13 UTC

Size: 7.79 KB

patch

obsolete

>diff -uNr -x '*.in' -x '*.log' CEGUI-0.6.0.orig/ImageCodecModules/DevILImageCodec/Makefile.am CEGUI-0.6.0/ImageCodecModules/DevILImageCodec/Makefile.am
>--- CEGUI-0.6.0.orig/ImageCodecModules/DevILImageCodec/Makefile.am	2008-02-08 23:50:51.000000000 +0300
>+++ CEGUI-0.6.0/ImageCodecModules/DevILImageCodec/Makefile.am	2008-05-17 12:03:31.000000000 +0400
>@@ -10,7 +10,7 @@
> 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 -uNr -x '*.in' -x '*.log' CEGUI-0.6.0.orig/ImageCodecModules/FreeImageImageCodec/Makefile.am CEGUI-0.6.0/ImageCodecModules/FreeImageImageCodec/Makefile.am
>--- CEGUI-0.6.0.orig/ImageCodecModules/FreeImageImageCodec/Makefile.am	2008-02-08 23:50:51.000000000 +0300
>+++ CEGUI-0.6.0/ImageCodecModules/FreeImageImageCodec/Makefile.am	2008-05-17 12:03:31.000000000 +0400
>@@ -9,7 +9,7 @@
> 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 -uNr -x '*.in' -x '*.log' CEGUI-0.6.0.orig/ImageCodecModules/SILLYImageCodec/Makefile.am CEGUI-0.6.0/ImageCodecModules/SILLYImageCodec/Makefile.am
>--- CEGUI-0.6.0.orig/ImageCodecModules/SILLYImageCodec/Makefile.am	2008-02-08 23:50:51.000000000 +0300
>+++ CEGUI-0.6.0/ImageCodecModules/SILLYImageCodec/Makefile.am	2008-05-17 12:03:31.000000000 +0400
>@@ -9,7 +9,7 @@
> 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 -uNr -x '*.in' -x '*.log' CEGUI-0.6.0.orig/ImageCodecModules/TGAImageCodec/Makefile.am CEGUI-0.6.0/ImageCodecModules/TGAImageCodec/Makefile.am
>--- CEGUI-0.6.0.orig/ImageCodecModules/TGAImageCodec/Makefile.am	2008-02-08 23:50:51.000000000 +0300
>+++ CEGUI-0.6.0/ImageCodecModules/TGAImageCodec/Makefile.am	2008-05-17 12:05:56.000000000 +0400
>@@ -1,14 +1,17 @@
> INCLUDES=-I$(top_srcdir)/include 
> pkgincludedir=$(prefix)/include/CEGUI/ImageCodecModules/TGAImageCodec
> 
>+libCEGUITGAImageCodec_la_LIBADD =
>+
> if MINGW32_BUILD
> libCEGUITGAImageCodec_la_CPPFLAGS = -DCEGUITGAIMAGECODEC_EXPORTS
> libCEGUITGAImageCodec_la_LDFLAGS = -no-undefined -avoid-version
>-libCEGUITGAImageCodec_la_LIBADD = -L$(top_builddir)/src -lCEGUIBase
>+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 -uNr -x '*.in' -x '*.log' CEGUI-0.6.0.orig/RendererModules/OpenGLGUIRenderer/Makefile.am CEGUI-0.6.0/RendererModules/OpenGLGUIRenderer/Makefile.am
>--- CEGUI-0.6.0.orig/RendererModules/OpenGLGUIRenderer/Makefile.am	2008-02-08 23:50:51.000000000 +0300
>+++ CEGUI-0.6.0/RendererModules/OpenGLGUIRenderer/Makefile.am	2008-05-17 12:03:31.000000000 +0400
>@@ -11,7 +11,7 @@
> libCEGUIOpenGLRenderer_la_LIBADD += -L$(top_builddir)/src -lCEGUIBase
> endif
> 
>-libCEGUIOpenGLRenderer_la_LIBADD += $(OpenGL_LIBS)
>+libCEGUIOpenGLRenderer_la_LIBADD += $(OpenGL_LIBS) ../../src/libCEGUIBase.la -lGL -lGLU
> 
> libCEGUIOpenGLRenderer_la_LDFLAGS += -version-info @CEGUI_OPENGL_VERSION_INFO@
> 
>diff -uNr -x '*.in' -x '*.log' CEGUI-0.6.0.orig/ScriptingModules/CEGUILua/LuaScriptModule/src/Makefile.am CEGUI-0.6.0/ScriptingModules/CEGUILua/LuaScriptModule/src/Makefile.am
>--- CEGUI-0.6.0.orig/ScriptingModules/CEGUILua/LuaScriptModule/src/Makefile.am	2008-02-09 19:09:17.000000000 +0300
>+++ CEGUI-0.6.0/ScriptingModules/CEGUILua/LuaScriptModule/src/Makefile.am	2008-05-17 12:06:25.000000000 +0400
>@@ -4,11 +4,12 @@
> 
> libCEGUILuaScriptModule_la_LDFLAGS =
> libCEGUILuaScriptModule_la_CPPFLAGS = $(Lua_CFLAGS)
>+libCEGUILuaScriptModule_la_LIBADD =
> 
> if MINGW32_BUILD
> libCEGUILuaScriptModule_la_CPPFLAGS += -DCEGUILUA_EXPORTS
> libCEGUILuaScriptModule_la_LDFLAGS += -no-undefined -avoid-version
>-libCEGUILuaScriptModule_la_LIBADD = -L$(top_builddir)/src/ \
>+libCEGUILuaScriptModule_la_LIBADD += -L$(top_builddir)/src/ \
>                                     -L$(top_builddir)/ScriptingModules/CEGUILua/tolua++ \
>                                     -lCEGUIBase -lCEGUItoluapp $(Lua_LIBS)
> endif
>@@ -22,5 +23,6 @@
>                                      CEGUILua.cpp \
>                                      CEGUILuaFunctor.cpp \
>                                      required.cpp
>+libCEGUILuaScriptModule_la_LIBADD += ../../../../src/libCEGUIBase.la ../../tolua++/libCEGUItoluapp.la
> 
> noinst_HEADERS = required.h
>diff -uNr -x '*.in' -x '*.log' CEGUI-0.6.0.orig/XMLParserModules/expatParser/Makefile.am CEGUI-0.6.0/XMLParserModules/expatParser/Makefile.am
>--- CEGUI-0.6.0.orig/XMLParserModules/expatParser/Makefile.am	2008-02-08 23:50:51.000000000 +0300
>+++ CEGUI-0.6.0/XMLParserModules/expatParser/Makefile.am	2008-05-17 12:03:31.000000000 +0400
>@@ -8,7 +8,7 @@
> 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 -uNr -x '*.in' -x '*.log' CEGUI-0.6.0.orig/XMLParserModules/libxmlParser/Makefile.am CEGUI-0.6.0/XMLParserModules/libxmlParser/Makefile.am
>--- CEGUI-0.6.0.orig/XMLParserModules/libxmlParser/Makefile.am	2008-02-08 23:50:51.000000000 +0300
>+++ CEGUI-0.6.0/XMLParserModules/libxmlParser/Makefile.am	2008-05-17 12:03:31.000000000 +0400
>@@ -8,7 +8,7 @@
> 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 -uNr -x '*.in' -x '*.log' CEGUI-0.6.0.orig/XMLParserModules/TinyXMLParser/Makefile.am CEGUI-0.6.0/XMLParserModules/TinyXMLParser/Makefile.am
>--- CEGUI-0.6.0.orig/XMLParserModules/TinyXMLParser/Makefile.am	2008-02-08 23:50:51.000000000 +0300
>+++ CEGUI-0.6.0/XMLParserModules/TinyXMLParser/Makefile.am	2008-05-17 12:06:48.000000000 +0400
>@@ -1,9 +1,11 @@
> INCLUDES = -I$(top_srcdir)/include
> 
>+libCEGUITinyXMLParser_la_LIBADD =
>+
> if MINGW32_BUILD
> libCEGUITinyXMLParser_la_CPPFLAGS = -DCEGUITINYXMLPARSER_EXPORTS
> libCEGUITinyXMLParser_la_LDFLAGS = -no-undefined -avoid-version
>-libCEGUITinyXMLParser_la_LIBADD = -L$(top_builddir)/src -lCEGUIBase
>+libCEGUITinyXMLParser_la_LIBADD += -L$(top_builddir)/src -lCEGUIBase
> endif
> 
> lib_LTLIBRARIES=libCEGUITinyXMLParser.la
>@@ -14,6 +16,7 @@
>                                    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 -uNr -x '*.in' -x '*.log' CEGUI-0.6.0.orig/XMLParserModules/XercesParser/Makefile.am CEGUI-0.6.0/XMLParserModules/XercesParser/Makefile.am
>--- CEGUI-0.6.0.orig/XMLParserModules/XercesParser/Makefile.am	2008-02-08 23:50:51.000000000 +0300
>+++ CEGUI-0.6.0/XMLParserModules/XercesParser/Makefile.am	2008-05-17 12:03:31.000000000 +0400
>@@ -8,7 +8,7 @@
> 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
>

Actions: View | Diff

Attachments on bug 440329: 305792 | 305793 | 305794 | 305801