From 8f63b3b76b864d7e569b78fa9acbab8ffeda66a5 Mon Sep 17 00:00:00 2001 From: Pixel Date: Wed, 10 Dec 2008 11:32:45 -0800 Subject: Fixing issues from the MacOS X port --- Makefile | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/Makefile b/Makefile index ef61335..ffc0821 100644 --- a/Makefile +++ b/Makefile @@ -6,16 +6,17 @@ SHARED_EXT=dylib SQL_LIBS=/sw/lib/mysql/libmysqlclient.a -lz OSMESA_LIBS = -lMagick++ -lMagick -lWand -lMagick CPPFLAGS = -dynamic +LD = g++ else -ARCH_FLAGS=-march=i686 +ARCH_FLAGS=-march=i686 -m32 SHARED_FLAGS=-shared SHARED_EXT=so -SQL_LIBS=/usr/lib/libmysqlclient.a +SQL_LIBS=/usr/lib/libmysqlclient.a -lssl OSMESA_LIBS = `Magick++-config --libs` +LD = g++ -m32 endif CC = gcc CXX = g++ -LD = g++ STRIP = strip INCLUDES = \ @@ -39,7 +40,7 @@ HAVES = -DHAVE_VSSCANF -DHAVE_LIBJPEG -DHAVE_FCNTL -DHAVE_MYSQL -DHAVE_UNISTD_H CPPFLAGS += $(INCLUDES) -O4 -fexceptions -DSTDC_HEADERS -DREADLINE_STATIC -DHOOK_STDS -DWORDS_LITTLEENDIAN $(ARCH_FLAGS) $(HAVES) -DUSE_OSMESA -LDFLAGS += $(ARCH_FLAGS) $(SHARED_FLAGS) -L/usr/lib/oracle/11.1.0.1/client/lib -L/usr/X11/lib -L/sw/lib -L/usr/local/instantclient ./lua-interface.dylib +LDFLAGS += $(ARCH_FLAGS) $(SHARED_FLAGS) -L/usr/lib/oracle/11.1.0.1/client/lib -L/usr/X11/lib -L/sw/lib -L/usr/local/instantclient ./lua-interface.$(SHARED_EXT) vpath %.c ../Baltisot/lib:../Baltisot/src:../Baltisot/lib/zlib/src:../Baltisot/lib/lua/src:../Baltisot/lib/lua/src/LuaLib:src:../mogltk/lib:../tinyxml vpath %.cc ../Baltisot/lib:../Baltisot/src:../Baltisot/lib/zlib/src:../Baltisot/lib/lua/src:../Baltisot/lib/lua/src/LuaLib:src:../mogltk/lib:../tinyxml -- cgit v1.2.3