]> git.xonotic.org Git - xonotic/netradiant.git/commitdiff
projects / xonotic / netradiant.git / commitdiff
summary | shortlog | log | commit | commitdiff | tree
raw | patch | inline | side by side (parent: 1fcc7b8)
more makefile fixes for OS X
authordivverent <divverent@61c419a2-8eb2-4b30-bcec-8cead039b335>
Fri, 9 Jan 2009 22:22:22 +0000 (22:22 +0000)
committerdivverent <divverent@61c419a2-8eb2-4b30-bcec-8cead039b335>
Fri, 9 Jan 2009 22:22:22 +0000 (22:22 +0000)
git-svn-id: svn://svn.icculus.org/netradiant/trunk@168 61c419a2-8eb2-4b30-bcec-8cead039b335

Makefile patch | blob | history

diff --git a/Makefile b/Makefile
index e1cb5afc4c5134dcb80ab3fc874a1980ec74931b..a26833a9c406d53d6385b84d6daa9bf563ed9cfe 100644 (file)
--- 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,6 +174,7 @@ 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