X-Git-Url: http://de.git.xonotic.org/?a=blobdiff_plain;ds=sidebyside;f=Makefile;h=8ce76bab9b7f136456cb79ae56dbecdff9fbc244;hb=f85ed10a525f0740eea98350f2cb0ed84db8530c;hp=24f31f886ceaddbd0a877b6b94d629588d69a821;hpb=69094788e77bc5fbb78c5f761b986ede464b9926;p=xonotic%2Fnetradiant.git

diff --git a/Makefile b/Makefile
index 24f31f88..8ce76bab 100644
--- a/Makefile
+++ b/Makefile
@@ -145,7 +145,7 @@ endif
 endif
 
 ifeq ($(OS),Linux)
-	CPPFLAGS_COMMON += -DPOSIX -DXWINDOWS -D_LINUX
+	CPPFLAGS_COMMON += -DPOSIX -DXWINDOWS
 	CFLAGS_COMMON += -fPIC
 	LDFLAGS_DLL = -fPIC -ldl
 	LIBS_COMMON = -lpthread
@@ -174,13 +174,24 @@ ifeq ($(OS),Win32)
 else
 
 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/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)
+	A = a
+	DLL = dylib
+	MWINDOWS =
+
+	# workaround: http://developer.apple.com/qa/qa2007/qa1567.html
+	LIBS_GL += -lX11 -dylib_file /System/Library/Frameworks/OpenGL.framework/Versions/A/Libraries/libGL.dylib:/System/Library/Frameworks/OpenGL.framework/Versions/A/Libraries/libGL.dylib
+	LIBS_GTKGLEXT += -lX11 -dylib_file /System/Library/Frameworks/OpenGL.framework/Versions/A/Libraries/libGL.dylib:/System/Library/Frameworks/OpenGL.framework/Versions/A/Libraries/libGL.dylib
+	# workaround: we have no "ldd" for OS X, so...
+	LDD =
+
+#$(error Unsupported build OS: $(OS) - please complete the Darwin support in this Makefile and submit a patch)
 else
 
 $(error Unsupported build OS: $(OS))
@@ -248,7 +259,7 @@ dependencies-check:
 	checkbinary binutils "$(AR)"; \
 	checkbinary pkg-config "$(PKGCONFIG)"; \
 	[ "$(OS)" = "Win32" ] && checkbinary mingw32 "$(WINDRES)"; \
-	[ "$(OS)" != "Win32" ] && checkbinary libc6 "$(LDD)"; \
+	[ -n "$(lDD)" ] && checkbinary libc6 "$(LDD)"; \
 	$(ECHO) All required tools have been found!
 	@$(ECHO)
 	@if [ x"$(DEPENDENCIES_CHECK)" = x"verbose" ]; then set -x; fi; \
@@ -470,8 +481,8 @@ libddslib.$(A): CPPFLAGS_EXTRA := -Ilibs
 libddslib.$(A): \
 	libs/ddslib/ddslib.o \
 
-$(INSTALLDIR)/q3data.$(EXE): LIBS_EXTRA := $(LIBS_XML) $(LIBS_GLIB)
-$(INSTALLDIR)/q3data.$(EXE): CPPFLAGS_EXTRA := $(CPPFLAGS_XML) $(CPPFLAGS_GLIB) -Itools/quake3/common -Ilibs -Iinclude
+$(INSTALLDIR)/q3data.$(EXE): LIBS_EXTRA := $(LIBS_XML) $(LIBS_GLIB) $(LIBS_ZLIB)
+$(INSTALLDIR)/q3data.$(EXE): CPPFLAGS_EXTRA := $(CPPFLAGS_XML) $(CPPFLAGS_GLIB) $(CPPFLAGS_ZLIB) -Itools/quake3/common -Ilibs -Iinclude
 $(INSTALLDIR)/q3data.$(EXE): \
 	tools/quake3/common/aselib.o \
 	tools/quake3/common/bspfile.o \