diff options
| author | pixel <pixel> | 2008-08-04 15:36:33 +0000 |
|---|---|---|
| committer | pixel <pixel> | 2008-08-04 15:36:33 +0000 |
| commit | 91521058f068ba8be4e3812f026d4d72e8f2d8e8 (patch) | |
| tree | 76d6de3efcce5c635ff3e7ddeaaf9c04c08b309e | |
| parent | 88aa1ca175c3f9c73ab2d0fd7f1636f87c1f8167 (diff) | |
Fixing some win32 backport.
| -rw-r--r-- | Makefile.mingw32 | 7 | ||||
| -rw-r--r-- | src/lua-interface.cpp | 6 |
2 files changed, 8 insertions, 5 deletions
diff --git a/Makefile.mingw32 b/Makefile.mingw32 index 12b9892..834dc72 100644 --- a/Makefile.mingw32 +++ b/Makefile.mingw32 @@ -10,13 +10,14 @@ INCLUDES = \ -I../Baltisot/lib/lua/include -I../Baltisot/lib/lua/includes \ -I../lua-modules/src \ -I../Baltisot/MSVC/iconv -I../Baltisot/MSVC/regex -I../Baltisot/MSVC \ +-I../Mesa-7.0.3-win32/include \ -I../pthreads-w32-2-8-0-release/ \ HAVES = -DHAVE_VSSCANF -DHAVE_LIBJPEG -DHAVE_MALLOC_H -DHAVE_BYTESWAP_H CPPFLAGS += $(INCLUDES) -g -fexceptions -DLUATASK_OMIT_COMMAND -DSTDC_HEADERS -DLIBICONV_PLUG -DREADLINE_STATIC -fexceptions -DWORDS_LITTLEENDIAN -march=i686 $(HAVES) -DUSE_MPQLIB -LDFLAGS += -g -fexceptions -Wl,--enable-auto-image-base -Wl,--export-dynamic --export-all-symbols -Wl,--enable-auto-import -fexceptions ../libreadline-static.a ../libz.a -lwsock32 -lws2_32 ../pthreads-w32-2-8-0-release/libpthreadGC2.a +LDFLAGS += -g -fexceptions -Wl,--enable-auto-image-base -Wl,--export-dynamic --export-all-symbols -Wl,--enable-auto-import -fexceptions ../libreadline-static.a ../libz.a -lwsock32 -lws2_32 ../pthreads-w32-2-8-0-release/libpthreadGC2.a --enable-stdcall-fixup vpath %.c ../Baltisot/lib:../Baltisot/src:../Baltisot/lib/zlib/src:../Baltisot/lib/lua/src:../Baltisot/lib/lua/src/LuaLib:src:../paperIdol/src:../mogltk/lib:../tinyxml:../lua-modules/src:../Baltisot/MSVC/iconv:../Baltisot/MSVC/regex vpath %.cc ../Baltisot/lib:../Baltisot/src:../Baltisot/lib/zlib/src:../Baltisot/lib/lua/src:../Baltisot/lib/lua/src/LuaLib:src:../paperIdol/src:../mogltk/lib:../tinyxml:../lua-modules/src:../Baltisot/MSVC/iconv:../Baltisot/MSVC/regex @@ -27,6 +28,8 @@ LUAINTERFACE_SOURCES = \ lua-interface.cc \ lua-plugin.cc \ +LUAINTERFACE_LDFLAGS = -Wl,--whole-archive ../Mesa-7.0.3-win32/lib/libGLU.a ../Mesa-7.0.3-win32/lib/libOSMesa.a -Wl,--no-whole-archive + BALTISOT_SOURCES = \ Main.cc \ \ @@ -164,7 +167,7 @@ luac.exe: $(LUAC_OBJECTS) $(LD) -o luac.exe $(LUAC_OBJECTS) $(LDFLAGS) lua-interface.dll: $(LUAINTERFACE_DLL_OBJECTS) - $(LD) -shared -Wl,--output-def=lua-interface.def -Wl,--out-implib=lua-interface.a -o lua-interface.dll $(LUAINTERFACE_DLL_OBJECTS) $(LDFLAGS) + $(LD) -shared -Wl,--output-def=lua-interface.def -Wl,--out-implib=lua-interface.a -o lua-interface.dll $(LUAINTERFACE_DLL_OBJECTS) $(LDFLAGS) $(LUAINTERFACE_LDFLAGS) lua-interface.exe: $(LUAINTERFACE_OBJECTS) $(LD) -o lua-interface.exe $(LUAINTERFACE_OBJECTS) ./lua-interface.a $(LDFLAGS) diff --git a/src/lua-interface.cpp b/src/lua-interface.cpp index 6a773f1..d216878 100644 --- a/src/lua-interface.cpp +++ b/src/lua-interface.cpp @@ -1,6 +1,6 @@ /* - * PSX-Tools Bundle Pack - * Copyright (C) 2002-2005 Nicolas "Pixel" Noble + * lua-interface + * Copyright (C) 2002-2008 Nicolas "Pixel" Noble * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by @@ -17,7 +17,7 @@ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */ -/* $Id: lua-interface.cpp,v 1.6 2008-08-04 09:36:35 pixel Exp $ */ +/* $Id: lua-interface.cpp,v 1.7 2008-08-04 15:36:33 pixel Exp $ */ #define WIP |