]>
Commit | Line | Data |
---|---|---|
ae5409c5 JB |
1 | --- CEGUI-0.5.0/acinclude.m4.orig 2006-10-25 12:54:43.000000000 +0200 |
2 | +++ CEGUI-0.5.0/acinclude.m4 2007-05-27 18:37:36.052672449 +0200 | |
3 | @@ -55,9 +55,6 @@ | |
4 | CEGUI_CHECK_XERCES(xerces, [cegui_found_xerces=yes], [cegui_found_xerces=no]) | |
5 | CEGUI_CHECK_EXPAT(expat, [cegui_found_expat=yes], [cegui_found_expat=no]) | |
6 | ||
7 | - dnl save lots of linker aggro ;) | |
8 | - LIBS="$xerces_LIBS $LIBS" | |
9 | - | |
10 | dnl Find out what user disabled as far as parsers go | |
11 | AC_ARG_ENABLE([xerces-c], AC_HELP_STRING([--disable-xerces-c], [Disables building of the Xerces-C++ XML parser module.]), | |
12 | [cegui_with_xerces=$enableval], [cegui_with_xerces=yes]) | |
13 | @@ -267,7 +264,7 @@ | |
14 | [cegui_default_image_codec=$withval], [cegui_default_image_codec=none]) | |
15 | AC_PATH_XTRA | |
16 | cegui_saved_LIBS="$LIBS" | |
17 | - LIBS="$X_PRE_LIBS $X_LIBS $X_EXTRA_LIBS" | |
18 | + LIBS="$X_LIBS $X_EXTRA_LIBS" | |
19 | ||
20 | AC_SEARCH_LIBS(glInterleavedArrays, MesaGL GL, cegui_found_lib_GL=yes, cegui_found_lib_GL=no) | |
21 | AC_SEARCH_LIBS(gluOrtho2D, MesaGLU GLU, cegui_found_lib_GLU=yes, cegui_found_lib_GLU=no) | |
22 | @@ -309,7 +306,7 @@ | |
23 | dnl FreeImage | |
24 | if test x$cegui_with_freeimage = xyes ; then | |
25 | AC_LANG_PUSH(C++) | |
26 | - AC_SEARCH_LIBS(FreeImage_GetVersion, freeimage, [cegui_with_freeimage_lib=yes], [cegui_with_freeimage_lib=no]) | |
27 | + AC_CHECK_LIB(freeimage, FreeImage_GetVersion, [cegui_with_freeimage_lib=yes], [cegui_with_freeimage_lib=no]) | |
28 | AC_LANG_POP(C++) | |
29 | AC_CHECK_HEADER(FreeImage.h, [cegui_with_freeimage_header=yes], [cegui_with_freeimage_header=no], []) | |
30 | if test x$cegui_with_freeimage_lib = xyes -a x$cegui_with_freeimage_header = xyes ; then | |
31 | @@ -537,7 +534,7 @@ | |
32 | ]) | |
33 | ||
34 | AC_DEFUN([CEGUI_CHECK_LUA],[ | |
35 | - PKG_CHECK_MODULES(Lua, lua >= 5.0 lua < 5.1, [cegui_found_lua=yes], [cegui_found_lua=no]) | |
36 | + PKG_CHECK_MODULES(Lua, lua50 >= 5.0 lua50 < 5.1, [cegui_found_lua=yes], [cegui_found_lua=no]) | |
37 | ||
38 | AC_ARG_ENABLE([lua-module], AC_HELP_STRING([--disable-lua-module], [Disables building of the Lua scripting module.]), | |
39 | [cegui_with_lua=$enableval], [cegui_with_lua=yes]) | |
40 | --- CEGUI-0.5.0/RendererModules/OpenGLGUIRenderer/Makefile.am.orig 2006-07-28 03:24:36.000000000 +0200 | |
41 | +++ CEGUI-0.5.0/RendererModules/OpenGLGUIRenderer/Makefile.am 2007-05-27 18:49:01.872325129 +0200 | |
42 | @@ -3,6 +3,7 @@ | |
43 | pkginclude_HEADERS = openglrenderer.h opengltexture.h | |
44 | lib_LTLIBRARIES=libCEGUIOpenGLRenderer.la | |
45 | libCEGUIOpenGLRenderer_la_LDFLAGS = -version-info @CEGUI_OPENGL_VERSION_INFO@ | |
46 | +libCEGUIOpenGLRenderer_la_LIBADD = $(top_builddir)/src/libCEGUIBase.la -lGLU -lGL | |
47 | libCEGUIOpenGLRenderer_la_SOURCES = openglrenderer.cpp opengltexture.cpp | |
48 | ||
49 | ||
50 | --- CEGUI-0.5.0/ScriptingModules/CEGUILua/tolua++bin/Makefile.am.orig 2006-10-17 13:58:04.000000000 +0200 | |
51 | +++ CEGUI-0.5.0/ScriptingModules/CEGUILua/tolua++bin/Makefile.am 2007-05-27 18:59:43.330163303 +0200 | |
52 | @@ -1,4 +1,5 @@ | |
53 | -INCLUDES = -I$(top_srcdir)/ScriptingModules/CEGUILua/tolua++ | |
54 | +INCLUDES = -I$(top_srcdir)/ScriptingModules/CEGUILua/tolua++ \ | |
55 | + $(Lua_CFLAGS) | |
56 | ||
57 | bin_PROGRAMS = tolua++cegui | |
58 | tolua__cegui_SOURCES = tolua.c toluabind.c toluabind.h | |
59 | --- CEGUI-0.5.0/ScriptingModules/CEGUILua/LuaScriptModule/src/Makefile.am.orig 2006-07-25 10:34:51.000000000 +0200 | |
60 | +++ CEGUI-0.5.0/ScriptingModules/CEGUILua/LuaScriptModule/src/Makefile.am 2007-05-27 19:40:54.206484382 +0200 | |
61 | @@ -1,9 +1,12 @@ | |
62 | INCLUDES = -I$(top_srcdir)/include \ | |
63 | -I$(top_srcdir)/ScriptingModules/CEGUILua/tolua++ \ | |
64 | - -I$(top_srcdir)/ScriptingModules/CEGUILua/LuaScriptModule/include | |
65 | + -I$(top_srcdir)/ScriptingModules/CEGUILua/LuaScriptModule/include \ | |
66 | + $(Lua_CFLAGS) | |
67 | lib_LTLIBRARIES = libCEGUILuaScriptModule.la | |
68 | ||
69 | libCEGUILuaScriptModule_la_LDFLAGS = -version-info @CEGUI_VERSION_INFO@ | |
70 | +libCEGUILuaScriptModule_la_LIBADD = $(top_builddir)/src/libCEGUIBase.la \ | |
71 | + $(top_builddir)/ScriptingModules/CEGUILua/tolua++/libCEGUItoluapp.la | |
72 | ||
73 | libCEGUILuaScriptModule_la_SOURCES = lua_CEGUI.cpp \ | |
74 | CEGUILua.cpp \ |