always allocate bspEntData

[xonotic/netradiant.git] / Makefile

diff --git a/Makefile b/Makefile
index c89da77733a70447cb7e96113bebf00b429e3565..3f702073011a3454fb5ca7d62f4262d9150ce66e 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -24,7 +24,8 @@ CXX                ?= g++
 RANLIB             ?= ranlib
 AR                 ?= ar
 LDD                ?= ldd # nothing on Win32
-WINDRES            ?= # only used on Win32
+OTOOL              ?= # only used on OS X
+WINDRES            ?= windres # only used on Win32
 
 PKGCONFIG          ?= pkg-config
 PKG_CONFIG_PATH    ?=
@@ -85,6 +86,9 @@ WHICHDLL           ?= which
 ifeq ($(OS),MINGW32_NT-6.0)
        OS = Win32
 endif
+ifeq ($(OS),Windows_NT)
+       OS = Win32
+endif
 
 CFLAGS_COMMON = -MMD -W -Wall -Wcast-align -Wcast-qual -Wno-unused-parameter
 CPPFLAGS_COMMON =
@@ -187,11 +191,15 @@ ifeq ($(OS),Darwin)
        DLL = dylib
        MWINDOWS =
 
+       # workaround for weird prints
+       ECHO_NOLF = /bin/echo -n
+
        # 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 =
+       OTOOL = otool
 
        INSTALLDIR := $(INSTALLDIR_BASE)/NetRadiant.app/Contents/MacOS/install
 else
@@ -202,16 +210,18 @@ endif
 endif
 
 # VERSION!
-RADIANT_VERSION = 1.5.0
+RADIANT_VERSION = 1.5.0n
 RADIANT_MAJOR_VERSION = 5
 RADIANT_MINOR_VERSION = 0
+Q3MAP_VERSION = 2.5.17n
 
 SVN_VERSION := $(shell $(SVNVERSION) -n $(STDERR_TO_DEVNULL) | $(SED) 's/M$$//g; s/.*://g;')
 ifneq ($(SVN_VERSION),)
        RADIANT_VERSION := $(RADIANT_VERSION)-svn$(SVN_VERSION)
+       Q3MAP_VERSION := $(Q3MAP_VERSION)-svn$(SVN_VERSION)
 endif
 
-CPPFLAGS += -DRADIANT_VERSION="\"$(RADIANT_VERSION)\"" -DRADIANT_MAJOR_VERSION="\"$(RADIANT_MAJOR_VERSION)\"" -DRADIANT_MINOR_VERSION="\"$(RADIANT_MINOR_VERSION)\"" -DRADIANT_ABOUTMSG="\"$(RADIANT_ABOUTMSG)\""
+CPPFLAGS += -DRADIANT_VERSION="\"$(RADIANT_VERSION)\"" -DRADIANT_MAJOR_VERSION="\"$(RADIANT_MAJOR_VERSION)\"" -DRADIANT_MINOR_VERSION="\"$(RADIANT_MINOR_VERSION)\"" -DRADIANT_ABOUTMSG="\"$(RADIANT_ABOUTMSG)\"" -DQ3MAP_VERSION="\"$(Q3MAP_VERSION)\""
 
 .PHONY: all
 all: \
@@ -228,6 +238,7 @@ else
 dependencies-check:
        @$(ECHO)
        @if [ x"$(DEPENDENCIES_CHECK)" = x"verbose" ]; then set -x; fi; \
+       failed=0; \
        checkbinary() \
        { \
                $(ECHO_NOLF) "Checking for $$2 ($$1)... "; \
@@ -238,7 +249,7 @@ dependencies-check:
                        $(ECHO) "not found, please install it or set PATH right!"; \
                        $(ECHO) "To see the failed commands, set DEPENDENCIES_CHECK=verbose"; \
                        $(ECHO) "To proceed anyway, set DEPENDENCIES_CHECK=off"; \
-                       exit 1; \
+                       failed=1; \
                fi; \
        }; \
        $(ECHO) checking that the build tools exist; \
@@ -261,10 +272,12 @@ dependencies-check:
        checkbinary binutils "$(AR)"; \
        checkbinary pkg-config "$(PKGCONFIG)"; \
        [ "$(OS)" = "Win32" ] && checkbinary mingw32 "$(WINDRES)"; \
-       [ -n "$(lDD)" ] && checkbinary libc6 "$(LDD)"; \
-       $(ECHO) All required tools have been found!
+       [ -n "$(LDD)" ] && checkbinary libc6 "$(LDD)"; \
+       [ -n "$(OTOOL)" ] && checkbinary xcode "$(OTOOL)"; \
+       [ "$$failed" = "0" ] && $(ECHO) All required tools have been found!
        @$(ECHO)
        @if [ x"$(DEPENDENCIES_CHECK)" = x"verbose" ]; then set -x; fi; \
+       failed=0; \
        checkheader() \
        { \
                $(ECHO_NOLF) "Checking for $$2 ($$1)... "; \
@@ -279,7 +292,7 @@ dependencies-check:
                        $(ECHO) "not found, please install it or set PKG_CONFIG_PATH right!"; \
                        $(ECHO) "To see the failed commands, set DEPENDENCIES_CHECK=verbose"; \
                        $(ECHO) "To proceed anyway, set DEPENDENCIES_CHECK=off"; \
-                       exit 1; \
+                       failed=1; \
                fi; \
        }; \
        $(ECHO) checking that the dependencies exist; \
@@ -291,7 +304,7 @@ dependencies-check:
        checkheader libgtkglext1-dev gtk/gtkglwidget.h gtk_widget_get_gl_context "$(CPPFLAGS_GTKGLEXT)" "$(LIBS_GTKGLEXT)"; \
        [ "$(OS)" != "Win32" ] && checkheader libc6-dev dlfcn.h dlopen "$(CPPFLAGS_DL)" "$(LIBS_DL)"; \
        checkheader zlib1g-dev zlib.h zlibVersion "$(CPPFLAGS_ZLIB)" "$(LIBS_ZLIB)"; \
-       $(ECHO) All required libraries have been found!
+       [ "$$failed" = "0" ] && $(ECHO) All required libraries have been found!
        @$(ECHO)
 endif
 
@@ -936,7 +949,7 @@ $(INSTALLDIR)/heretic2/h2data.$(EXE): \
 .PHONY: install-data
 install-data: binaries
        $(MKDIR) $(INSTALLDIR)/games
-       $(FIND) $(INSTALLDIR)/ -name .svn -exec $(RM_R) {} \; -prune
+       $(FIND) $(INSTALLDIR_BASE)/ -name .svn -exec $(RM_R) {} \; -prune
        [ "$(OS)" != "Darwin" ] || $(CP_R) setup/data/osx/NetRadiant.app/* $(INSTALLDIR_BASE)/NetRadiant.app/
        set -ex; \
        for GAME in games/*; do \
@@ -953,15 +966,20 @@ install-data: binaries
        $(ECHO) $(RADIANT_MINOR_VERSION) > $(INSTALLDIR)/RADIANT_MINOR
        $(ECHO) $(RADIANT_MAJOR_VERSION) > $(INSTALLDIR)/RADIANT_MAJOR
        $(CP_R) setup/data/tools/* $(INSTALLDIR)/
-       $(FIND) $(INSTALLDIR)/ -name .svn -exec $(RM_R) {} \; -prune
+       $(FIND) $(INSTALLDIR_BASE)/ -name .svn -exec $(RM_R) {} \; -prune
 
 .PHONY: install-dll
 ifeq ($(OS),Win32)
 install-dll: binaries
        MKDIR="$(MKDIR)" CP="$(CP)" CAT="$(CAT)" GTKDIR="$(GTKDIR)" WHICHDLL="$(WHICHDLL)" INSTALLDIR="$(INSTALLDIR)" $(SH) install-dlls.sh
 else
+ifeq ($(OS),Darwin)
+install-dll: binaries
+       CP="$(CP)" OTOOL="$(OTOOL)" INSTALLDIR="$(INSTALLDIR)" $(SH) install-dylibs.sh
+else
 install-dll: binaries
        @$(ECHO) No DLL inclusion implemented for this target.
 endif
+endif
 
 -include $(shell find . -name \*.d)