use "%f" format for angles, prevents weird exponential stuff

[xonotic/netradiant.git] / Makefile

diff --git a/Makefile b/Makefile
index a0dec75a10d68b79c71fdf03a5339ecceff2624d..8ce76bab9b7f136456cb79ae56dbecdff9fbc244 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
@@ -187,6 +188,8 @@ ifeq ($(OS),Darwin)
        # 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
@@ -256,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; \
@@ -478,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 \