Merge branch 'osxnetradiant'

[xonotic/netradiant.git] / Makefile

diff --git a/Makefile b/Makefile
index eb164622bbc270b4aa288ef67fa6b133ae1da42f..f3778e4ce1acc6e5e770e49c4f5ede92725ac9c6 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -192,7 +192,8 @@ ifeq ($(OS),Darwin)
        A = a
        DLL = dylib
        MWINDOWS =
-
+       MACVERSION ?= 16
+       CPPFLAGS_COMMON += -DMACVERSION="$(MACVERSION)"
        # workaround for weird prints
        ECHO_NOLF = /bin/echo -n
 
@@ -376,6 +377,7 @@ endif
 %.o: %.c $(if $(findstring $(DEPEND_ON_MAKEFILE),yes),$(wildcard Makefile*),)
        $(CC) $< $(CFLAGS) $(CFLAGS_COMMON) $(CPPFLAGS_EXTRA) $(CPPFLAGS_COMMON) $(CPPFLAGS) $(TARGET_ARCH) -c -o $@
 
+
 $(INSTALLDIR)/q3map2.$(EXE): LIBS_EXTRA := $(LIBS_XML) $(LIBS_GLIB) $(LIBS_PNG) $(LIBS_ZLIB)
 $(INSTALLDIR)/q3map2.$(EXE): CPPFLAGS_EXTRA := $(CPPFLAGS_XML) $(CPPFLAGS_GLIB) $(CPPFLAGS_PNG) -Itools/quake3/common -Ilibs -Iinclude
 $(INSTALLDIR)/q3map2.$(EXE): \
@@ -958,19 +960,19 @@ install-data: binaries
        [ "$(OS)" != "Darwin" ] || $(CP_R) setup/data/osx/NetRadiant.app/* $(INSTALLDIR_BASE)/NetRadiant.app/
        set -ex; \
        for GAME in games/*; do \
-               if [ -d "$$GAME/tools" ]; then \
-                       GAME=$$GAME/tools; \
+               if [ "$$GAME" = "games/*" ]; then \
+                       $(ECHO) "Game packs not found, please run"; \
+                       $(ECHO) "  ./download-gamepacks.sh"; \
+                       $(ECHO) "and then try again!"; \
+               else \
+                       CP="$(CP)" CP_R="$(CP_R)" $(SH) install-gamepack.sh "$$GAME" "$(INSTALLDIR)"; \
                fi; \
-               for GAMEFILE in $$GAME/games/*.game; do \
-                       $(CP) "$$GAMEFILE" $(INSTALLDIR)/games/; \
-               done; \
-               for GAMEDIR in $$GAME/*.game; do \
-                       $(CP_R) "$$GAMEDIR" $(INSTALLDIR)/; \
-               done; \
        done
        $(ECHO) $(RADIANT_MINOR_VERSION) > $(INSTALLDIR)/RADIANT_MINOR
        $(ECHO) $(RADIANT_MAJOR_VERSION) > $(INSTALLDIR)/RADIANT_MAJOR
        $(CP_R) setup/data/tools/* $(INSTALLDIR)/
+       $(MKDIR) $(INSTALLDIR)/docs
+       $(CP_R) docs/* $(INSTALLDIR)/docs/
        $(FIND) $(INSTALLDIR_BASE)/ -name .svn -exec $(RM_R) {} \; -prune
 
 .PHONY: install-dll