From ddf93ba6a6c532c39f741f86a9067ad784ecfe37 Mon Sep 17 00:00:00 2001
From: "Nicolas \"Pixel\" Noble" <pixel@nobis-crew.org>
Date: Mon, 7 Dec 2009 09:00:05 +0100
Subject: Darwin9 support, and actually using gl-glue this time. Let's disable
 FTGL though, it's going to be a mess.

---
 Makefile | 10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)

diff --git a/Makefile b/Makefile
index 20f462a..942dcbf 100644
--- a/Makefile
+++ b/Makefile
@@ -5,6 +5,7 @@ TRUESYSTEM=$(shell uname)
 CC = gcc
 CXX = g++
 FINK_PREFIX=
+IMAGEMAGICK_INCLUDE=/usr/include/ImageMagick
 ifeq ($(SYSTEM),Darwin)
 ARCH_FLAGS=-arch i386
 SHARED_FLAGS=-dynamiclib
@@ -24,6 +25,7 @@ FINK_PREFIX=/usr/i686-apple-darwin9
 ARCH_FLAGS =
 endif
 SQL_LIBS=$(FINK_PREFIX)/sw/lib/mysql/libmysqlclient.a -lz
+IMAGEMAGICK_INCLUDE=$(FINK_PREFIX)/sw/include
 else
 ARCH_FLAGS=-march=i686 -m32
 SHARED_FLAGS=-shared
@@ -38,7 +40,7 @@ HAVE_ORACLE=$(shell [ -d /usr/local/instantclient ] || [ -e /usr/include/oracle/
 
 INCLUDES = \
 -I../Mesa-7.4.4/include \
--I/usr/include/ImageMagick \
+-I$(IMAGEMAGICK_INCLUDE) \
 -I../mogltk/include \
 -I../Baltisot/include \
 -I../Baltisot/lib/zlib/include \
@@ -56,7 +58,7 @@ INCLUDES = \
 
 HAVES =  -DHAVE_VSSCANF -DHAVE_LIBJPEG -DHAVE_FCNTL -DHAVE_MYSQL -DHAVE_UNISTD_H -DHAVE_FORK -DHAVE_PIPE -DHAVE_FSYNC -DHAVE_MALLOC_H -DHAVE_ASPRINTF -DHAVE_BYTESWAP_H
 
-CPPFLAGS_NO_ARCH += $(INCLUDES) -O4 -fexceptions -DSTDC_HEADERS -DREADLINE_STATIC -DHOOK_STDS -DWORDS_LITTLEENDIAN $(HAVES) -DUSE_OSMESA -DNDEBUG
+CPPFLAGS_NO_ARCH += $(INCLUDES) -O4 -fexceptions -DSTDC_HEADERS -DREADLINE_STATIC -DHOOK_STDS -DWORDS_LITTLEENDIAN $(HAVES) -DUSE_OSMESA -DNDEBUG -DUSE_MGL_NAMESPACE
 CPPFLAGS += $(CPPFLAGS_NO_ARCH) $(ARCH_FLAGS)
 
 LDFLAGS += $(ARCH_FLAGS) $(SHARED_FLAGS) -L/usr/lib/oracle/11.1.0.1/client/lib -L/usr/X11/lib -L$(FINK_PREFIX)/sw/lib -L/usr/local/instantclient ./lua-interface.$(SHARED_EXT)
@@ -157,9 +159,9 @@ $(TASK_SOURCES) \
 $(SQL_SOURCES) \
 $(LUALIBS_SOURCES) \
 $(GL_SOURCES) \
-$(FTGL_SOURCES) \
 $(OSMESA_SOURCES) \
 $(RAND_SOURCES) \
+#$(FTGL_SOURCES) \
 
 ifeq ($(HAVE_ORACLE),true)
 WHOLE_SOURCES += $(OCCI_SOURCES)
@@ -174,10 +176,10 @@ luaregex.$(SHARED_EXT) \
 luatask.$(SHARED_EXT) \
 luasql.$(SHARED_EXT) \
 luagl.$(SHARED_EXT) \
-luaftgl.$(SHARED_EXT) \
 lualibs.$(SHARED_EXT) \
 luaosmesa.$(SHARED_EXT) \
 luarand.$(SHARED_EXT) \
+#luaftgl.$(SHARED_EXT) \
 
 ifeq ($(HAVE_ORACLE),true)
 MODULES_LIST += luaocci.$(SHARED_EXT)
-- 
cgit v1.2.3