X-Git-Url: http://de.git.xonotic.org/?p=xonotic%2Fnetradiant.git;a=blobdiff_plain;f=Makefile;h=8ce76bab9b7f136456cb79ae56dbecdff9fbc244;hp=ea90cfd15ebdb97a0c3b19a57fcbce992cb6efa8;hb=f85ed10a525f0740eea98350f2cb0ed84db8530c;hpb=16164a2ee9bf0956f64a8575238899aedce10e62 diff --git a/Makefile b/Makefile index ea90cfd1..8ce76bab 100644 --- a/Makefile +++ b/Makefile @@ -1,47 +1,72 @@ --include Makefile.conf +MAKEFILE_CONF ?= Makefile.conf +-include $(MAKEFILE_CONF) ## CONFIGURATION SETTINGS # user customizable stuf # you may override this in Makefile.conf or the environment BUILD ?= debug -# or: release +# or: release, or: extradebug, or: profile OS ?= $(shell uname) # or: Linux, Win32, Darwin +LDFLAGS ?= CFLAGS ?= CXXFLAGS ?= CPPFLAGS ?= LIBS ?= RADIANT_ABOUTMSG ?= Custom build +# warning: this directory may NOT contain any files other than the ones written by this Makefile! +# NEVER SET THIS TO A SYSTEM WIDE "bin" DIRECTORY! +INSTALLDIR ?= install + CC ?= gcc CXX ?= g++ -LDD ?= ldd # nothing on Win32 RANLIB ?= ranlib AR ?= ar +LDD ?= ldd # nothing on Win32 +WINDRES ?= # only used on Win32 + PKGCONFIG ?= pkg-config PKG_CONFIG_PATH ?= -FIND ?= find +SH ?= $(SHELL) +ECHO ?= echo +ECHO_NOLF ?= echo -n +CAT ?= cat MKDIR ?= mkdir -p CP ?= cp -CAT ?= cat -SH ?= sh -ECHO ?= echo -DIFF ?= diff CP_R ?= $(CP) -r +RM ?= rm RM_R ?= $(RM) -r - TEE_STDERR ?= | tee /dev/stderr -CPPFLAGS_GLIB ?= `$(PKGCONFIG) glib-2.0 --cflags` -LIBS_GLIB ?= `$(PKGCONFIG) glib-2.0 --libs-only-L` `pkg-config glib-2.0 --libs-only-l` -CPPFLAGS_XML ?= `$(PKGCONFIG) libxml-2.0 --cflags` -LIBS_XML ?= `$(PKGCONFIG) libxml-2.0 --libs-only-L` `pkg-config libxml-2.0 --libs-only-l` -CPPFLAGS_PNG ?= `$(PKGCONFIG) libpng --cflags` -LIBS_PNG ?= `$(PKGCONFIG) libpng --libs-only-L` `pkg-config libpng --libs-only-l` -CPPFLAGS_GTK ?= `$(PKGCONFIG) gtk+-2.0 --cflags` -LIBS_GTK ?= `$(PKGCONFIG) gtk+-2.0 --libs-only-L` `pkg-config gtk+-2.0 --libs-only-l` -CPPFLAGS_GTKGLEXT ?= `$(PKGCONFIG) gtkglext-1.0 --cflags` -LIBS_GTKGLEXT ?= `$(PKGCONFIG) gtkglext-1.0 --libs-only-L` `pkg-config gtkglext-1.0 --libs-only-l` +TR ?= tr +FIND ?= find +DIFF ?= diff +SED ?= sed + +# optional: +SVNVERSION ?= svnversion + +STDOUT_TO_DEVNULL ?= >/dev/null +STDERR_TO_DEVNULL ?= 2>/dev/null +STDERR_TO_STDOUT ?= 2>&1 +TO_DEVNULL ?= $(STDOUT_TO_DEVNULL) $(STDERR_TO_STDOUT) + +CPPFLAGS_GLIB ?= $(shell PKG_CONFIG_PATH=$(PKG_CONFIG_PATH) $(PKGCONFIG) glib-2.0 --cflags $(STDERR_TO_DEVNULL)) +LIBS_GLIB ?= $(shell PKG_CONFIG_PATH=$(PKG_CONFIG_PATH) $(PKGCONFIG) glib-2.0 --libs-only-L $(STDERR_TO_DEVNULL)) \ + $(shell PKG_CONFIG_PATH=$(PKG_CONFIG_PATH) $(PKGCONFIG) glib-2.0 --libs-only-l $(STDERR_TO_DEVNULL)) +CPPFLAGS_XML ?= $(shell PKG_CONFIG_PATH=$(PKG_CONFIG_PATH) $(PKGCONFIG) libxml-2.0 --cflags $(STDERR_TO_DEVNULL)) +LIBS_XML ?= $(shell PKG_CONFIG_PATH=$(PKG_CONFIG_PATH) $(PKGCONFIG) libxml-2.0 --libs-only-L $(STDERR_TO_DEVNULL)) \ + $(shell PKG_CONFIG_PATH=$(PKG_CONFIG_PATH) $(PKGCONFIG) libxml-2.0 --libs-only-l $(STDERR_TO_DEVNULL)) +CPPFLAGS_PNG ?= $(shell PKG_CONFIG_PATH=$(PKG_CONFIG_PATH) $(PKGCONFIG) libpng --cflags $(STDERR_TO_DEVNULL)) +LIBS_PNG ?= $(shell PKG_CONFIG_PATH=$(PKG_CONFIG_PATH) $(PKGCONFIG) libpng --libs-only-L $(STDERR_TO_DEVNULL)) \ + $(shell PKG_CONFIG_PATH=$(PKG_CONFIG_PATH) $(PKGCONFIG) libpng --libs-only-l $(STDERR_TO_DEVNULL)) +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_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)) CPPFLAGS_GL ?= LIBS_GL ?= -lGL # -lopengl32 on Win32 CPPFLAGS_DL ?= @@ -49,18 +74,13 @@ LIBS_DL ?= -ldl # nothing on Win32 CPPFLAGS_ZLIB ?= LIBS_ZLIB ?= -lz DEPEND_ON_MAKEFILE ?= yes +DEPENDENCIES_CHECK ?= quiet +# or: off, verbose # these are used on Win32 only -GTKDIR ?= `$(PKGCONFIG) gtk+-2.0 --variable=prefix` +GTKDIR ?= $(shell PKG_CONFIG_PATH=$(PKG_CONFIG_PATH) $(PKGCONFIG) gtk+-2.0 --variable=prefix $(STDERR_TO_DEVNULL)) WHICHDLL ?= which -export WHICHDLL -export GTKDIR -export CP -export CAT -export MKDIR -export PKG_CONFIG_PATH - # alias mingw32 OSes ifeq ($(OS),MINGW32_NT-6.0) OS = Win32 @@ -73,19 +93,59 @@ LIBS_COMMON = CXXFLAGS_COMMON = -Wno-non-virtual-dtor -Wreorder -fno-exceptions -fno-rtti ifeq ($(BUILD),debug) +ifeq ($(findstring $(CFLAGS),-g),) + CFLAGS_COMMON += -g + # only add -g if no -g flag is in $(CFLAGS) +endif +ifeq ($(findstring $(CFLAGS),-O),) + CFLAGS_COMMON += -O + # only add -O if no -O flag is in $(CFLAGS) +endif + CPPFLAGS_COMMON += + LDFLAGS_COMMON += +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),release) +else + +ifeq ($(BUILD),profile) +ifeq ($(findstring $(CFLAGS),-g),) + CFLAGS_COMMON += -g + # only add -g if no -g flag is in $(CFLAGS) +endif +ifeq ($(findstring $(CFLAGS),-O),) + CFLAGS_COMMON += -O + # only add -O if no -O flag is in $(CFLAGS) +endif + CFLAGS_COMMON += -pg + CPPFLAGS_COMMON += + LDFLAGS_COMMON += -pg +else + +ifeq ($(BUILD),release) +ifeq ($(findstring $(CFLAGS),-O),) CFLAGS_COMMON += -O3 + # only add -O3 if no -O flag is in $(CFLAGS) + # to allow overriding the optimizations +endif CPPFLAGS_COMMON += LDFLAGS_COMMON += -s else + $(error Unsupported build type: $(BUILD)) endif +endif +endif +endif ifeq ($(OS),Linux) - CPPFLAGS_COMMON += -DPOSIX -DXWINDOWS -D_LINUX + CPPFLAGS_COMMON += -DPOSIX -DXWINDOWS CFLAGS_COMMON += -fPIC LDFLAGS_DLL = -fPIC -ldl LIBS_COMMON = -lpthread @@ -93,7 +153,9 @@ ifeq ($(OS),Linux) 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 @@ -106,57 +168,170 @@ else ifeq ($(OS),Win32) # workaround: we have no "ldd" for Win32, so... LDD = # workaround: OpenGL library for Win32 is called opengl32.dll - LIBS_GL ?= -lopengl32 + LIBS_GL = -lopengl32 # workaround: no -ldl on Win32 - LIBS_DL ?= -#else ifeq ($(OS),Darwin) -# EXE = ppc + LIBS_DL = +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_DLL += -dynamiclib -ldl + EXE = ppc + A = a + DLL = dylib + MWINDOWS = + + # 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 = + +#$(error Unsupported build OS: $(OS) - please complete the Darwin support in this Makefile and submit a patch) else + $(error Unsupported build OS: $(OS)) endif +endif +endif + +# VERSION! +RADIANT_VERSION = 1.5.0 +RADIANT_MAJOR_VERSION = 5 +RADIANT_MINOR_VERSION = 0 + +SVN_VERSION := $(shell $(SVNVERSION) -n $(STDERR_TO_DEVNULL) | $(SED) 's/M$$//g; s/.*://g;') +ifneq ($(SVN_VERSION),) + RADIANT_VERSION := $(RADIANT_VERSION)-svn$(SVN_VERSION) +endif + +CPPFLAGS += -DRADIANT_VERSION="\"$(RADIANT_VERSION)\"" -DRADIANT_MAJOR_VERSION="\"$(RADIANT_MAJOR_VERSION)\"" -DRADIANT_MINOR_VERSION="\"$(RADIANT_MINOR_VERSION)\"" -DRADIANT_ABOUTMSG="\"$(RADIANT_ABOUTMSG)\"" .PHONY: all all: \ - makeversion \ - install/heretic2/h2data.$(EXE) \ - install/modules/archivepak.$(DLL) \ - install/modules/archivewad.$(DLL) \ - install/modules/archivezip.$(DLL) \ - install/modules/entity.$(DLL) \ - install/modules/image.$(DLL) \ - install/modules/imagehl.$(DLL) \ - install/modules/imagepng.$(DLL) \ - install/modules/imageq2.$(DLL) \ - install/modules/mapq3.$(DLL) \ - install/modules/mapxml.$(DLL) \ - install/modules/md3model.$(DLL) \ - install/modules/model.$(DLL) \ - install/modules/shaders.$(DLL) \ - install/modules/vfspk3.$(DLL) \ - install/plugins/bobtoolz.$(DLL) \ - install/plugins/brushexport.$(DLL) \ - install/plugins/prtview.$(DLL) \ - install/plugins/shaderplug.$(DLL) \ - install/plugins/sunplug.$(DLL) \ - install/plugins/ufoaiplug.$(DLL) \ - install/q2map.$(EXE) \ - install/q3data.$(EXE) \ - install/q3map2.$(EXE) \ - install/qdata3.$(EXE) \ - install/radiant.$(EXE) \ + dependencies-check \ + binaries \ install-data \ install-dll \ +.PHONY: dependencies-check +ifeq ($(findstring $(DEPENDENCIES_CHECK),off),off) +dependencies-check: + @$(ECHO) dependencies checking disabled, good luck... +else +dependencies-check: + @$(ECHO) + @if [ x"$(DEPENDENCIES_CHECK)" = x"verbose" ]; then set -x; fi; \ + checkbinary() \ + { \ + $(ECHO_NOLF) "Checking for $$2 ($$1)... "; \ + $$2 --help $(TO_DEVNULL); \ + 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; \ + fi; \ + }; \ + $(ECHO) checking that the build tools exist; \ + checkbinary "bash (or another shell)" "$(SH)"; \ + checkbinary coreutils "$(ECHO)"; \ + checkbinary coreutils "$(ECHO_NOLF)"; \ + checkbinary coreutils "$(CAT)"; \ + checkbinary coreutils "$(MKDIR)"; \ + checkbinary coreutils "$(CP)"; \ + checkbinary coreutils "$(CP_R)"; \ + checkbinary coreutils "$(RM)"; \ + checkbinary coreutils "$(RM_R)"; \ + checkbinary coreutils "$(ECHO) test $(TEE_STDERR)"; \ + checkbinary sed "$(SED)"; \ + checkbinary findutils "$(FIND)"; \ + checkbinary diff "$(DIFF)"; \ + checkbinary gcc "$(CC)"; \ + checkbinary g++ "$(CXX)"; \ + checkbinary binutils "$(RANLIB)"; \ + checkbinary binutils "$(AR)"; \ + checkbinary pkg-config "$(PKGCONFIG)"; \ + [ "$(OS)" = "Win32" ] && checkbinary mingw32 "$(WINDRES)"; \ + [ -n "$(lDD)" ] && checkbinary libc6 "$(LDD)"; \ + $(ECHO) All required tools have been found! + @$(ECHO) + @if [ x"$(DEPENDENCIES_CHECK)" = x"verbose" ]; then set -x; fi; \ + 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); \ + then \ + $(RM) conftest conftest.o conftest.d; \ + $(ECHO) "found."; \ + 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; \ + fi; \ + }; \ + $(ECHO) checking that the dependencies exist; \ + checkheader libglib2.0-dev glib/gutils.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 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! + @$(ECHO) +endif + +.PHONY: binaries +binaries: \ + $(INSTALLDIR)/heretic2/h2data.$(EXE) \ + $(INSTALLDIR)/modules/archivepak.$(DLL) \ + $(INSTALLDIR)/modules/archivewad.$(DLL) \ + $(INSTALLDIR)/modules/archivezip.$(DLL) \ + $(INSTALLDIR)/modules/entity.$(DLL) \ + $(INSTALLDIR)/modules/image.$(DLL) \ + $(INSTALLDIR)/modules/imagehl.$(DLL) \ + $(INSTALLDIR)/modules/imagepng.$(DLL) \ + $(INSTALLDIR)/modules/imageq2.$(DLL) \ + $(INSTALLDIR)/modules/mapq3.$(DLL) \ + $(INSTALLDIR)/modules/mapxml.$(DLL) \ + $(INSTALLDIR)/modules/md3model.$(DLL) \ + $(INSTALLDIR)/modules/model.$(DLL) \ + $(INSTALLDIR)/modules/shaders.$(DLL) \ + $(INSTALLDIR)/modules/vfspk3.$(DLL) \ + $(INSTALLDIR)/plugins/bobtoolz.$(DLL) \ + $(INSTALLDIR)/plugins/brushexport.$(DLL) \ + $(INSTALLDIR)/plugins/prtview.$(DLL) \ + $(INSTALLDIR)/plugins/shaderplug.$(DLL) \ + $(INSTALLDIR)/plugins/sunplug.$(DLL) \ + $(INSTALLDIR)/plugins/ufoaiplug.$(DLL) \ + $(INSTALLDIR)/q2map.$(EXE) \ + $(INSTALLDIR)/q3data.$(EXE) \ + $(INSTALLDIR)/q3map2.$(EXE) \ + $(INSTALLDIR)/qdata3.$(EXE) \ + $(INSTALLDIR)/radiant.$(EXE) \ + .PHONY: clean clean: - $(RM_R) install/ + $(RM_R) $(INSTALLDIR)/ $(FIND) . \( -name \*.o -o -name \*.d -o -name \*.$(DLL) -o -name \*.$(A) -o -name \*.$(EXE) \) -exec $(RM) {} \; - $(RM) include/aboutmsg.h include/RADIANT_MAJOR include/version.h include/RADIANT_MINOR include/version + $(RM) icons/*.rc %.$(EXE): file=$@; $(MKDIR) $${file%/*} $(CXX) $^ $(LDFLAGS) $(LDFLAGS_COMMON) $(LDFLAGS_EXTRA) $(LIBS_EXTRA) $(LIBS_COMMON) $(LIBS) -o $@ - [ -z "$(LDD)" ] || [ -z "`$(LDD) -r $@ 2>&1 >/dev/null $(TEE_STDERR)`" ] || { $(RM) $@; exit 1; } + [ -z "$(LDD)" ] || [ -z "`$(LDD) -r $@ $(STDERR_TO_STDOUT) $(STDOUT_TO_DEVNULL) $(TEE_STDERR)`" ] || { $(RM) $@; exit 1; } %.$(A): $(AR) rc $@ $^ @@ -165,7 +340,15 @@ clean: %.$(DLL): file=$@; $(MKDIR) $${file%/*} $(CXX) $^ $(LDFLAGS) $(LDFLAGS_COMMON) $(LDFLAGS_EXTRA) $(LDFLAGS_DLL) $(LIBS_EXTRA) $(LIBS_COMMON) $(LIBS) -shared -o $@ - [ -z "$(LDD)" ] || [ -z "`$(LDD) -r $@ 2>&1 >/dev/null $(TEE_STDERR)`" ] || { $(RM) $@; exit 1; } + [ -z "$(LDD)" ] || [ -z "`$(LDD) -r $@ $(STDERR_TO_STDOUT) $(STDOUT_TO_DEVNULL) $(TEE_STDERR)`" ] || { $(RM) $@; exit 1; } + +%.rc: %.ico + $(ECHO) '1 ICON "$<"' > $@ + +ifeq ($(OS),Win32) +%.o: %.rc + $(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 $@ @@ -173,9 +356,9 @@ clean: %.o: %.c $(if $(findstring $(DEPEND_ON_MAKEFILE),yes),$(wildcard Makefile*),) $(CC) $< $(CFLAGS) $(CFLAGS_COMMON) $(CPPFLAGS) $(CPPFLAGS_COMMON) $(CPPFLAGS_EXTRA) $(TARGET_ARCH) -c -o $@ -install/q3map2.$(EXE): LIBS_EXTRA := $(LIBS_XML) $(LIBS_GLIB) $(LIBS_PNG) -install/q3map2.$(EXE): CPPFLAGS_EXTRA := $(CPPFLAGS_XML) $(CPPFLAGS_GLIB) $(CPPFLAGS_PNG) -Itools/quake3/common -Ilibs -Iinclude -install/q3map2.$(EXE): \ +$(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): \ tools/quake3/common/cmdlib.o \ tools/quake3/common/imagelib.o \ tools/quake3/common/inout.o \ @@ -228,6 +411,7 @@ install/q3map2.$(EXE): \ libl_net.$(A) \ libmathlib.$(A) \ libpicomodel.$(A) \ + $(if $(findstring $(OS),Win32),icons/q3map2.o,) \ libmathlib.$(A): CPPFLAGS_EXTRA := -Ilibs libmathlib.$(A): \ @@ -297,9 +481,9 @@ libddslib.$(A): CPPFLAGS_EXTRA := -Ilibs libddslib.$(A): \ libs/ddslib/ddslib.o \ -install/q3data.$(EXE): LIBS_EXTRA := $(LIBS_XML) $(LIBS_GLIB) -install/q3data.$(EXE): CPPFLAGS_EXTRA := $(CPPFLAGS_XML) $(CPPFLAGS_GLIB) -Itools/quake3/common -Ilibs -Iinclude -install/q3data.$(EXE): \ +$(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 \ tools/quake3/common/cmdlib.o \ @@ -322,11 +506,12 @@ install/q3data.$(EXE): \ tools/quake3/q3data/video.o \ libl_net.$(A) \ libmathlib.$(A) \ + $(if $(findstring $(OS),Win32),icons/q3data.o,) \ -install/radiant.$(EXE): LDFLAGS_EXTRA := $(MWINDOWS) -install/radiant.$(EXE): LIBS_EXTRA := $(LIBS_GL) $(LIBS_DL) $(LIBS_XML) $(LIBS_GLIB) $(LIBS_GTK) $(LIBS_GTKGLEXT) -install/radiant.$(EXE): CPPFLAGS_EXTRA := $(CPPFLAGS_GL) $(CPPFLAGS_DL) $(CPPFLAGS_XML) $(CPPFLAGS_GLIB) $(CPPFLAGS_GTK) $(CPPFLAGS_GTKGLEXT) -Ilibs -Iinclude -install/radiant.$(EXE): \ +$(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): \ radiant/autosave.o \ radiant/brushmanip.o \ radiant/brushmodule.o \ @@ -414,6 +599,7 @@ install/radiant.$(EXE): \ libmathlib.$(A) \ libprofile.$(A) \ libxmllib.$(A) \ + $(if $(findstring $(OS),Win32),icons/radiant.o,) \ libcmdlib.$(A): CPPFLAGS_EXTRA := -Ilibs libcmdlib.$(A): \ @@ -458,28 +644,28 @@ libxmllib.$(A): \ libs/xml/xmltextags.o \ libs/xml/xmlwriter.o \ -install/modules/archivezip.$(DLL): LIBS_EXTRA := $(LIBS_ZLIB) -install/modules/archivezip.$(DLL): CPPFLAGS_EXTRA := $(CPPFLAGS_ZLIB) -Ilibs -Iinclude -install/modules/archivezip.$(DLL): \ +$(INSTALLDIR)/modules/archivezip.$(DLL): LIBS_EXTRA := $(LIBS_ZLIB) +$(INSTALLDIR)/modules/archivezip.$(DLL): CPPFLAGS_EXTRA := $(CPPFLAGS_ZLIB) -Ilibs -Iinclude +$(INSTALLDIR)/modules/archivezip.$(DLL): \ plugins/archivezip/archive.o \ plugins/archivezip/pkzip.o \ plugins/archivezip/plugin.o \ plugins/archivezip/zlibstream.o \ -install/modules/archivewad.$(DLL): CPPFLAGS_EXTRA := -Ilibs -Iinclude -install/modules/archivewad.$(DLL): \ +$(INSTALLDIR)/modules/archivewad.$(DLL): CPPFLAGS_EXTRA := -Ilibs -Iinclude +$(INSTALLDIR)/modules/archivewad.$(DLL): \ plugins/archivewad/archive.o \ plugins/archivewad/plugin.o \ plugins/archivewad/wad.o \ -install/modules/archivepak.$(DLL): CPPFLAGS_EXTRA := -Ilibs -Iinclude -install/modules/archivepak.$(DLL): \ +$(INSTALLDIR)/modules/archivepak.$(DLL): CPPFLAGS_EXTRA := -Ilibs -Iinclude +$(INSTALLDIR)/modules/archivepak.$(DLL): \ plugins/archivepak/archive.o \ plugins/archivepak/pak.o \ plugins/archivepak/plugin.o \ -install/modules/entity.$(DLL): CPPFLAGS_EXTRA := -Ilibs -Iinclude -install/modules/entity.$(DLL): \ +$(INSTALLDIR)/modules/entity.$(DLL): CPPFLAGS_EXTRA := -Ilibs -Iinclude +$(INSTALLDIR)/modules/entity.$(DLL): \ plugins/entity/angle.o \ plugins/entity/angles.o \ plugins/entity/colour.o \ @@ -501,8 +687,8 @@ install/modules/entity.$(DLL): \ plugins/entity/skincache.o \ plugins/entity/targetable.o \ -install/modules/image.$(DLL): CPPFLAGS_EXTRA := -Ilibs -Iinclude -install/modules/image.$(DLL): \ +$(INSTALLDIR)/modules/image.$(DLL): CPPFLAGS_EXTRA := -Ilibs -Iinclude +$(INSTALLDIR)/modules/image.$(DLL): \ plugins/image/bmp.o \ plugins/image/dds.o \ plugins/image/image.o \ @@ -512,39 +698,39 @@ install/modules/image.$(DLL): \ libddslib.$(A) \ libjpeg6.$(A) \ -install/modules/imageq2.$(DLL): CPPFLAGS_EXTRA := -Ilibs -Iinclude -install/modules/imageq2.$(DLL): \ +$(INSTALLDIR)/modules/imageq2.$(DLL): CPPFLAGS_EXTRA := -Ilibs -Iinclude +$(INSTALLDIR)/modules/imageq2.$(DLL): \ plugins/imageq2/imageq2.o \ plugins/imageq2/wal32.o \ plugins/imageq2/wal.o \ -install/modules/imagehl.$(DLL): CPPFLAGS_EXTRA := -Ilibs -Iinclude -install/modules/imagehl.$(DLL): \ +$(INSTALLDIR)/modules/imagehl.$(DLL): CPPFLAGS_EXTRA := -Ilibs -Iinclude +$(INSTALLDIR)/modules/imagehl.$(DLL): \ plugins/imagehl/hlw.o \ plugins/imagehl/imagehl.o \ plugins/imagehl/mip.o \ plugins/imagehl/sprite.o \ -install/modules/imagepng.$(DLL): LIBS_EXTRA := $(LIBS_PNG) -install/modules/imagepng.$(DLL): CPPFLAGS_EXTRA := $(CPPFLAGS_PNG) -Ilibs -Iinclude -install/modules/imagepng.$(DLL): \ +$(INSTALLDIR)/modules/imagepng.$(DLL): LIBS_EXTRA := $(LIBS_PNG) +$(INSTALLDIR)/modules/imagepng.$(DLL): CPPFLAGS_EXTRA := $(CPPFLAGS_PNG) -Ilibs -Iinclude +$(INSTALLDIR)/modules/imagepng.$(DLL): \ plugins/imagepng/plugin.o \ -install/modules/mapq3.$(DLL): CPPFLAGS_EXTRA := -Ilibs -Iinclude -install/modules/mapq3.$(DLL): \ +$(INSTALLDIR)/modules/mapq3.$(DLL): CPPFLAGS_EXTRA := -Ilibs -Iinclude +$(INSTALLDIR)/modules/mapq3.$(DLL): \ plugins/mapq3/parse.o \ plugins/mapq3/plugin.o \ plugins/mapq3/write.o \ -install/modules/mapxml.$(DLL): LIBS_EXTRA := $(LIBS_XML) $(LIBS_GLIB) -install/modules/mapxml.$(DLL): CPPFLAGS_EXTRA := $(CPPFLAGS_XML) $(CPPFLAGS_GLIB) -Ilibs -Iinclude -install/modules/mapxml.$(DLL): \ +$(INSTALLDIR)/modules/mapxml.$(DLL): LIBS_EXTRA := $(LIBS_XML) $(LIBS_GLIB) +$(INSTALLDIR)/modules/mapxml.$(DLL): CPPFLAGS_EXTRA := $(CPPFLAGS_XML) $(CPPFLAGS_GLIB) -Ilibs -Iinclude +$(INSTALLDIR)/modules/mapxml.$(DLL): \ plugins/mapxml/plugin.o \ plugins/mapxml/xmlparse.o \ plugins/mapxml/xmlwrite.o \ -install/modules/md3model.$(DLL): CPPFLAGS_EXTRA := -Ilibs -Iinclude -install/modules/md3model.$(DLL): \ +$(INSTALLDIR)/modules/md3model.$(DLL): CPPFLAGS_EXTRA := -Ilibs -Iinclude +$(INSTALLDIR)/modules/md3model.$(DLL): \ plugins/md3model/md2.o \ plugins/md3model/md3.o \ plugins/md3model/md5.o \ @@ -553,28 +739,28 @@ install/modules/md3model.$(DLL): \ plugins/md3model/mdl.o \ plugins/md3model/plugin.o \ -install/modules/model.$(DLL): CPPFLAGS_EXTRA := -Ilibs -Iinclude -install/modules/model.$(DLL): \ +$(INSTALLDIR)/modules/model.$(DLL): CPPFLAGS_EXTRA := -Ilibs -Iinclude +$(INSTALLDIR)/modules/model.$(DLL): \ plugins/model/model.o \ plugins/model/plugin.o \ libpicomodel.$(A) \ -install/modules/shaders.$(DLL): LIBS_EXTRA := $(LIBS_GLIB) -install/modules/shaders.$(DLL): CPPFLAGS_EXTRA := $(CPPFLAGS_GLIB) -Ilibs -Iinclude -install/modules/shaders.$(DLL): \ +$(INSTALLDIR)/modules/shaders.$(DLL): LIBS_EXTRA := $(LIBS_GLIB) +$(INSTALLDIR)/modules/shaders.$(DLL): CPPFLAGS_EXTRA := $(CPPFLAGS_GLIB) -Ilibs -Iinclude +$(INSTALLDIR)/modules/shaders.$(DLL): \ plugins/shaders/plugin.o \ plugins/shaders/shaders.o \ -install/modules/vfspk3.$(DLL): LIBS_EXTRA := $(LIBS_GLIB) -install/modules/vfspk3.$(DLL): CPPFLAGS_EXTRA := $(CPPFLAGS_GLIB) -Ilibs -Iinclude -install/modules/vfspk3.$(DLL): \ +$(INSTALLDIR)/modules/vfspk3.$(DLL): LIBS_EXTRA := $(LIBS_GLIB) +$(INSTALLDIR)/modules/vfspk3.$(DLL): CPPFLAGS_EXTRA := $(CPPFLAGS_GLIB) -Ilibs -Iinclude +$(INSTALLDIR)/modules/vfspk3.$(DLL): \ plugins/vfspk3/archive.o \ plugins/vfspk3/vfs.o \ plugins/vfspk3/vfspk3.o \ -install/plugins/bobtoolz.$(DLL): LIBS_EXTRA := $(LIBS_GLIB) $(LIBS_GTK) -install/plugins/bobtoolz.$(DLL): CPPFLAGS_EXTRA := $(CPPFLAGS_GLIB) $(CPPFLAGS_GTK) -Ilibs -Iinclude -install/plugins/bobtoolz.$(DLL): \ +$(INSTALLDIR)/plugins/bobtoolz.$(DLL): LIBS_EXTRA := $(LIBS_GLIB) $(LIBS_GTK) +$(INSTALLDIR)/plugins/bobtoolz.$(DLL): CPPFLAGS_EXTRA := $(CPPFLAGS_GLIB) $(CPPFLAGS_GTK) -Ilibs -Iinclude +$(INSTALLDIR)/plugins/bobtoolz.$(DLL): \ contrib/bobtoolz/bobToolz-GTK.o \ contrib/bobtoolz/bsploader.o \ contrib/bobtoolz/cportals.o \ @@ -602,18 +788,18 @@ install/plugins/bobtoolz.$(DLL): \ libmathlib.$(A) \ libprofile.$(A) \ -install/plugins/brushexport.$(DLL): LIBS_EXTRA := $(LIBS_GLIB) $(LIBS_GTK) -install/plugins/brushexport.$(DLL): CPPFLAGS_EXTRA := $(CPPFLAGS_GLIB) $(CPPFLAGS_GTK) -Ilibs -Iinclude -install/plugins/brushexport.$(DLL): \ +$(INSTALLDIR)/plugins/brushexport.$(DLL): LIBS_EXTRA := $(LIBS_GLIB) $(LIBS_GTK) +$(INSTALLDIR)/plugins/brushexport.$(DLL): CPPFLAGS_EXTRA := $(CPPFLAGS_GLIB) $(CPPFLAGS_GTK) -Ilibs -Iinclude +$(INSTALLDIR)/plugins/brushexport.$(DLL): \ contrib/brushexport/callbacks.o \ contrib/brushexport/export.o \ contrib/brushexport/interface.o \ contrib/brushexport/plugin.o \ contrib/brushexport/support.o \ -install/plugins/prtview.$(DLL): LIBS_EXTRA := $(LIBS_GLIB) $(LIBS_GTK) -install/plugins/prtview.$(DLL): CPPFLAGS_EXTRA := $(CPPFLAGS_GLIB) $(CPPFLAGS_GTK) -Ilibs -Iinclude -install/plugins/prtview.$(DLL): \ +$(INSTALLDIR)/plugins/prtview.$(DLL): LIBS_EXTRA := $(LIBS_GLIB) $(LIBS_GTK) +$(INSTALLDIR)/plugins/prtview.$(DLL): CPPFLAGS_EXTRA := $(CPPFLAGS_GLIB) $(CPPFLAGS_GTK) -Ilibs -Iinclude +$(INSTALLDIR)/plugins/prtview.$(DLL): \ contrib/prtview/AboutDialog.o \ contrib/prtview/ConfigDialog.o \ contrib/prtview/LoadPortalFileDialog.o \ @@ -621,20 +807,20 @@ install/plugins/prtview.$(DLL): \ contrib/prtview/prtview.o \ libprofile.$(A) \ -install/plugins/shaderplug.$(DLL): LIBS_EXTRA := $(LIBS_GLIB) $(LIBS_GTK) $(LIBS_XML) -install/plugins/shaderplug.$(DLL): CPPFLAGS_EXTRA := $(CPPFLAGS_GLIB) $(CPPFLAGS_GTK) $(CPPFLAGS_XML) -Ilibs -Iinclude -install/plugins/shaderplug.$(DLL): \ +$(INSTALLDIR)/plugins/shaderplug.$(DLL): LIBS_EXTRA := $(LIBS_GLIB) $(LIBS_GTK) $(LIBS_XML) +$(INSTALLDIR)/plugins/shaderplug.$(DLL): CPPFLAGS_EXTRA := $(CPPFLAGS_GLIB) $(CPPFLAGS_GTK) $(CPPFLAGS_XML) -Ilibs -Iinclude +$(INSTALLDIR)/plugins/shaderplug.$(DLL): \ contrib/shaderplug/shaderplug.o \ libxmllib.$(A) \ -install/plugins/sunplug.$(DLL): LIBS_EXTRA := $(LIBS_GLIB) $(LIBS_GTK) -install/plugins/sunplug.$(DLL): CPPFLAGS_EXTRA := $(CPPFLAGS_GLIB) $(CPPFLAGS_GTK) -Ilibs -Iinclude -install/plugins/sunplug.$(DLL): \ +$(INSTALLDIR)/plugins/sunplug.$(DLL): LIBS_EXTRA := $(LIBS_GLIB) $(LIBS_GTK) +$(INSTALLDIR)/plugins/sunplug.$(DLL): CPPFLAGS_EXTRA := $(CPPFLAGS_GLIB) $(CPPFLAGS_GTK) -Ilibs -Iinclude +$(INSTALLDIR)/plugins/sunplug.$(DLL): \ contrib/sunplug/sunplug.o \ -install/qdata3.$(EXE): LIBS_EXTRA := $(LIBS_XML) -install/qdata3.$(EXE): CPPFLAGS_EXTRA := $(CPPFLAGS_XML) -Itools/quake2/common -Ilibs -Iinclude -install/qdata3.$(EXE): \ +$(INSTALLDIR)/qdata3.$(EXE): LIBS_EXTRA := $(LIBS_XML) +$(INSTALLDIR)/qdata3.$(EXE): CPPFLAGS_EXTRA := $(CPPFLAGS_XML) -Itools/quake2/common -Ilibs -Iinclude +$(INSTALLDIR)/qdata3.$(EXE): \ tools/quake2/common/bspfile.o \ tools/quake2/common/cmdlib.o \ tools/quake2/common/inout.o \ @@ -654,10 +840,11 @@ install/qdata3.$(EXE): \ tools/quake2/qdata/tables.o \ tools/quake2/qdata/video.o \ libl_net.$(A) \ + $(if $(findstring $(OS),Win32),icons/qdata3.o,) \ -install/q2map.$(EXE): LIBS_EXTRA := $(LIBS_XML) -install/q2map.$(EXE): CPPFLAGS_EXTRA := $(CPPFLAGS_XML) -Itools/quake2/common -Ilibs -Iinclude -install/q2map.$(EXE): \ +$(INSTALLDIR)/q2map.$(EXE): LIBS_EXTRA := $(LIBS_XML) +$(INSTALLDIR)/q2map.$(EXE): CPPFLAGS_EXTRA := $(CPPFLAGS_XML) -Itools/quake2/common -Ilibs -Iinclude +$(INSTALLDIR)/q2map.$(EXE): \ tools/quake2/common/bspfile.o \ tools/quake2/common/cmdlib.o \ tools/quake2/common/inout.o \ @@ -691,18 +878,26 @@ install/q2map.$(EXE): \ tools/quake2/q2map/tree.o \ tools/quake2/q2map/writebsp.o \ libl_net.$(A) \ + $(if $(findstring $(OS),Win32),icons/q2map.o,) \ -install/plugins/ufoaiplug.$(DLL): LIBS_EXTRA := $(LIBS_GLIB) $(LIBS_GTK) -install/plugins/ufoaiplug.$(DLL): CPPFLAGS_EXTRA := $(CPPFLAGS_GLIB) $(CPPFLAGS_GTK) -Ilibs -Iinclude -install/plugins/ufoaiplug.$(DLL): \ +$(INSTALLDIR)/plugins/ufoaiplug.$(DLL): LIBS_EXTRA := $(LIBS_GLIB) $(LIBS_GTK) +$(INSTALLDIR)/plugins/ufoaiplug.$(DLL): CPPFLAGS_EXTRA := $(CPPFLAGS_GLIB) $(CPPFLAGS_GTK) -Ilibs -Iinclude +$(INSTALLDIR)/plugins/ufoaiplug.$(DLL): \ contrib/ufoaiplug/ufoai_filters.o \ contrib/ufoaiplug/ufoai_gtk.o \ contrib/ufoaiplug/ufoai_level.o \ contrib/ufoaiplug/ufoai.o \ -install/heretic2/h2data.$(EXE): LIBS_EXTRA := $(LIBS_XML) -install/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 -install/heretic2/h2data.$(EXE): \ +#$(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 +$(INSTALLDIR)/heretic2/h2data.$(EXE): \ tools/quake2/qdata_heretic2/common/bspfile.o \ tools/quake2/qdata_heretic2/common/cmdlib.o \ tools/quake2/qdata_heretic2/common/inout.o \ @@ -734,64 +929,36 @@ install/heretic2/h2data.$(EXE): \ tools/quake2/qdata_heretic2/tmix.o \ tools/quake2/qdata_heretic2/video.o \ libl_net.$(A) \ - -.PHONY: makeversion -makeversion: - set -ex; \ - ver=`$(CAT) include/version.default`; \ - major=`$(ECHO) $$ver | cut -d . -f 2`; \ - minor=`$(ECHO) $$ver | cut -d . -f 3 | cut -d - -f 1`; \ - $(ECHO) "// generated header, see Makefile" > include/version.h.new; \ - $(ECHO) "#define RADIANT_VERSION \"$$ver\"" >> include/version.h.new; \ - $(ECHO) "#define RADIANT_MAJOR_VERSION \"$$major\"" >> include/version.h.new; \ - $(ECHO) "#define RADIANT_MINOR_VERSION \"$$minor\"" >> include/version.h.new; \ - $(ECHO) "$$major" > include/RADIANT_MAJOR.new; \ - $(ECHO) "$$minor" > include/RADIANT_MINOR.new; \ - $(ECHO) "$$ver" > include/version.new; \ - $(ECHO) "// generated header, see Makefile" > include/aboutmsg.h.new; \ - $(ECHO) "#define RADIANT_ABOUTMSG \"$(RADIANT_ABOUTMSG)\"" >> include/aboutmsg.h.new; \ - mv_if_diff() \ - { \ - if $(DIFF) $$1 $$2 >/dev/null 2>&1; then \ - rm -f $$1; \ - else \ - mv $$1 $$2; \ - fi; \ - }; \ - mv_if_diff include/version.h.new include/version.h; \ - mv_if_diff include/RADIANT_MAJOR.new include/RADIANT_MAJOR; \ - mv_if_diff include/RADIANT_MINOR.new include/RADIANT_MINOR; \ - mv_if_diff include/version.new include/version; \ - mv_if_diff include/aboutmsg.h.new include/aboutmsg.h + $(if $(findstring $(OS),Win32),icons/h2data.o,) \ .PHONY: install-data -install-data: makeversion - $(MKDIR) install/games - $(FIND) install/ -name .svn -exec $(RM_R) {} \; -prune +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" install/games/; \ + $(CP) "$$GAMEFILE" $(INSTALLDIR)/games/; \ done; \ for GAMEDIR in $$GAME/*.game; do \ - $(CP_R) "$$GAMEDIR" install/; \ + $(CP_R) "$$GAMEDIR" $(INSTALLDIR)/; \ done; \ done - $(CP) include/RADIANT_MAJOR install/ - $(CP) include/RADIANT_MINOR install/ - $(CP_R) setup/data/tools/* install/ - $(FIND) install/ -name .svn -exec $(RM_R) {} \; -prune + $(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 .PHONY: install-dll ifeq ($(OS),Win32) -install-dll: - $(SH) install-dlls.sh +install-dll: binaries + MKDIR="$(MKDIR)" CP="$(CP)" CAT="$(CAT)" GTKDIR="$(GTKDIR)" WHICHDLL="$(WHICHDLL)" INSTALLDIR="$(INSTALLDIR)" $(SH) install-dlls.sh else -install-dll: - echo No DLL inclusion required for this target. +install-dll: binaries + @$(ECHO) No DLL inclusion implemented for this target. endif -include $(shell find . -name \*.d)