From: merlijn <mhofstra@gmail.com>
Date: Sun, 29 Aug 2010 18:47:06 +0000 (+0200)
Subject: Update these files as well
X-Git-Tag: xonotic-v0.5.0~224^2~1
X-Git-Url: http://git.xonotic.org/?p=xonotic%2Fnetradiant.git;a=commitdiff_plain;h=eadc09e9f6cdb30d9be0612bd962243534317267

Update these files as well
---

diff --git a/Makefile b/Makefile
index 98dcb2f9..4dad4180 100644
--- 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
 
diff --git a/Makefile.conf b/Makefile.conf
index 29865455..95d54970 100644
--- a/Makefile.conf
+++ b/Makefile.conf
@@ -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)"