X-Git-Url: http://de.git.xonotic.org/?p=xonotic%2Fnetradiant.git;a=blobdiff_plain;f=Makefile;h=b4174339e8e6ca3d2a4539cfcd533ba669bb2124;hp=3c68356ce7f30b3910e83b82a2a8089499ee3852;hb=0fbfb4bcc94aed85d84b880a8caf9be456eebbfa;hpb=d0d88d3503df933374b57a193a54a356a44ee6de diff --git a/Makefile b/Makefile index 3c68356c..b4174339 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,12 +44,15 @@ TR ?= tr FIND ?= find DIFF ?= diff SED ?= sed - -# optional: -SVNVERSION ?= svnversion - -STDOUT_TO_DEVNULL ?= >/dev/null -STDERR_TO_DEVNULL ?= 2>/dev/null +GIT ?= git +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) @@ -64,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)) @@ -73,20 +80,34 @@ CPPFLAGS_DL ?= LIBS_DL ?= -ldl # nothing on Win32 CPPFLAGS_ZLIB ?= LIBS_ZLIB ?= -lz +CPPFLAGS_JPEG ?= +LIBS_JPEG ?= -ljpeg 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)) WHICHDLL ?= which +DLLINSTALL ?= install-dlls.sh # alias mingw32 OSes 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 = @@ -103,14 +124,18 @@ ifeq ($(findstring $(CFLAGS),-O),) endif CPPFLAGS_COMMON += LDFLAGS_COMMON += -else ifeq ($(BUILD),extradebug) +else + +ifeq ($(BUILD),extradebug) ifeq ($(findstring $(CFLAGS),-g),) CFLAGS_COMMON += -g3 # only add -g3 if no -g flag is in $(CFLAGS) endif CPPFLAGS_COMMON += -D_DEBUG LDFLAGS_COMMON += -else ifeq ($(BUILD),profile) +else + +ifeq ($(BUILD),profile) ifeq ($(findstring $(CFLAGS),-g),) CFLAGS_COMMON += -g # only add -g if no -g flag is in $(CFLAGS) @@ -122,7 +147,9 @@ endif CFLAGS_COMMON += -pg CPPFLAGS_COMMON += LDFLAGS_COMMON += -pg -else ifeq ($(BUILD),release) +else + +ifeq ($(BUILD),release) ifeq ($(findstring $(CFLAGS),-O),) CFLAGS_COMMON += -O3 # only add -O3 if no -O flag is in $(CFLAGS) @@ -131,24 +158,32 @@ endif CPPFLAGS_COMMON += LDFLAGS_COMMON += -s else + $(error Unsupported build type: $(BUILD)) endif +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 = -else ifeq ($(OS),Win32) +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 - EXE = exe + LDFLAGS_DLL = -Wl,--add-stdcall-alias + LIBS_COMMON = -lws2_32 -luser32 -lgdi32 -lole32 + EXE ?= exe A = a DLL = dll MWINDOWS = -mwindows @@ -159,29 +194,55 @@ else ifeq ($(OS),Win32) LIBS_GL = -lopengl32 # workaround: no -ldl on Win32 LIBS_DL = -else ifeq ($(OS),Darwin) - CFLAGS_COMMON += -force-cpusubtype_ALL -fPIC +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 + MACLIBDIR ?= /opt/local/lib + CPPFLAGS_COMMON += -I$(MACLIBDIR)/../include -I/usr/X11R6/include + LDFLAGS_COMMON += -L$(MACLIBDIR) -L/usr/X11R6/lib LDFLAGS_DLL += -dynamiclib -ldl - EXE = ppc - $(error Unsupported build OS: $(OS) - please complete the Darwin support in this Makefile and submit a patch) + EXE ?= ppc + A = a + 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 + $(error Unsupported build OS: $(OS)) endif +endif +endif # VERSION! -RADIANT_VERSION = 1.5.0 +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 -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: \ @@ -197,18 +258,19 @@ 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 \ $(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; \ @@ -221,6 +283,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)"; \ @@ -229,44 +292,72 @@ dependencies-check: checkbinary g++ "$(CXX)"; \ 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)"; \ - [ "$(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; \ + @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!"; \ $(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; \ - checkheader libglib2.0-dev glib/gutils.h g_path_is_absolute "$(CPPFLAGS_GLIB)" "$(LIBS_GLIB)"; \ + checkheader libjpeg8-dev jpeglib.h jpeg_set_defaults "$(CPPFLAGS_JPEG)" "$(LIBS_JPEG)"; \ + checkheader libglib2.0-dev glib.h g_path_is_absolute "$(CPPFLAGS_GLIB)" "$(LIBS_GLIB)"; \ checkheader libxml2-dev libxml/xpath.h xmlXPathInit "$(CPPFLAGS_XML)" "$(LIBS_XML)"; \ 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)"; \ - $(ECHO) All required libraries have been found! + [ "$$failed" = "0" ] && $(ECHO) All required libraries have been found! @$(ECHO) 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) \ @@ -281,21 +372,60 @@ 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: - $(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 @@ -321,18 +451,20 @@ ifeq ($(OS),Win32) $(WINDRES) $< $@ 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 $@ +%.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*),) - $(CC) $< $(CFLAGS) $(CFLAGS_COMMON) $(CPPFLAGS) $(CPPFLAGS_COMMON) $(CPPFLAGS_EXTRA) $(TARGET_ARCH) -c -o $@ +%.o: %.c $(if $(findstring $(DEPEND_ON_MAKEFILE),yes),$(wildcard Makefile*),) | dependencies-check + $(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): CPPFLAGS_EXTRA := $(CPPFLAGS_XML) $(CPPFLAGS_GLIB) $(CPPFLAGS_PNG) -Itools/quake3/common -Ilibs -Iinclude + +$(INSTALLDIR)/q3map2.$(EXE): LIBS_EXTRA := $(LIBS_XML) $(LIBS_GLIB) $(LIBS_PNG) $(LIBS_JPEG) $(LIBS_ZLIB) +$(INSTALLDIR)/q3map2.$(EXE): CPPFLAGS_EXTRA := $(CPPFLAGS_XML) $(CPPFLAGS_GLIB) $(CPPFLAGS_PNG) $(CPPFLAGS_JPEG) -Itools/quake3/common -Ilibs -Iinclude $(INSTALLDIR)/q3map2.$(EXE): \ tools/quake3/common/cmdlib.o \ tools/quake3/common/imagelib.o \ tools/quake3/common/inout.o \ + tools/quake3/common/jpeg.o \ tools/quake3/common/md4.o \ tools/quake3/common/mutex.o \ tools/quake3/common/polylib.o \ @@ -347,6 +479,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 \ @@ -378,7 +511,7 @@ $(INSTALLDIR)/q3map2.$(EXE): \ tools/quake3/q3map2/vis.o \ tools/quake3/q3map2/writebsp.o \ libddslib.$(A) \ - libjpeg6.$(A) \ + libfilematch.$(A) \ libl_net.$(A) \ libmathlib.$(A) \ libpicomodel.$(A) \ @@ -397,31 +530,6 @@ libl_net.$(A): \ libs/l_net/l_net.o \ $(if $(findstring $(OS),Win32),libs/l_net/l_net_wins.o,libs/l_net/l_net_berkley.o) \ -libjpeg6.$(A): CPPFLAGS_EXTRA := -Ilibs/jpeg6 -Ilibs -libjpeg6.$(A): \ - libs/jpeg6/jcomapi.o \ - libs/jpeg6/jdapimin.o \ - libs/jpeg6/jdapistd.o \ - libs/jpeg6/jdatasrc.o \ - libs/jpeg6/jdcoefct.o \ - libs/jpeg6/jdcolor.o \ - libs/jpeg6/jddctmgr.o \ - libs/jpeg6/jdhuff.o \ - libs/jpeg6/jdinput.o \ - libs/jpeg6/jdmainct.o \ - libs/jpeg6/jdmarker.o \ - libs/jpeg6/jdmaster.o \ - libs/jpeg6/jdpostct.o \ - libs/jpeg6/jdsample.o \ - libs/jpeg6/jdtrans.o \ - libs/jpeg6/jerror.o \ - libs/jpeg6/jfdctflt.o \ - libs/jpeg6/jidctflt.o \ - libs/jpeg6/jmemmgr.o \ - libs/jpeg6/jmemnobs.o \ - libs/jpeg6/jpgload.o \ - libs/jpeg6/jutils.o \ - libpicomodel.$(A): CPPFLAGS_EXTRA := -Ilibs libpicomodel.$(A): \ libs/picomodel/lwo/clip.o \ @@ -452,8 +560,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 \ @@ -475,13 +583,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) -$(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 \ @@ -572,6 +681,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 \ @@ -581,7 +694,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 \ @@ -658,7 +771,8 @@ $(INSTALLDIR)/modules/entity.$(DLL): \ plugins/entity/skincache.o \ plugins/entity/targetable.o \ -$(INSTALLDIR)/modules/image.$(DLL): CPPFLAGS_EXTRA := -Ilibs -Iinclude +$(INSTALLDIR)/modules/image.$(DLL): LIBS_EXTRA := $(LIBS_JPEG) +$(INSTALLDIR)/modules/image.$(DLL): CPPFLAGS_EXTRA := $(CPPFLAGS_JPEG) -Ilibs -Iinclude $(INSTALLDIR)/modules/image.$(DLL): \ plugins/image/bmp.o \ plugins/image/dds.o \ @@ -667,7 +781,6 @@ $(INSTALLDIR)/modules/image.$(DLL): \ plugins/image/pcx.o \ plugins/image/tga.o \ libddslib.$(A) \ - libjpeg6.$(A) \ $(INSTALLDIR)/modules/imageq2.$(DLL): CPPFLAGS_EXTRA := -Ilibs -Iinclude $(INSTALLDIR)/modules/imageq2.$(DLL): \ @@ -728,6 +841,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 @@ -859,12 +973,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 @@ -905,31 +1019,49 @@ $(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)" 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)/ - $(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 + MKDIR="$(MKDIR)" CP="$(CP)" CAT="$(CAT)" GTKDIR="$(GTKDIR)" WHICHDLL="$(WHICHDLL)" INSTALLDIR="$(INSTALLDIR)" $(SH) $(DLLINSTALL) +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 +# 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)