X-Git-Url: https://de.git.xonotic.org/?p=xonotic%2Fnetradiant.git;a=blobdiff_plain;f=Makefile;h=5cdeee6947a9c0aef605e7baa4bd568f56421ca7;hp=e0de1809b1bfe740d4963e7438f23238ca8a2bfa;hb=93f9dc354fc1cc72bf1516fcf792f5f5f9f09bf5;hpb=c07007fb1ec011435f8fa2ef8b80b1943046d4fc

diff --git a/Makefile b/Makefile
index e0de1809..5cdeee69 100644
--- a/Makefile
+++ b/Makefile
@@ -44,9 +44,11 @@ TR                 ?= tr
 FIND               ?= find
 DIFF               ?= diff
 SED                ?= sed
-
-# optional:
-SVNVERSION         ?= svnversion
+GIT                ?= git
+SVN                ?= svn
+WGET               ?= wget
+MV                 ?= mv
+UNZIP              ?= unzip
 
 STDOUT_TO_DEVNULL  ?= >/dev/null
 STDERR_TO_DEVNULL  ?= 2>/dev/null
@@ -75,6 +77,8 @@ LIBS_DL            ?= -ldl # nothing on Win32
 CPPFLAGS_ZLIB      ?=
 LIBS_ZLIB          ?= -lz
 DEPEND_ON_MAKEFILE ?= yes
+DOWNLOAD_GAMEPACKS ?= yes
+# set to no to disable gamepack, set to all to even download undistributable gamepacks
 DEPENDENCIES_CHECK ?= quiet
 # or: off, verbose
 
@@ -192,7 +196,8 @@ ifeq ($(OS),Darwin)
 	A = a
 	DLL = dylib
 	MWINDOWS =
-
+	MACVERSION ?= 16
+	CPPFLAGS_COMMON += -DMACVERSION="$(MACVERSION)"
 	# workaround for weird prints
 	ECHO_NOLF = /bin/echo -n
 
@@ -220,10 +225,10 @@ Q3MAP_VERSION = 2.5.17n
 # Executable extension
 RADIANT_EXECUTABLE := $(EXE)
 
-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)
+GIT_VERSION := $(shell $(GIT) rev-parse --short HEAD $(STDERR_TO_DEVNULL))
+ifneq ($(GIT_VERSION),)
+	RADIANT_VERSION := $(RADIANT_VERSION)-git-$(GIT_VERSION)
+	Q3MAP_VERSION := $(Q3MAP_VERSION)-git-$(GIT_VERSION)
 endif
 
 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)\"" -DRADIANT_EXECUTABLE="\"$(RADIANT_EXECUTABLE)\""
@@ -267,6 +272,7 @@ dependencies-check:
 	checkbinary coreutils "$(CP_R)"; \
 	checkbinary coreutils "$(RM)"; \
 	checkbinary coreutils "$(RM_R)"; \
+	checkbinary coreutils "$(MV)"; \
 	checkbinary coreutils "$(ECHO) test $(TEE_STDERR)"; \
 	checkbinary sed "$(SED)"; \
 	checkbinary findutils "$(FIND)"; \
@@ -276,6 +282,10 @@ dependencies-check:
 	checkbinary binutils "$(RANLIB)"; \
 	checkbinary binutils "$(AR)"; \
 	checkbinary pkg-config "$(PKGCONFIG)"; \
+	checkbinary unzip "$(UNZIP)"; \
+	checkbinary git-core "$(GIT)"; \
+	checkbinary subversion "$(SVN)"; \
+	checkbinary wget "$(WGET)"; \
 	[ "$(OS)" = "Win32" ] && checkbinary mingw32 "$(WINDRES)"; \
 	[ -n "$(LDD)" ] && checkbinary libc6 "$(LDD)"; \
 	[ -n "$(OTOOL)" ] && checkbinary xcode "$(OTOOL)"; \
@@ -376,6 +386,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): \
@@ -956,25 +967,12 @@ install-data: binaries
 	$(MKDIR) $(INSTALLDIR)/games
 	$(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 \
-		if [ x"$$GAME" = x"games/*" ]; then \
-			echo; echo "*** NO GAME PACKS FOUND ***"; echo "Please run download-gamepacks.sh and try again."; echo; echo; \
-			continue; \
-		fi; \
-		if [ -d "$$GAME/tools" ]; then \
-			GAME=$$GAME/tools; \
-		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
+	DOWNLOAD_GAMEPACKS="$(DOWNLOAD_GAMEPACKS)" GIT="$(GIT)" SVN="$(SVN)" WGET="$(WGET)" RM_R="$(RM_R)" MV="$(MV)" UNZIP="$(UNZIP)" ECHO="$(ECHO)" SH="$(SH)" CP="$(CP)" CP_R="$(CP_R)" $(SH) install-gamepacks.sh "$(INSTALLDIR)"
 	$(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