X-Git-Url: https://de.git.xonotic.org/?p=xonotic%2Fnetradiant.git;a=blobdiff_plain;f=Makefile;h=a78411cf717ffc277b9b9214d9b8673509d5f189;hp=da3c2f9e11d9c9d26f569254832829f968084398;hb=80647b81f3fe632505370464e01d988a40ebc771;hpb=31b63bbe0a270a6106bd86df6c5d9ec513c07e0e diff --git a/Makefile b/Makefile index da3c2f9e..a78411cf 100644 --- a/Makefile +++ b/Makefile @@ -1,14 +1,46 @@ -CFLAGS = -W -Wall -Wcast-align -Wcast-qual -Wno-unused-parameter -g3 -fPIC +include Makefile.conf + +CFLAGS = -MMD -W -Wall -Wcast-align -Wcast-qual -Wno-unused-parameter -fPIC +CPPFLAGS = CXXFLAGS = $(CFLAGS) -Wno-non-virtual-dtor -Wreorder -fno-exceptions -fno-rtti -CPPFLAGS_COMMON = -DPOSIX -DXWINDOWS -D_DEBUG -D_LINUX -LDFLAGS_COMMON = -#LDFLAGS_DLL = -fPIC -Wl,-fini,fini_stub -static-libgcc -ldl -LDFLAGS_DLL = -fPIC -ldl -EXE = x86 -A = a -DLL = so -NETAPI = berkley +CFLAGS_OPT ?= -O3 + +ifeq ($(BUILD),debug) + CFLAGS += -g3 + CPPFLAGS += -D_DEBUG +else ifeq ($(BUILD),release) + CFLAGS += $(CFLAGS_OPT) + LDFLAGS += -s +else +$(error Unsupported build type) +endif + +ifeq ($(OS),Linux) + CPPFLAGS += -DPOSIX -DXWINDOWS -D_LINUX + LDFLAGS_DLL = -fPIC -ldl + LIBS = -lpthread + EXE = x86 + A = a + DLL = so + NETAPI = berkley + CPPFLAGS_GLIB = `pkg-config glib-2.0 --cflags` + LIBS_GLIB = `pkg-config glib-2.0 --libs-only-l --libs-only-L` + CPPFLAGS_XML = `xml2-config --cflags` + LIBS_XML = `xml2-config --libs` + CPPFLAGS_PNG = `libpng-config --cflags` + LIBS_PNG = `libpng-config --libs` + CPPFLAGS_GTK = `pkg-config gtk+-2.0 --cflags` + LIBS_GTK = `pkg-config gtk+-2.0 --libs-only-l --libs-only-L` + CPPFLAGS_GTKGLEXT = `pkg-config gtkglext-1.0 --cflags` + LIBS_GTKGLEXT = `pkg-config gtkglext-1.0 --libs-only-l --libs-only-L` +else ifeq ($(OS),Win32) +$(error Unsupported build OS) +else ifeq ($(OS),Darwin) +$(error Unsupported build OS) +else +$(error Unsupported build OS) +endif RADIANT_ABOUTMSG = Custom build @@ -20,28 +52,8 @@ MKDIR ?= mkdir -p CP ?= cp CP_R ?= $(CP) -r RM_R ?= $(RM) -r - TEE_STDERR ?= | tee /dev/stderr -LIBS_PTHREAD = -lpthread - -CPPFLAGS_GLIB = `pkg-config glib-2.0 --cflags` -LIBS_GLIB = `pkg-config glib-2.0 --libs-only-l --libs-only-L` - -CPPFLAGS_XML = `xml2-config --cflags` -LIBS_XML = `xml2-config --libs` - -CPPFLAGS_PNG = `libpng-config --cflags` -LIBS_PNG = `libpng-config --libs-only-l --libs-only-L` - -CPPFLAGS_GTK = `pkg-config gtk+-2.0 --cflags` -LIBS_GTK = `pkg-config gtk+-2.0 --libs-only-l --libs-only-L` - -CPPFLAGS_GTKGLEXT = `pkg-config gtkglext-1.0 --cflags` -LIBS_GTKGLEXT = `pkg-config gtkglext-1.0 --libs-only-l --libs-only-L` - -LDFLAGS := $(LDFLAGS_COMMON) - # from qe3.cpp: const char* const EXECUTABLE_TYPE = # from qe3.cpp: #if defined(__linux__) || defined (__FreeBSD__) # from qe3.cpp: "x86" @@ -54,7 +66,6 @@ LDFLAGS := $(LDFLAGS_COMMON) # from qe3.cpp: #endif # from qe3.cpp: ; - .PHONY: all all: \ makeversion \ @@ -89,11 +100,11 @@ all: \ .PHONY: clean clean: $(RM_R) install/ - $(FIND) . \( -name \*.o -o -name \*.$(DLL) -o -name \*.$(A) -o -name \*.$(EXE) \) -exec $(RM) {} \; + $(FIND) . \( -name \*.o -o -name \*.d -o -name \*.$(DLL) -o -name \*.$(A) -o -name \*.$(EXE) \) -exec $(RM) {} \; %.$(EXE): dir=$@; $(MKDIR) $${dir%/*} - $(CXX) -o $@ $^ $(LDFLAGS) $(LIBS) + $(CXX) -o $@ $^ $(LDFLAGS) $(LIBS) $(LIBS_EXTRA) [ -z "$(LDD)" ] || [ -z "`$(LDD) -r $@ 2>&1 >/dev/null $(TEE_STDERR)`" ] || { $(RM) $@; exit 1; } %.$(A): @@ -102,11 +113,17 @@ clean: %.$(DLL): dir=$@; $(MKDIR) $${dir%/*} - $(CXX) -shared -o $@ $^ $(LDFLAGS) $(LDFLAGS_DLL) $(LIBS) + $(CXX) -shared -o $@ $^ $(LDFLAGS) $(LDFLAGS_DLL) $(LIBS) $(LIBS_EXTRA) [ -z "$(LDD)" ] || [ -z "`$(LDD) -r $@ 2>&1 >/dev/null $(TEE_STDERR)`" ] || { $(RM) $@; exit 1; } -install/q3map2.$(EXE): LIBS := $(LIBS_XML) $(LIBS_GLIB) $(LIBS_PNG) -install/q3map2.$(EXE): CPPFLAGS := $(CPPFLAGS_COMMON) $(CPPFLAGS_XML) $(CPPFLAGS_GLIB) $(CPPFLAGS_PNG) -Itools/quake3/common -Ilibs -Iinclude +%.o: %.cpp + $(CXX) -c -o $@ $< $(CXXFLAGS) $(CPPFLAGS) $(CPPFLAGS_EXTRA) + +%.o: %.c + $(CC) -c -o $@ $< $(CFLAGS) $(CPPFLAGS) $(CPPFLAGS_EXTRA) + +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): \ tools/quake3/common/cmdlib.o \ tools/quake3/common/imagelib.o \ @@ -161,7 +178,7 @@ install/q3map2.$(EXE): \ libmathlib.$(A) \ libpicomodel.$(A) \ -libmathlib.$(A): CPPFLAGS := $(CPPFLAGS_COMMON) -Ilibs +libmathlib.$(A): CPPFLAGS_EXTRA := -Ilibs libmathlib.$(A): \ libs/mathlib/bbox.o \ libs/mathlib/line.o \ @@ -169,12 +186,12 @@ libmathlib.$(A): \ libs/mathlib/mathlib.o \ libs/mathlib/ray.o \ -libl_net.$(A): CPPFLAGS := $(CPPFLAGS_COMMON) -Ilibs +libl_net.$(A): CPPFLAGS_EXTRA := -Ilibs libl_net.$(A): \ libs/l_net/l_net.o \ libs/l_net/l_net_$(NETAPI).o \ -libjpeg6.$(A): CPPFLAGS := $(CPPFLAGS_COMMON) -Ilibs/jpeg6 -Ilibs +libjpeg6.$(A): CPPFLAGS_EXTRA := -Ilibs/jpeg6 -Ilibs libjpeg6.$(A): \ libs/jpeg6/jcomapi.o \ libs/jpeg6/jdapimin.o \ @@ -199,7 +216,7 @@ libjpeg6.$(A): \ libs/jpeg6/jpgload.o \ libs/jpeg6/jutils.o \ -libpicomodel.$(A): CPPFLAGS := $(CPPFLAGS_COMMON) -Ilibs +libpicomodel.$(A): CPPFLAGS_EXTRA := -Ilibs libpicomodel.$(A): \ libs/picomodel/lwo/clip.o \ libs/picomodel/lwo/envelope.o \ @@ -225,12 +242,12 @@ libpicomodel.$(A): \ libs/picomodel/pm_obj.o \ libs/picomodel/pm_terrain.o \ -libddslib.$(A): CPPFLAGS := $(CPPFLAGS_COMMON) -Ilibs +libddslib.$(A): CPPFLAGS_EXTRA := -Ilibs libddslib.$(A): \ libs/ddslib/ddslib.o \ -install/q3data.$(EXE): LIBS := $(LIBS_XML) $(LIBS_GLIB) -install/q3data.$(EXE): CPPFLAGS := $(CPPFLAGS_COMMON) $(CPPFLAGS_XML) $(CPPFLAGS_GLIB) -Itools/quake3/common -Ilibs -Iinclude +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): \ tools/quake3/common/aselib.o \ tools/quake3/common/bspfile.o \ @@ -255,8 +272,8 @@ install/q3data.$(EXE): \ libl_net.$(A) \ libmathlib.$(A) \ -install/radiant.$(EXE): LIBS := -ldl -lGL -static-libgcc $(LIBS_XML) $(LIBS_GLIB) $(LIBS_GTK) $(LIBS_GTKGLEXT) -install/radiant.$(EXE): CPPFLAGS := $(CPPFLAGS_COMMON) $(CPPFLAGS_XML) $(CPPFLAGS_GLIB) $(CPPFLAGS_GTK) $(CPPFLAGS_GTKGLEXT) -Ilibs -Iinclude +install/radiant.$(EXE): LIBS_EXTRA := -ldl -lGL -static-libgcc $(LIBS_XML) $(LIBS_GLIB) $(LIBS_GTK) $(LIBS_GTKGLEXT) +install/radiant.$(EXE): CPPFLAGS_EXTRA := $(CPPFLAGS_XML) $(CPPFLAGS_GLIB) $(CPPFLAGS_GTK) $(CPPFLAGS_GTKGLEXT) -Ilibs -Iinclude install/radiant.$(EXE): \ radiant/autosave.o \ radiant/brushmanip.o \ @@ -345,16 +362,16 @@ install/radiant.$(EXE): \ libprofile.$(A) \ libxmllib.$(A) \ -libcmdlib.$(A): CPPFLAGS := $(CPPFLAGS_COMMON) -Ilibs +libcmdlib.$(A): CPPFLAGS_EXTRA := -Ilibs libcmdlib.$(A): \ libs/cmdlib/cmdlib.o \ -libprofile.$(A): CPPFLAGS := $(CPPFLAGS_COMMON) -Ilibs -Iinclude +libprofile.$(A): CPPFLAGS_EXTRA := -Ilibs -Iinclude libprofile.$(A): \ libs/profile/file.o \ libs/profile/profile.o \ -libgtkutil.$(A): CPPFLAGS := $(CPPFLAGS_COMMON) $(CPPFLAGS_GLIB) $(CPPFLAGS_GTK) $(CPPFLAGS_GTKGLEXT) -Ilibs -Iinclude +libgtkutil.$(A): CPPFLAGS_EXTRA := $(CPPFLAGS_GLIB) $(CPPFLAGS_GTK) $(CPPFLAGS_GTKGLEXT) -Ilibs -Iinclude libgtkutil.$(A): \ libs/gtkutil/accelerator.o \ libs/gtkutil/button.o \ @@ -380,7 +397,7 @@ libgtkutil.$(A): \ libs/gtkutil/window.o \ libs/gtkutil/xorrectangle.o \ -libxmllib.$(A): CPPFLAGS := $(CPPFLAGS_COMMON) $(CPPFLAGS_XML) $(CPPFLAGS_GLIB) -Ilibs -Iinclude +libxmllib.$(A): CPPFLAGS_EXTRA := $(CPPFLAGS_XML) $(CPPFLAGS_GLIB) -Ilibs -Iinclude libxmllib.$(A): \ libs/xml/ixml.o \ libs/xml/xmlelement.o \ @@ -388,27 +405,27 @@ libxmllib.$(A): \ libs/xml/xmltextags.o \ libs/xml/xmlwriter.o \ -install/modules/archivezip.$(DLL): LIBS := -lz -install/modules/archivezip.$(DLL): CPPFLAGS := $(CPPFLAGS_COMMON) -Ilibs -Iinclude +install/modules/archivezip.$(DLL): LIBS_EXTRA := -lz +install/modules/archivezip.$(DLL): CPPFLAGS_EXTRA := -Ilibs -Iinclude install/modules/archivezip.$(DLL): \ plugins/archivezip/archive.o \ plugins/archivezip/pkzip.o \ plugins/archivezip/plugin.o \ plugins/archivezip/zlibstream.o \ -install/modules/archivewad.$(DLL): CPPFLAGS := $(CPPFLAGS_COMMON) -Ilibs -Iinclude +install/modules/archivewad.$(DLL): CPPFLAGS_EXTRA := -Ilibs -Iinclude install/modules/archivewad.$(DLL): \ plugins/archivewad/archive.o \ plugins/archivewad/plugin.o \ plugins/archivewad/wad.o \ -install/modules/archivepak.$(DLL): CPPFLAGS := $(CPPFLAGS_COMMON) -Ilibs -Iinclude +install/modules/archivepak.$(DLL): CPPFLAGS_EXTRA := -Ilibs -Iinclude install/modules/archivepak.$(DLL): \ plugins/archivepak/archive.o \ plugins/archivepak/pak.o \ plugins/archivepak/plugin.o \ -install/modules/entity.$(DLL): CPPFLAGS := $(CPPFLAGS_COMMON) -Ilibs -Iinclude +install/modules/entity.$(DLL): CPPFLAGS_EXTRA := -Ilibs -Iinclude install/modules/entity.$(DLL): \ plugins/entity/angle.o \ plugins/entity/angles.o \ @@ -431,7 +448,7 @@ install/modules/entity.$(DLL): \ plugins/entity/skincache.o \ plugins/entity/targetable.o \ -install/modules/image.$(DLL): CPPFLAGS := $(CPPFLAGS_COMMON) -Ilibs -Iinclude +install/modules/image.$(DLL): CPPFLAGS_EXTRA := -Ilibs -Iinclude install/modules/image.$(DLL): \ plugins/image/bmp.o \ plugins/image/dds.o \ @@ -442,38 +459,38 @@ install/modules/image.$(DLL): \ libddslib.$(A) \ libjpeg6.$(A) \ -install/modules/imageq2.$(DLL): CPPFLAGS := $(CPPFLAGS_COMMON) -Ilibs -Iinclude +install/modules/imageq2.$(DLL): CPPFLAGS_EXTRA := -Ilibs -Iinclude install/modules/imageq2.$(DLL): \ plugins/imageq2/imageq2.o \ plugins/imageq2/wal32.o \ plugins/imageq2/wal.o \ -install/modules/imagehl.$(DLL): CPPFLAGS := $(CPPFLAGS_COMMON) -Ilibs -Iinclude +install/modules/imagehl.$(DLL): CPPFLAGS_EXTRA := -Ilibs -Iinclude install/modules/imagehl.$(DLL): \ plugins/imagehl/hlw.o \ plugins/imagehl/imagehl.o \ plugins/imagehl/mip.o \ plugins/imagehl/sprite.o \ -install/modules/imagepng.$(DLL): LIBS := $(LIBS_PNG) -install/modules/imagepng.$(DLL): CPPFLAGS := $(CPPFLAGS_COMMON) $(CPPFLAGS_PNG) -Ilibs -Iinclude +install/modules/imagepng.$(DLL): LIBS_EXTRA := $(LIBS_PNG) +install/modules/imagepng.$(DLL): CPPFLAGS_EXTRA := $(CPPFLAGS_PNG) -Ilibs -Iinclude install/modules/imagepng.$(DLL): \ plugins/imagepng/plugin.o \ -install/modules/mapq3.$(DLL): CPPFLAGS := $(CPPFLAGS_COMMON) -Ilibs -Iinclude +install/modules/mapq3.$(DLL): CPPFLAGS_EXTRA := -Ilibs -Iinclude install/modules/mapq3.$(DLL): \ plugins/mapq3/parse.o \ plugins/mapq3/plugin.o \ plugins/mapq3/write.o \ -install/modules/mapxml.$(DLL): LIBS := $(LIBS_XML) $(LIBS_GLIB) -install/modules/mapxml.$(DLL): CPPFLAGS := $(CPPFLAGS_COMMON) $(CPPFLAGS_XML) $(CPPFLAGS_GLIB) -Ilibs -Iinclude +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): \ plugins/mapxml/plugin.o \ plugins/mapxml/xmlparse.o \ plugins/mapxml/xmlwrite.o \ -install/modules/md3model.$(DLL): CPPFLAGS := $(CPPFLAGS_COMMON) -Ilibs -Iinclude +install/modules/md3model.$(DLL): CPPFLAGS_EXTRA := -Ilibs -Iinclude install/modules/md3model.$(DLL): \ plugins/md3model/md2.o \ plugins/md3model/md3.o \ @@ -483,27 +500,27 @@ install/modules/md3model.$(DLL): \ plugins/md3model/mdl.o \ plugins/md3model/plugin.o \ -install/modules/model.$(DLL): CPPFLAGS := $(CPPFLAGS_COMMON) -Ilibs -Iinclude +install/modules/model.$(DLL): CPPFLAGS_EXTRA := -Ilibs -Iinclude install/modules/model.$(DLL): \ plugins/model/model.o \ plugins/model/plugin.o \ libpicomodel.$(A) \ -install/modules/shaders.$(DLL): LIBS := $(LIBS_GLIB) -install/modules/shaders.$(DLL): CPPFLAGS := $(CPPFLAGS_COMMON) $(CPPFLAGS_GLIB) -Ilibs -Iinclude +install/modules/shaders.$(DLL): LIBS_EXTRA := $(LIBS_GLIB) +install/modules/shaders.$(DLL): CPPFLAGS_EXTRA := $(CPPFLAGS_GLIB) -Ilibs -Iinclude install/modules/shaders.$(DLL): \ plugins/shaders/plugin.o \ plugins/shaders/shaders.o \ -install/modules/vfspk3.$(DLL): LIBS := $(LIBS_GLIB) -install/modules/vfspk3.$(DLL): CPPFLAGS := $(CPPFLAGS_COMMON) $(CPPFLAGS_GLIB) -Ilibs -Iinclude +install/modules/vfspk3.$(DLL): LIBS_EXTRA := $(LIBS_GLIB) +install/modules/vfspk3.$(DLL): CPPFLAGS_EXTRA := $(CPPFLAGS_GLIB) -Ilibs -Iinclude install/modules/vfspk3.$(DLL): \ plugins/vfspk3/archive.o \ plugins/vfspk3/vfs.o \ plugins/vfspk3/vfspk3.o \ -install/plugins/bobtoolz.$(DLL): LIBS := $(LIBS_GLIB) $(LIBS_GTK) -install/plugins/bobtoolz.$(DLL): CPPFLAGS := $(CPPFLAGS_COMMON) $(CPPFLAGS_GLIB) $(CPPFLAGS_GTK) -Ilibs -Iinclude +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): \ contrib/bobtoolz/bobToolz-GTK.o \ contrib/bobtoolz/bsploader.o \ @@ -532,8 +549,8 @@ install/plugins/bobtoolz.$(DLL): \ libmathlib.$(A) \ libprofile.$(A) \ -install/plugins/brushexport.$(DLL): LIBS := $(LIBS_GLIB) $(LIBS_GTK) -install/plugins/brushexport.$(DLL): CPPFLAGS := $(CPPFLAGS_COMMON) $(CPPFLAGS_GLIB) $(CPPFLAGS_GTK) -Ilibs -Iinclude +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): \ contrib/brushexport/callbacks.o \ contrib/brushexport/export.o \ @@ -541,8 +558,8 @@ install/plugins/brushexport.$(DLL): \ contrib/brushexport/plugin.o \ contrib/brushexport/support.o \ -install/plugins/prtview.$(DLL): LIBS := $(LIBS_GLIB) $(LIBS_GTK) -install/plugins/prtview.$(DLL): CPPFLAGS := $(CPPFLAGS_COMMON) $(CPPFLAGS_GLIB) $(CPPFLAGS_GTK) -Ilibs -Iinclude +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): \ contrib/prtview/AboutDialog.o \ contrib/prtview/ConfigDialog.o \ @@ -551,19 +568,19 @@ install/plugins/prtview.$(DLL): \ contrib/prtview/prtview.o \ libprofile.$(A) \ -install/plugins/shaderplug.$(DLL): LIBS := $(LIBS_GLIB) $(LIBS_GTK) $(LIBS_XML) -install/plugins/shaderplug.$(DLL): CPPFLAGS := $(CPPFLAGS_COMMON) $(CPPFLAGS_GLIB) $(CPPFLAGS_GTK) $(CPPFLAGS_XML) -Ilibs -Iinclude +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): \ contrib/shaderplug/shaderplug.o \ libxmllib.$(A) \ -install/plugins/sunplug.$(DLL): LIBS := $(LIBS_GLIB) $(LIBS_GTK) -install/plugins/sunplug.$(DLL): CPPFLAGS := $(CPPFLAGS_COMMON) $(CPPFLAGS_GLIB) $(CPPFLAGS_GTK) -Ilibs -Iinclude +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): \ contrib/sunplug/sunplug.o \ -install/qdata3.$(EXE): LIBS := $(LIBS_XML) $(LIBS_PTHREAD) -install/qdata3.$(EXE): CPPFLAGS := $(CPPFLAGS_COMMON) $(CPPFLAGS_XML) -Itools/quake2/common -Ilibs -Iinclude +install/qdata3.$(EXE): LIBS_EXTRA := $(LIBS_XML) +install/qdata3.$(EXE): CPPFLAGS_EXTRA := $(CPPFLAGS_XML) -Itools/quake2/common -Ilibs -Iinclude install/qdata3.$(EXE): \ tools/quake2/common/bspfile.o \ tools/quake2/common/cmdlib.o \ @@ -585,8 +602,8 @@ install/qdata3.$(EXE): \ tools/quake2/qdata/video.o \ libl_net.$(A) \ -install/q2map.$(EXE): LIBS := $(LIBS_XML) $(LIBS_PTHREAD) -install/q2map.$(EXE): CPPFLAGS := $(CPPFLAGS_COMMON) $(CPPFLAGS_XML) -Itools/quake2/common -Ilibs -Iinclude +install/q2map.$(EXE): LIBS_EXTRA := $(LIBS_XML) +install/q2map.$(EXE): CPPFLAGS_EXTRA := $(CPPFLAGS_XML) -Itools/quake2/common -Ilibs -Iinclude install/q2map.$(EXE): \ tools/quake2/common/bspfile.o \ tools/quake2/common/cmdlib.o \ @@ -622,16 +639,16 @@ install/q2map.$(EXE): \ tools/quake2/q2map/writebsp.o \ libl_net.$(A) \ -install/plugins/ufoaiplug.$(DLL): LIBS := $(LIBS_GLIB) $(LIBS_GTK) -install/plugins/ufoaiplug.$(DLL): CPPFLAGS := $(CPPFLAGS_COMMON) $(CPPFLAGS_GLIB) $(CPPFLAGS_GTK) -Ilibs -Iinclude +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): \ contrib/ufoaiplug/ufoai_filters.o \ contrib/ufoaiplug/ufoai_gtk.o \ contrib/ufoaiplug/ufoai_level.o \ contrib/ufoaiplug/ufoai.o \ -install/heretic2/h2data.$(EXE): LIBS := $(LIBS_XML) $(LIBS_PTHREAD) -install/heretic2/h2data.$(EXE): CPPFLAGS := $(CPPFLAGS_COMMON) $(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): 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): \ tools/quake2/qdata_heretic2/common/bspfile.o \ tools/quake2/qdata_heretic2/common/cmdlib.o \ @@ -671,21 +688,38 @@ makeversion: 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; \ - echo "#define RADIANT_VERSION \"$$ver\"" >> include/version.h; \ - echo "#define RADIANT_MAJOR_VERSION \"$$major\"" >> include/version.h; \ - echo "#define RADIANT_MINOR_VERSION \"$$minor\"" >> include/version.h; \ - echo "$$major" > include/RADIANT_MAJOR; \ - echo "$$minor" > include/RADIANT_MINOR; \ - echo "$$ver" > include/version; \ - echo "// generated header, see Makefile" > include/aboutmsg.h; \ - echo "#define RADIANT_ABOUTMSG \"$(RADIANT_ABOUTMSG)\"" >> include/aboutmsg.h; \ + 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 .PHONY: install-data install-data: $(MKDIR) install/games + $(FIND) install/ -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/; \ done; \ @@ -698,3 +732,4 @@ install-data: $(CP_R) setup/data/tools/* install/ $(FIND) install/ -name .svn -exec $(RM_R) {} \; -prune; \ +-include $(shell find . -name \*.d)