diff options
| author | Nicolas "Pixel" Noble <pixel@nobis-crew.org> | 2010-06-07 21:50:29 +0200 |
|---|---|---|
| committer | Nicolas "Pixel" Noble <pixel@nobis-crew.org> | 2010-06-07 22:07:11 +0200 |
| commit | e202f34a9e088b6e497c7aa1e5848de76ba0435e (patch) | |
| tree | 1c2019c5727f83fba10920a2a61a48c11006dfec | |
| parent | 01dc8b8ee0ff54941656bdf688f5ab095acd1ad3 (diff) | |
Fixing various things for mingw32 compilation.
| -rw-r--r-- | Makefile | 7 | ||||
| -rw-r--r-- | Makefile.mingw32 | 26 |
2 files changed, 17 insertions, 16 deletions
@@ -36,7 +36,8 @@ FINK=$(USR) LIBXM = $(FINK) endif LIBXM = $(FINK)/sw/lib/libXm.a -lXp -GMPLIBDIR=../gmp-4.3.2-darwin9/lib +GMPDIR=../gmp-4.3.2-darwin9 +GMPLIBDIR=$(GMPDIR)/lib GMP_LIBS=-all_load $(GMPLIBDIR)/libgmpxx.a $(GMPLIBDIR)/libgmp.a else ARCH_FLAGS=-march=i686 -m32 @@ -44,7 +45,8 @@ SHARED_FLAGS=-shared SHARED_EXT=so LD = g++ -m32 STRIP = strip --strip-unneeded -GMPLIBDIR=../gmp-4.3.2-linux/lib +GMPDIR=../gmp-4.3.2-linux +GMPLIBDIR=$(GMPDIR)/lib GMP_LIBS=-Wl,--whole-archive $(GMPLIBDIR)/libgmpxx.a $(GMPLIBDIR)/libgmp.a -Wl,--no-whole-archive endif @@ -52,6 +54,7 @@ INCLUDES = \ -I../Baltisot/include \ -I../LuaJIT/src \ -I $(FINK)/sw/include \ +-I $(GMPDIR)/include \ HAVES = -DHAVE_VSSCANF -DHAVE_LIBJPEG -DHAVE_FCNTL -DHAVE_UNISTD_H -DHAVE_FORK -DHAVE_PIPE -DHAVE_FSYNC -DHAVE_MALLOC_H -DHAVE_ASPRINTF -DHAVE_BYTESWAP_H -DCD_NO_OLD_INTERFACE -DGTK_DISABLE_DEPRECATED -DIUPLUA_USELOH -DUSE_STATIC diff --git a/Makefile.mingw32 b/Makefile.mingw32 index b8cb4b2..f366ee7 100644 --- a/Makefile.mingw32 +++ b/Makefile.mingw32 @@ -11,26 +11,27 @@ LD = i586-mingw32msvc-g++ STRIP = i586-mingw32msvc-strip endif +GMPDIR=../gmp-4.3.2-mingw32 +GMPLIBDIR=$(GMPDIR)/lib + INCLUDES = \ --I ../Mesa-7.0.3-win32/include \ -I../Baltisot/include \ --I../Baltisot/lib/zlib/include \ --I../Baltisot/lib/lua/include -I../Baltisot/lib/lua/includes \ --I../PSX-Bundle/includes -I../PSX-Bundle/psxdev \ +-I../LuaJIT/src \ +-I../gnuwin32/include \ +-I$(GMPDIR)/include \ HAVES = -DHAVE_VSSCANF -DHAVE_FCNTL -DHAVE_UNISTD_H -DHAVE_FORK -DHAVE_PIPE -DHAVE_FSYNC -DHAVE_MALLOC_H -DHAVE_ASPRINTF -DHAVE_BYTESWAP_H CPPFLAGS += $(INCLUDES) -g -DSTDC_HEADERS -DREADLINE_STATIC -DHOOK_STDS -DWORDS_LITTLEENDIAN -fexceptions -march=i686 $(HAVES) -LDFLAGS += -g -fexception -shared -Wl,--export-dynamic ../lua-interface/lua-interface.a -Wl,--enable-auto-image-base --export-all-symbols -Wl,--enable-auto-import +LDFLAGS += -g -fexception -shared ../lua-interface/lua-interface.a -Wl,--enable-auto-image-base --export-all-symbols -Wl,--enable-auto-import -GMPLIBDIR=../gmp-4.3.2-mingw32 GMP_LIBS=-Wl,--whole-archive $(GMPLIBDIR)/libgmpxx.a $(GMPLIBDIR)/libgmp.a -Wl,--no-whole-archive -vpath %.c ../Baltisot/lib:../Baltisot/src:../Baltisot/lib/zlib/src:../Baltisot/lib/lua/src:../Baltisot/lib/lua/src/LuaLib:src -vpath %.cc ../Baltisot/lib:../Baltisot/src:../Baltisot/lib/zlib/src:../Baltisot/lib/lua/src:../Baltisot/lib/lua/src/LuaLib:src -vpath %.cpp ../Baltisot/lib:../Baltisot/src:../Baltisot/lib/zlib/src:../Baltisot/lib/lua/src:../Baltisot/lib/lua/src/LuaLib:src -vpath %.lua ../Baltisot/lib:../Baltisot/src +vpath %.c ../Baltisot/lib:../Baltisot/src:src +vpath %.cc ../Baltisot/lib:../Baltisot/src:src +vpath %.cpp ../Baltisot/lib:../Baltisot/src:src +vpath %.lua ../Baltisot/lib:../Baltisot/src:src LUAGMP_SOURCES = \ plugin-luagmp.cc \ @@ -66,10 +67,7 @@ clean: %.dep : %.cc $(CXX) $(CPPFLAGS) -M -MF $@ $< -%.c : %.clua +%.c : %.lua bin2c $< $@ $(basename $@) -%.clua : %.lua - ./luac -o $@ $< - -include $(ALL_DEPS) |