X-Git-Url: https://de.git.xonotic.org/?p=xonotic%2Fnetradiant.git;a=blobdiff_plain;f=Makefile;h=98dcb2f91b7b25fa2be7742c02d19a999e91ee2a;hp=a0dec75a10d68b79c71fdf03a5339ecceff2624d;hb=048cdb6eb26693ee30056e95db76da09165f738e;hpb=30662a9f6f1563fad2492d0da42162702a40146c diff --git a/Makefile b/Makefile index a0dec75a..98dcb2f9 100644 --- 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 ?= @@ -43,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 @@ -74,8 +77,16 @@ 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 + +# Support CHECK_DEPENDENCIES with DOWNLOAD_GAMEPACKS semantics +ifneq ($(CHECK_DEPENDENCIES),) +DEPENDENCIES_CHECK = $(patsubst yes,quiet,$(patsubst no,off,$(CHECK_DEPENDENCIES))) +else DEPENDENCIES_CHECK ?= quiet # or: off, verbose +endif # these are used on Win32 only GTKDIR ?= $(shell PKG_CONFIG_PATH=$(PKG_CONFIG_PATH) $(PKGCONFIG) gtk+-2.0 --variable=prefix $(STDERR_TO_DEVNULL)) @@ -85,8 +96,11 @@ 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 +CFLAGS_COMMON = -MMD -W -Wall -Wcast-align -Wcast-qual -Wno-unused-parameter -fno-strict-aliasing CPPFLAGS_COMMON = LDFLAGS_COMMON = LIBS_COMMON = @@ -144,12 +158,14 @@ endif endif endif +INSTALLDIR_BASE := $(INSTALLDIR) + ifeq ($(OS),Linux) - CPPFLAGS_COMMON += -DPOSIX -DXWINDOWS -D_LINUX + CPPFLAGS_COMMON += -DPOSIX -DXWINDOWS CFLAGS_COMMON += -fPIC LDFLAGS_DLL = -fPIC -ldl LIBS_COMMON = -lpthread - EXE = x86 + EXE ?= x86 A = a DLL = so MWINDOWS = @@ -160,7 +176,7 @@ ifeq ($(OS),Win32) CFLAGS_COMMON += -mms-bitfields LDFLAGS_DLL = --dll -Wl,--add-stdcall-alias LIBS_COMMON = -lws2_32 -luser32 -lgdi32 - EXE = exe + EXE ?= exe A = a DLL = dll MWINDOWS = -mwindows @@ -174,21 +190,31 @@ 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 - LDFLAGS_COMMON += -L/sw/lib -L/usr/lib -L/usr/X11R6/lib + LDFLAGS_COMMON += -L/sw/lib -L/usr/X11R6/lib + #LDFLAGS_COMMON += -L/sw/lib -L/usr/lib -L/usr/X11R6/lib LDFLAGS_DLL += -dynamiclib -ldl - EXE = ppc + EXE ?= ppc + MACLIBDIR ?= /sw/lib A = a DLL = dylib MWINDOWS = + MACVERSION ?= 16 + CPPFLAGS_COMMON += -DMACVERSION="$(MACVERSION)" + # 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 -#$(error Unsupported build OS: $(OS) - please complete the Darwin support in this Makefile and submit a patch) + INSTALLDIR := $(INSTALLDIR_BASE)/NetRadiant.app/Contents/MacOS/install else $(error Unsupported build OS: $(OS)) @@ -197,16 +223,21 @@ 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) +# Executable extension +RADIANT_EXECUTABLE := $(EXE) + +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)\"" +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)\"" .PHONY: all all: \ @@ -223,6 +254,7 @@ else dependencies-check: @$(ECHO) @if [ x"$(DEPENDENCIES_CHECK)" = x"verbose" ]; then set -x; fi; \ + failed=0; \ checkbinary() \ { \ $(ECHO_NOLF) "Checking for $$2 ($$1)... "; \ @@ -233,7 +265,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; \ @@ -246,6 +278,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)"; \ @@ -255,11 +288,17 @@ 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)"; \ - [ "$(OS)" != "Win32" ] && 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)... "; \ @@ -274,7 +313,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; \ @@ -286,7 +325,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 @@ -321,7 +360,7 @@ binaries: \ .PHONY: clean clean: - $(RM_R) $(INSTALLDIR)/ + $(RM_R) $(INSTALLDIR_BASE)/ $(FIND) . \( -name \*.o -o -name \*.d -o -name \*.$(DLL) -o -name \*.$(A) -o -name \*.$(EXE) \) -exec $(RM) {} \; $(RM) icons/*.rc @@ -348,12 +387,13 @@ ifeq ($(OS),Win32) endif %.o: %.cpp $(if $(findstring $(DEPEND_ON_MAKEFILE),yes),$(wildcard Makefile*),) - $(CXX) $< $(CFLAGS) $(CXXFLAGS) $(CFLAGS_COMMON) $(CXXFLAGS_COMMON) $(CPPFLAGS) $(CPPFLAGS_COMMON) $(CPPFLAGS_EXTRA) $(TARGET_ARCH) -c -o $@ + $(CXX) $< $(CFLAGS) $(CXXFLAGS) $(CFLAGS_COMMON) $(CXXFLAGS_COMMON) $(CPPFLAGS_EXTRA) $(CPPFLAGS_COMMON) $(CPPFLAGS) $(TARGET_ARCH) -c -o $@ %.o: %.c $(if $(findstring $(DEPEND_ON_MAKEFILE),yes),$(wildcard Makefile*),) - $(CC) $< $(CFLAGS) $(CFLAGS_COMMON) $(CPPFLAGS) $(CPPFLAGS_COMMON) $(CPPFLAGS_EXTRA) $(TARGET_ARCH) -c -o $@ + $(CC) $< $(CFLAGS) $(CFLAGS_COMMON) $(CPPFLAGS_EXTRA) $(CPPFLAGS_COMMON) $(CPPFLAGS) $(TARGET_ARCH) -c -o $@ + -$(INSTALLDIR)/q3map2.$(EXE): LIBS_EXTRA := $(LIBS_XML) $(LIBS_GLIB) $(LIBS_PNG) +$(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): \ tools/quake3/common/cmdlib.o \ @@ -478,8 +518,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 \ @@ -506,7 +546,7 @@ $(INSTALLDIR)/q3data.$(EXE): \ $(if $(findstring $(OS),Win32),icons/q3data.o,) \ $(INSTALLDIR)/radiant.$(EXE): LDFLAGS_EXTRA := $(MWINDOWS) -$(INSTALLDIR)/radiant.$(EXE): LIBS_EXTRA := $(LIBS_GL) $(LIBS_DL) $(LIBS_XML) $(LIBS_GLIB) $(LIBS_GTK) $(LIBS_GTKGLEXT) +$(INSTALLDIR)/radiant.$(EXE): LIBS_EXTRA := $(LIBS_GL) $(LIBS_DL) $(LIBS_XML) $(LIBS_GLIB) $(LIBS_GTK) $(LIBS_GTKGLEXT) $(LIBS_ZLIB) $(INSTALLDIR)/radiant.$(EXE): CPPFLAGS_EXTRA := $(CPPFLAGS_GL) $(CPPFLAGS_DL) $(CPPFLAGS_XML) $(CPPFLAGS_GLIB) $(CPPFLAGS_GTK) $(CPPFLAGS_GTKGLEXT) -Ilibs -Iinclude $(INSTALLDIR)/radiant.$(EXE): \ radiant/autosave.o \ @@ -885,12 +925,12 @@ $(INSTALLDIR)/plugins/ufoaiplug.$(DLL): \ contrib/ufoaiplug/ufoai_level.o \ contrib/ufoaiplug/ufoai.o \ -#$(INSTALLDIR)/plugins/bkgrnd2d.$(DLL): LIBS_EXTRA := $(LIBS_GLIB) $(LIBS_GTK) -#$(INSTALLDIR)/plugins/bkgrnd2d.$(DLL): CPPFLAGS_EXTRA := $(CPPFLAGS_GLIB) $(CPPFLAGS_GTK) -Ilibs -Iinclude -#$(INSTALLDIR)/plugins/bkgrnd2d.$(DLL): \ -# contrib/bkgrnd2d/bkgrnd2d.o \ -# contrib/bkgrnd2d/dialog.o \ -# contrib/bkgrnd2d/plugin.o \ +$(INSTALLDIR)/plugins/bkgrnd2d.$(DLL): LIBS_EXTRA := $(LIBS_GLIB) $(LIBS_GTK) +$(INSTALLDIR)/plugins/bkgrnd2d.$(DLL): CPPFLAGS_EXTRA := $(CPPFLAGS_GLIB) $(CPPFLAGS_GTK) -Ilibs -Iinclude +$(INSTALLDIR)/plugins/bkgrnd2d.$(DLL): \ + contrib/bkgrnd2d/bkgrnd2d.o \ + contrib/bkgrnd2d/dialog.o \ + contrib/bkgrnd2d/plugin.o \ $(INSTALLDIR)/heretic2/h2data.$(EXE): LIBS_EXTRA := $(LIBS_XML) $(INSTALLDIR)/heretic2/h2data.$(EXE): CPPFLAGS_EXTRA := $(CPPFLAGS_XML) -Itools/quake2/qdata_heretic2/common -Itools/quake2/qdata_heretic2/qcommon -Itools/quake2/qdata_heretic2 -Itools/quake2/common -Ilibs -Iinclude @@ -931,31 +971,28 @@ $(INSTALLDIR)/heretic2/h2data.$(EXE): \ .PHONY: install-data install-data: binaries $(MKDIR) $(INSTALLDIR)/games - $(FIND) $(INSTALLDIR)/ -name .svn -exec $(RM_R) {} \; -prune - set -ex; \ - for GAME in games/*; do \ - 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 + $(FIND) $(INSTALLDIR_BASE)/ -name .svn -exec $(RM_R) {} \; -prune + [ "$(OS)" != "Darwin" ] || $(CP_R) setup/data/osx/NetRadiant.app/* $(INSTALLDIR_BASE)/NetRadiant.app/ + 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)/ - $(FIND) $(INSTALLDIR)/ -name .svn -exec $(RM_R) {} \; -prune + $(MKDIR) $(INSTALLDIR)/docs + $(CP_R) docs/* $(INSTALLDIR)/docs/ + $(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 + EXE="$(EXE)" MACLIBDIR="$(MACLIBDIR)" 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)