X-Git-Url: https://de.git.xonotic.org/?p=xonotic%2Fnetradiant.git;a=blobdiff_plain;f=Makefile;h=0fc502edbd54e455e68a434b0fce57e88e76dace;hp=25827897f6971b16b1f8c2189393fd8c371f9ec0;hb=8ecf001ea472d7eca1912b6c6bc02508f4c24fd1;hpb=5e9d69cd536783dfdb8227eaf3ba4d7ec0c0d6c9 diff --git a/Makefile b/Makefile index 25827897..0fc502ed 100644 --- a/Makefile +++ b/Makefile @@ -44,12 +44,15 @@ TR ?= tr FIND ?= find DIFF ?= diff SED ?= sed - -# optional: GIT ?= git - -STDOUT_TO_DEVNULL ?= >/dev/null -STDERR_TO_DEVNULL ?= 2>/dev/null +SVN ?= svn +WGET ?= wget +MV ?= mv +UNZIPPER ?= unzip + +FD_TO_DEVNULL ?= >/dev/null +STDOUT_TO_DEVNULL ?= 1$(FD_TO_DEVNULL) +STDERR_TO_DEVNULL ?= 2$(FD_TO_DEVNULL) STDERR_TO_STDOUT ?= 2>&1 TO_DEVNULL ?= $(STDOUT_TO_DEVNULL) $(STDERR_TO_STDOUT) @@ -65,6 +68,9 @@ LIBS_PNG ?= $(shell PKG_CONFIG_PATH=$(PKG_CONFIG_PATH) $(PKGCONFIG) li CPPFLAGS_GTK ?= $(shell PKG_CONFIG_PATH=$(PKG_CONFIG_PATH) $(PKGCONFIG) gtk+-2.0 --cflags $(STDERR_TO_DEVNULL)) LIBS_GTK ?= $(shell PKG_CONFIG_PATH=$(PKG_CONFIG_PATH) $(PKGCONFIG) gtk+-2.0 --libs-only-L $(STDERR_TO_DEVNULL)) \ $(shell PKG_CONFIG_PATH=$(PKG_CONFIG_PATH) $(PKGCONFIG) gtk+-2.0 --libs-only-l $(STDERR_TO_DEVNULL)) +CPPFLAGS_PANGOFT2 ?= $(shell PKG_CONFIG_PATH=$(PKG_CONFIG_PATH) $(PKGCONFIG) pangoft2 --cflags $(STDERR_TO_DEVNULL)) +LIBS_PANGOFT2 ?= $(shell PKG_CONFIG_PATH=$(PKG_CONFIG_PATH) $(PKGCONFIG) pangoft2 --libs-only-L $(STDERR_TO_DEVNULL)) \ + $(shell PKG_CONFIG_PATH=$(PKG_CONFIG_PATH) $(PKGCONFIG) pangoft2 --libs-only-l $(STDERR_TO_DEVNULL)) CPPFLAGS_GTKGLEXT ?= $(shell PKG_CONFIG_PATH=$(PKG_CONFIG_PATH) $(PKGCONFIG) gtkglext-1.0 --cflags $(STDERR_TO_DEVNULL)) LIBS_GTKGLEXT ?= $(shell PKG_CONFIG_PATH=$(PKG_CONFIG_PATH) $(PKGCONFIG) gtkglext-1.0 --libs-only-L $(STDERR_TO_DEVNULL)) \ $(shell PKG_CONFIG_PATH=$(PKG_CONFIG_PATH) $(PKGCONFIG) gtkglext-1.0 --libs-only-l $(STDERR_TO_DEVNULL)) @@ -75,8 +81,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)) @@ -164,8 +178,8 @@ else ifeq ($(OS),Win32) CPPFLAGS_COMMON += -DWIN32 -D_WIN32 -D_inline=inline CFLAGS_COMMON += -mms-bitfields - LDFLAGS_DLL = --dll -Wl,--add-stdcall-alias - LIBS_COMMON = -lws2_32 -luser32 -lgdi32 + LDFLAGS_DLL = -mdll -Wl,--add-stdcall-alias + LIBS_COMMON = -lws2_32 -luser32 -lgdi32 -lole32 EXE ?= exe A = a DLL = dll @@ -183,17 +197,14 @@ 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/X11R6/lib - #LDFLAGS_COMMON += -L/sw/lib -L/usr/lib -L/usr/X11R6/lib + CPPFLAGS_COMMON += -I/opt/local/include -I/sw/include -I/usr/X11R6/include + LDFLAGS_COMMON += -L/opt/local/lib -L/sw/lib -L/usr/X11R6/lib LDFLAGS_DLL += -dynamiclib -ldl EXE ?= ppc - MACLIBDIR ?= /sw/lib + MACLIBDIR ?= /opt/local/lib A = a DLL = dylib MWINDOWS = - MACVERSION ?= 16 - CPPFLAGS_COMMON += -DMACVERSION="$(MACVERSION)" # workaround for weird prints ECHO_NOLF = /bin/echo -n @@ -213,7 +224,8 @@ endif endif # VERSION! -RADIANT_VERSION = 1.5.0n +RADIANT_VERSION_NUMBER = 1.5.0 +RADIANT_VERSION = $(RADIANT_VERSION_NUMBER)n RADIANT_MAJOR_VERSION = 5 RADIANT_MINOR_VERSION = 0 Q3MAP_VERSION = 2.5.17n @@ -243,12 +255,12 @@ dependencies-check: else dependencies-check: @$(ECHO) - @if [ x"$(DEPENDENCIES_CHECK)" = x"verbose" ]; then set -x; fi; \ + @if [ x"$(DEPENDENCIES_CHECK)" = x"verbose" ]; then set -x; exec 3>&2; else exec 3$(FD_TO_DEVNULL); fi; \ failed=0; \ checkbinary() \ { \ $(ECHO_NOLF) "Checking for $$2 ($$1)... "; \ - $$2 --help $(TO_DEVNULL); \ + $$2 --help >&3 $(STDERR_TO_STDOUT); \ if [ $$? != 127 ]; then \ $(ECHO) "found."; \ else \ @@ -268,6 +280,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)"; \ @@ -277,22 +290,35 @@ dependencies-check: checkbinary binutils "$(RANLIB)"; \ checkbinary binutils "$(AR)"; \ checkbinary pkg-config "$(PKGCONFIG)"; \ + checkbinary unzip "$(UNZIPPER)"; \ + 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)"; \ [ "$$failed" = "0" ] && $(ECHO) All required tools have been found! @$(ECHO) - @if [ x"$(DEPENDENCIES_CHECK)" = x"verbose" ]; then set -x; fi; \ + @if [ x"$(DEPENDENCIES_CHECK)" = x"verbose" ]; then set -x; exec 3>&2; else exec 3$(FD_TO_DEVNULL); fi; \ failed=0; \ checkheader() \ { \ $(ECHO_NOLF) "Checking for $$2 ($$1)... "; \ if \ - $(CXX) conftest.cpp $(CFLAGS) $(CXXFLAGS) $(CFLAGS_COMMON) $(CXXFLAGS_COMMON) $(CPPFLAGS) $(CPPFLAGS_COMMON) $$4 -DCONFTEST_HEADER="<$$2>" -DCONFTEST_SYMBOL="$$3" $(TARGET_ARCH) $(LDFLAGS) -c -o conftest.o $(TO_DEVNULL) && \ - $(CXX) conftest.o $(LDFLAGS) $(LDFLAGS_COMMON) $$5 $(LIBS_COMMON) $(LIBS) -o conftest $(TO_DEVNULL); \ + $(CXX) conftest.cpp $(CFLAGS) $(CXXFLAGS) $(CFLAGS_COMMON) $(CXXFLAGS_COMMON) $(CPPFLAGS) $(CPPFLAGS_COMMON) $$4 -DCONFTEST_HEADER="<$$2>" -DCONFTEST_SYMBOL="$$3" $(TARGET_ARCH) $(LDFLAGS) -c -o conftest.o >&3 $(STDERR_TO_STDOUT); \ then \ - $(RM) conftest conftest.o conftest.d; \ - $(ECHO) "found."; \ + if \ + $(CXX) conftest.o $(LDFLAGS) $(LDFLAGS_COMMON) $$5 $(LIBS_COMMON) $(LIBS) -o conftest >&3 $(STDERR_TO_STDOUT); \ + then \ + $(RM) conftest conftest.o conftest.d; \ + $(ECHO) "found and links."; \ + else \ + $(RM) conftest.o conftest.d; \ + $(ECHO) "found but does not link, 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"; \ + failed=1; \ + fi; \ else \ $(RM) conftest conftest.o conftest.d; \ $(ECHO) "not found, please install it or set PKG_CONFIG_PATH right!"; \ @@ -307,6 +333,7 @@ dependencies-check: checkheader libpng12-dev png.h png_create_read_struct "$(CPPFLAGS_PNG)" "$(LIBS_PNG)"; \ checkheader "mesa-common-dev (or another OpenGL library)" GL/gl.h glClear "$(CPPFLAGS_GL)" "$(LIBS_GL)"; \ checkheader libgtk2.0-dev gtk/gtkdialog.h gtk_dialog_run "$(CPPFLAGS_GTK)" "$(LIBS_GTK)"; \ + checkheader libpango1.0-dev pango/pangoft2.h pango_ft2_font_map_new "$(CPPFLAGS_PANGOFT2)" "$(LIBS_PANGOFT2)"; \ 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)"; \ @@ -316,7 +343,17 @@ endif .PHONY: binaries binaries: \ - $(INSTALLDIR)/heretic2/h2data.$(EXE) \ + binaries-tools \ + binaries-radiant \ + +.PHONY: binaries-radiant-all +binaries-radiant: \ + binaries-radiant-modules \ + binaries-radiant-plugins \ + binaries-radiant-core \ + +.PHONY: binaries-radiant-modules +binaries-radiant-modules: \ $(INSTALLDIR)/modules/archivepak.$(DLL) \ $(INSTALLDIR)/modules/archivewad.$(DLL) \ $(INSTALLDIR)/modules/archivezip.$(DLL) \ @@ -331,17 +368,56 @@ binaries: \ $(INSTALLDIR)/modules/model.$(DLL) \ $(INSTALLDIR)/modules/shaders.$(DLL) \ $(INSTALLDIR)/modules/vfspk3.$(DLL) \ + +.PHONY: binaries-radiant-plugins +binaries-radiant-plugins: \ $(INSTALLDIR)/plugins/bobtoolz.$(DLL) \ $(INSTALLDIR)/plugins/brushexport.$(DLL) \ $(INSTALLDIR)/plugins/prtview.$(DLL) \ $(INSTALLDIR)/plugins/shaderplug.$(DLL) \ $(INSTALLDIR)/plugins/sunplug.$(DLL) \ $(INSTALLDIR)/plugins/ufoaiplug.$(DLL) \ + +.PHONY: binaries-radiant +binaries-radiant-core: \ + $(INSTALLDIR)/radiant.$(EXE) \ + +.PHONY: binaries-tools +binaries-tools: \ + binaries-tools-quake2 \ + binaries-tools-quake3 \ + +.PHONY: binaries-tools-quake2 +binaries-tools-quake2: \ + binaries-q2map \ + binaries-qdata3 \ + binaries-h2data \ + +.PHONY: binaries-q2map +binaries-q2map: \ $(INSTALLDIR)/q2map.$(EXE) \ + +.PHONY: binaries-qdata3 +binaries-qdata3: \ + $(INSTALLDIR)/qdata3.$(EXE) \ + +.PHONY: binaries-h2data +binaries-h2data: \ + $(INSTALLDIR)/heretic2/h2data.$(EXE) + +.PHONY: binaries-tools-quake3 +binaries-tools-quake3: \ + binaries-q3data \ + binaries-q3map2 \ + +.PHONY: binaries-q3data +binaries-q3data: \ $(INSTALLDIR)/q3data.$(EXE) \ + +.PHONY: binaries-q3map2 +binaries-q3map2: \ $(INSTALLDIR)/q3map2.$(EXE) \ - $(INSTALLDIR)/qdata3.$(EXE) \ - $(INSTALLDIR)/radiant.$(EXE) \ + .PHONY: clean clean: @@ -371,10 +447,10 @@ ifeq ($(OS),Win32) $(WINDRES) $< $@ endif -%.o: %.cpp $(if $(findstring $(DEPEND_ON_MAKEFILE),yes),$(wildcard Makefile*),) +%.o: %.cpp $(if $(findstring $(DEPEND_ON_MAKEFILE),yes),$(wildcard Makefile*),) | dependencies-check $(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*),) +%.o: %.c dependencies-check $(if $(findstring $(DEPEND_ON_MAKEFILE),yes),$(wildcard Makefile*),) | dependencies-check $(CC) $< $(CFLAGS) $(CFLAGS_COMMON) $(CPPFLAGS_EXTRA) $(CPPFLAGS_COMMON) $(CPPFLAGS) $(TARGET_ARCH) -c -o $@ @@ -398,6 +474,7 @@ $(INSTALLDIR)/q3map2.$(EXE): \ tools/quake3/q3map2/bspfile_rbsp.o \ tools/quake3/q3map2/bsp.o \ tools/quake3/q3map2/convert_ase.o \ + tools/quake3/q3map2/convert_obj.o \ tools/quake3/q3map2/convert_map.o \ tools/quake3/q3map2/decals.o \ tools/quake3/q3map2/facebsp.o \ @@ -429,6 +506,7 @@ $(INSTALLDIR)/q3map2.$(EXE): \ tools/quake3/q3map2/vis.o \ tools/quake3/q3map2/writebsp.o \ libddslib.$(A) \ + libfilematch.$(A) \ libjpeg6.$(A) \ libl_net.$(A) \ libmathlib.$(A) \ @@ -526,13 +604,14 @@ $(INSTALLDIR)/q3data.$(EXE): \ tools/quake3/q3data/q3data.o \ tools/quake3/q3data/stripper.o \ tools/quake3/q3data/video.o \ + libfilematch.$(A) \ libl_net.$(A) \ libmathlib.$(A) \ $(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) $(LIBS_ZLIB) -$(INSTALLDIR)/radiant.$(EXE): CPPFLAGS_EXTRA := $(CPPFLAGS_GL) $(CPPFLAGS_DL) $(CPPFLAGS_XML) $(CPPFLAGS_GLIB) $(CPPFLAGS_GTK) $(CPPFLAGS_GTKGLEXT) -Ilibs -Iinclude +$(INSTALLDIR)/radiant.$(EXE): LIBS_EXTRA := $(LIBS_GL) $(LIBS_DL) $(LIBS_XML) $(LIBS_GLIB) $(LIBS_GTK) $(LIBS_GTKGLEXT) $(LIBS_ZLIB) $(LIBS_PANGOFT2) +$(INSTALLDIR)/radiant.$(EXE): CPPFLAGS_EXTRA := $(CPPFLAGS_GL) $(CPPFLAGS_DL) $(CPPFLAGS_XML) $(CPPFLAGS_GLIB) $(CPPFLAGS_GTK) $(CPPFLAGS_GTKGLEXT) $(CPPFLAGS_PANGOFT2) -Ilibs -Iinclude $(INSTALLDIR)/radiant.$(EXE): \ radiant/autosave.o \ radiant/brushmanip.o \ @@ -623,6 +702,10 @@ $(INSTALLDIR)/radiant.$(EXE): \ libxmllib.$(A) \ $(if $(findstring $(OS),Win32),icons/radiant.o,) \ +libfilematch.$(A): CPPFLAGS_EXTRA := -Ilibs +libfilematch.$(A): \ + libs/filematch.o \ + libcmdlib.$(A): CPPFLAGS_EXTRA := -Ilibs libcmdlib.$(A): \ libs/cmdlib/cmdlib.o \ @@ -632,7 +715,7 @@ libprofile.$(A): \ libs/profile/file.o \ libs/profile/profile.o \ -libgtkutil.$(A): CPPFLAGS_EXTRA := $(CPPFLAGS_GLIB) $(CPPFLAGS_GTK) $(CPPFLAGS_GTKGLEXT) -Ilibs -Iinclude +libgtkutil.$(A): CPPFLAGS_EXTRA := $(CPPFLAGS_GLIB) $(CPPFLAGS_GTK) $(CPPFLAGS_GTKGLEXT) $(CPPFLAGS_PANGOFT2) -Ilibs -Iinclude libgtkutil.$(A): \ libs/gtkutil/accelerator.o \ libs/gtkutil/button.o \ @@ -779,6 +862,7 @@ $(INSTALLDIR)/modules/vfspk3.$(DLL): \ plugins/vfspk3/archive.o \ plugins/vfspk3/vfs.o \ plugins/vfspk3/vfspk3.o \ + libfilematch.$(A) \ $(INSTALLDIR)/plugins/bobtoolz.$(DLL): LIBS_EXTRA := $(LIBS_GLIB) $(LIBS_GTK) $(INSTALLDIR)/plugins/bobtoolz.$(DLL): CPPFLAGS_EXTRA := $(CPPFLAGS_GLIB) $(CPPFLAGS_GTK) -Ilibs -Iinclude @@ -958,16 +1042,7 @@ 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 [ "$$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; \ - done + DOWNLOAD_GAMEPACKS="$(DOWNLOAD_GAMEPACKS)" GIT="$(GIT)" SVN="$(SVN)" WGET="$(WGET)" RM_R="$(RM_R)" MV="$(MV)" UNZIPPER="$(UNZIPPER)" 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)/ @@ -989,4 +1064,25 @@ install-dll: binaries endif endif +# release building... NOT for general users +# these may use tools not in the list that is checked by the build system +release-src: BUILD_DATE := $(shell date +%Y%m%d) +release-src: INSTALLDIR := netradiant-$(RADIANT_VERSION_NUMBER)-$(BUILD_DATE) +release-src: + $(GIT) archive --format=tar --prefix=$(INSTALLDIR)/ HEAD | bzip2 > ../$(INSTALLDIR).tar.bz2 + +release-win32: BUILD_DATE := $(shell date +%Y%m%d) +release-win32: INSTALLDIR := netradiant-$(RADIANT_VERSION_NUMBER)-$(BUILD_DATE) +release-win32: + $(MAKE) all INSTALLDIR=$(INSTALLDIR) MAKEFILE_CONF=cross-Makefile.conf RADIANT_ABOUTMSG="Official release build" BUILD=release + 7za a -sfx../../../../../../../../../../$(HOME)/7z.sfx ../$(INSTALLDIR)-win32-7z.exe $(INSTALLDIR)/ + chmod 644 ../$(INSTALLDIR)-win32-7z.exe # 7zip is evil + $(MAKE) clean INSTALLDIR=$(INSTALLDIR) MAKEFILE_CONF=cross-Makefile.conf RADIANT_ABOUTMSG="Official release build" BUILD=release + +release-all: + $(GIT) clean -xdf + $(MAKE) release-src + $(MAKE) release-win32 + +# load dependency files -include $(shell find . -name \*.d)