Update these files as well
authormerlijn <mhofstra@gmail.com>
Sun, 29 Aug 2010 18:47:06 +0000 (20:47 +0200)
committermerlijn <mhofstra@gmail.com>
Sun, 29 Aug 2010 18:47:06 +0000 (20:47 +0200)
Makefile
Makefile.conf

index 98dcb2f..4dad418 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -193,17 +193,14 @@ ifeq ($(OS),Darwin)
        CPPFLAGS_COMMON += -DPOSIX -DXWINDOWS
        CFLAGS_COMMON += -fPIC
        CXXFLAGS_COMMON += -fno-exceptions -fno-rtti
-       CPPFLAGS_COMMON += -I/sw/include -I/usr/X11R6/include
-       LDFLAGS_COMMON += -L/sw/lib  -L/usr/X11R6/lib
-       #LDFLAGS_COMMON += -L/sw/lib -L/usr/lib -L/usr/X11R6/lib
+       CPPFLAGS_COMMON += -I/opt/local/include -I/sw/include -I/usr/X11R6/include
+       LDFLAGS_COMMON += -L/opt/local/lib -L/sw/lib -L/usr/X11R6/lib
        LDFLAGS_DLL += -dynamiclib -ldl
        EXE ?= ppc
-       MACLIBDIR ?= /sw/lib
+       MACLIBDIR ?= /opt/local/lib
        A = a
        DLL = dylib
        MWINDOWS =
-       MACVERSION ?= 16
-       CPPFLAGS_COMMON += -DMACVERSION="$(MACVERSION)"
        # workaround for weird prints
        ECHO_NOLF = /bin/echo -n
 
index 2986545..95d5497 100644 (file)
@@ -4,11 +4,6 @@
 # BUILD=debug
 # RADIANT_ABOUTMSG=Custom build
 # EXE=ub
-#
-## MacPorts:
-# CPPFLAGS=-I/opt/local/include/ -I/usr/X11R6/include/ 
-# LDFLAGS=-L/opt/local/lib -L/usr/X11R6/lib
-# MACLIBDIR=/opt/local/lib
 
 ## Fink
 ## (-arch ppc can combined with -arch 386, I read somewhere. However does work fine like this on OSX 10.6) 
@@ -16,3 +11,7 @@
 # CFLAGS=-arch i386
 # TARGET_ARCH=-arch i386
 # MACLIBDIR=/sw/lib
+
+## On some versions of OSX you may get compile errors regarding glTexImage1D, uncomment this to fix it
+#MACVERSION ?= 16
+#CPPFLAGS_COMMON += -DMACVERSION="$(MACVERSION)"