From e202f34a9e088b6e497c7aa1e5848de76ba0435e Mon Sep 17 00:00:00 2001
From: "Nicolas \"Pixel\" Noble" <pixel@nobis-crew.org>
Date: Mon, 7 Jun 2010 21:50:29 +0200
Subject: Fixing various things for mingw32 compilation.

---
 Makefile | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

(limited to 'Makefile')

diff --git a/Makefile b/Makefile
index 311e5e2..fd954f4 100644
--- a/Makefile
+++ b/Makefile
@@ -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
 
-- 
cgit v1.2.3