diff options
| author | pixel <pixel> | 2008-08-06 11:55:03 +0000 |
|---|---|---|
| committer | pixel <pixel> | 2008-08-06 11:55:03 +0000 |
| commit | ca2adbb95bac54848159bd1289faee7d66012b2b (patch) | |
| tree | 3de95e099b997ef522a095df822cb0331eb368ee /Makefile.mingw32 | |
| parent | 805d302b116d4698ac7602a8c65c02cf9cc772ae (diff) | |
Last win32 fixups - everything should now be working as intended.
Diffstat (limited to 'Makefile.mingw32')
| -rw-r--r-- | Makefile.mingw32 | 15 |
1 files changed, 9 insertions, 6 deletions
diff --git a/Makefile.mingw32 b/Makefile.mingw32 index 834dc72..ce41902 100644 --- a/Makefile.mingw32 +++ b/Makefile.mingw32 @@ -6,18 +6,19 @@ STRIP = i586-mingw32msvc-strip INCLUDES = \ -I../mogltk/include \ -I../Baltisot/include \ --I../Baltisot/lib/zlib/include \ -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../Mesa-7.0.3-mingw32/include \ -I../pthreads-w32-2-8-0-release/ \ +-I../gnuwin32/include 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 --enable-stdcall-fixup +LDFLAGS += -L../gnuwin32/lib -g -fexceptions -Wl,--enable-auto-image-base -Wl,--export-dynamic --export-all-symbols -Wl,--enable-auto-import -fexceptions \ + ../libreadline-static.a -lz.dll -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 @@ -25,12 +26,14 @@ vpath %.cpp ../Baltisot/lib:../Baltisot/src:../Baltisot/lib/zlib/src:../Baltisot vpath %.lua ../Baltisot/lib:../Baltisot/src LUAINTERFACE_SOURCES = \ -lua-interface.cc \ -lua-plugin.cc \ +lua-interface-win32-main.c \ -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 +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 BALTISOT_SOURCES = \ +lua-interface.cc \ +lua-plugin.cc \ +\ Main.cc \ \ RandISAAC.cc \ |