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

[xonotic/netradiant.git] / Makefile

diff --git a/Makefile b/Makefile
index 3c68356ce7f30b3910e83b82a2a8089499ee3852..8ce76bab9b7f136456cb79ae56dbecdff9fbc244 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -103,14 +103,18 @@ ifeq ($(findstring $(CFLAGS),-O),)
 endif
        CPPFLAGS_COMMON +=
        LDFLAGS_COMMON +=
-else ifeq ($(BUILD),extradebug)
+else
+
+ifeq ($(BUILD),extradebug)
 ifeq ($(findstring $(CFLAGS),-g),)
        CFLAGS_COMMON += -g3
        # only add -g3 if no -g flag is in $(CFLAGS)
 endif
        CPPFLAGS_COMMON += -D_DEBUG
        LDFLAGS_COMMON +=
-else ifeq ($(BUILD),profile)
+else
+
+ifeq ($(BUILD),profile)
 ifeq ($(findstring $(CFLAGS),-g),)
        CFLAGS_COMMON += -g
        # only add -g if no -g flag is in $(CFLAGS)
@@ -122,7 +126,9 @@ endif
        CFLAGS_COMMON += -pg
        CPPFLAGS_COMMON +=
        LDFLAGS_COMMON += -pg
-else ifeq ($(BUILD),release)
+else
+
+ifeq ($(BUILD),release)
 ifeq ($(findstring $(CFLAGS),-O),)
        CFLAGS_COMMON += -O3
        # only add -O3 if no -O flag is in $(CFLAGS)
@@ -131,11 +137,15 @@ endif
        CPPFLAGS_COMMON +=
        LDFLAGS_COMMON += -s
 else
+
 $(error Unsupported build type: $(BUILD))
 endif
+endif
+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
@@ -143,7 +153,9 @@ ifeq ($(OS),Linux)
        A = a
        DLL = so
        MWINDOWS =
-else ifeq ($(OS),Win32)
+else
+
+ifeq ($(OS),Win32)
        CPPFLAGS_COMMON += -DWIN32 -D_WIN32 -D_inline=inline
        CFLAGS_COMMON += -mms-bitfields
        LDFLAGS_DLL = --dll -Wl,--add-stdcall-alias
@@ -159,17 +171,33 @@ else ifeq ($(OS),Win32)
        LIBS_GL = -lopengl32
        # workaround: no -ldl on Win32
        LIBS_DL = 
-else ifeq ($(OS),Darwin)
-       CFLAGS_COMMON += -force-cpusubtype_ALL -fPIC
+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))
 endif
+endif
+endif
 
 # VERSION!
 RADIANT_VERSION = 1.5.0
@@ -229,8 +257,9 @@ dependencies-check:
        checkbinary g++ "$(CXX)"; \
        checkbinary binutils "$(RANLIB)"; \
        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; \
@@ -452,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 \