port some obvious vars from the original SConstruct/SConscript to the Darwin block...

[xonotic/netradiant.git] / Makefile

diff --git a/Makefile b/Makefile
index 7bd232ccc2ecaf5632905af08c9cf86c79b89d49..a449071070330acea65ca6e983744ff87d4cbf79 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -1,4 +1,5 @@
--include Makefile.conf
+MAKEFILE_CONF      ?= Makefile.conf
+-include $(MAKEFILE_CONF)
 
 ## CONFIGURATION SETTINGS
 # user customizable stuf
@@ -153,8 +154,14 @@ else ifeq ($(OS),Win32)
        LIBS_GL = -lopengl32
        # workaround: no -ldl on Win32
        LIBS_DL = 
-#else ifeq ($(OS),Darwin)
-#      EXE = ppc
+else ifeq ($(OS),Darwin)
+       CFLAGS_COMMON += -force-cpusubtype_ALL -fPIC
+       CXXFLAGS_COMMON += -fno-exceptions -fno-rtti
+       CPPFLAGS_COMMON += -I/sw/include -I/usr/X11R6/include
+       LDFLAGS_COMMON += -L/sw/lib -L/usr/lib -L/usr/X11R6/lib
+       LDFLAGS_DLL += -dynamiclib -ldl
+       EXE = ppc
+       $(error Unsupported build OS: $(OS) - please complete the Darwin support in this Makefile and submit a patch)
 else
 $(error Unsupported build OS: $(OS))
 endif