Merge remote-tracking branch 'github/master'

[xonotic/netradiant.git] / Makefile.conf

diff --git a/Makefile.conf b/Makefile.conf
index 2986545586224bf978efce6344a032e3827c0590..95d54970dbf0de2f5d82b32c7315912980a19ef1 100644 (file)
--- 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)"