diff options
| author | Pixel <pixel@nobis-crew.org> | 2009-03-23 11:01:31 -0700 |
|---|---|---|
| committer | Pixel <pixel@nobis-crew.org> | 2009-03-23 11:01:31 -0700 |
| commit | 5ca27a03b2d78cee1054fca1099ad0d1326fad07 (patch) | |
| tree | 00e7a3ea6460e3803db878b7dff2e8b47e4a1405 | |
| parent | 09361034a6328acf530c9fa5bb7bb5b0b57bd574 (diff) | |
| parent | 80ac1eed9aa08ce345e8903a10907a68d096433f (diff) | |
Merge branch 'master' of ssh+git://git.grumpycoder.net/pub/repo.git/lua-interface
| -rw-r--r-- | Makefile | 6 | ||||
| -rw-r--r-- | Makefile.mingw32 | 3 |
2 files changed, 5 insertions, 4 deletions
@@ -1,7 +1,7 @@ SYSTEM=$(shell uname) ifeq ($(SYSTEM),Darwin) ARCH_FLAGS= -LDFLAGS_MESA=-all_load ../Mesa-7.2/lib/libGLU.a ../Mesa-7.2/lib/libOSMesa.a +LDFLAGS_MESA=-all_load ../Mesa-7.3/lib/libGLU.a ../Mesa-7.3/lib/libOSMesa.a CPPFLAGS_READLINE= LDFLAGS_READLINE=-lreadline -lncurses SHARED_FLAGS=-dynamiclib @@ -13,7 +13,7 @@ LDFLAGS_GL = -L/usr/X11/lib -lGLU -lGL -X11 -dylib_file \ /System/Library/Frameworks/OpenGL.framework/Versions/A/Libraries/libGL.dylib else ARCH_FLAGS=-march=i686 -m32 -LDFLAGS_MESA=-u gluNewTess -Wl,--whole-archive ../Mesa-7.2/lib/libGLU.a ../Mesa-7.2/lib/libOSMesa.a -Wl,--no-whole-archive +LDFLAGS_MESA=-u gluNewTess -Wl,--whole-archive ../Mesa-7.3/lib/libGLU.a ../Mesa-7.3/lib/libOSMesa.a -Wl,--no-whole-archive CPPFLAGS_READLINE=-DREADLINE_STATIC LDFLAGS_READLINE=/usr/lib/libreadline.a /usr/lib/libncurses.a SHARED_FLAGS=-shared @@ -32,7 +32,7 @@ INCLUDES = \ -I../Baltisot/lib/lua/include -I../Baltisot/lib/lua/includes \ -I../lua-modules/src \ \ --I ../Mesa-7.2/include \ +-I ../Mesa-7.3/include \ -I ../tinyxml \ -I /usr/include/mysql \ -I /usr/include/FTGL -I /usr/include/freetype2 \ diff --git a/Makefile.mingw32 b/Makefile.mingw32 index b196de2..9071aa5 100644 --- a/Makefile.mingw32 +++ b/Makefile.mingw32 @@ -34,7 +34,7 @@ vpath %.cpp ../Baltisot/lib:../Baltisot/src:../Baltisot/lib/zlib/src:../Baltisot vpath %.lua ../Baltisot/lib:../Baltisot/src LUAINTERFACE_SOURCES = \ -lua-interface-win32-main.c \ +lua-interface-main.c \ LUAINTERFACE_LDFLAGS = -Wl,--whole-archive ../Mesa-7.0.3-mingw32/lib/libGLU.a ../Mesa-7.0.3-mingw32/lib/libOSMesa.a -Wl,--no-whole-archive @@ -75,6 +75,7 @@ Form.cc \ SocketClient.cc \ HttpClient.cc \ MailClient.cc \ +MailServer.cc \ HashFunction.cc \ \ BLua.cc \ |