X-Git-Url: https://de.git.xonotic.org/?a=blobdiff_plain;f=Makefile;h=8d827172295345ca3e1abe7e5bd451102990bf42;hb=35e04d29f4b53542e6d9e6f45c18fdbee5b7dc7d;hp=a65c1d9b522e107d42317c0c64cfa7e7c9692b9c;hpb=ff8033e08a111812342694e718bd008b96c9e3a6;p=xonotic%2Fnetradiant.git diff --git a/Makefile b/Makefile index a65c1d9b..8d827172 100644 --- a/Makefile +++ b/Makefile @@ -1,126 +1,234 @@ -include Makefile.conf - +-include Makefile.conf + +## CONFIGURATION SETTINGS +# user customizable stuf +# you may override this in Makefile.conf or the environment +BUILD ?= debug +# or: release +OS ?= $(shell uname) +# or: Linux, Win32, Darwin +LDFLAGS ?= +CFLAGS ?= +CXXFLAGS ?= +CPPFLAGS ?= +LIBS ?= +RADIANT_ABOUTMSG ?= Custom build + +CC ?= gcc +CXX ?= g++ +RANLIB ?= ranlib +AR ?= ar +LDD ?= ldd # nothing on Win32 + +PKGCONFIG ?= pkg-config +PKG_CONFIG_PATH ?= + +SH ?= $(SHELL) +ECHO ?= echo +ECHO_NOLF ?= echo -n +CAT ?= cat +MKDIR ?= mkdir -p +CP ?= cp +CP_R ?= $(CP) -r +RM ?= rm +RM_R ?= $(RM) -r +TEE_STDERR ?= | tee /dev/stderr +FIND ?= find +DIFF ?= diff + +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 ?= +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 ?= $(shell PKG_CONFIG_PATH=$(PKG_CONFIG_PATH) $(PKGCONFIG) gtk+-2.0 --variable=prefix $(STDERR_TO_DEVNULL)) +WHICHDLL ?= which + +# alias mingw32 OSes ifeq ($(OS),MINGW32_NT-6.0) OS = Win32 endif -CFLAGS = -MMD -W -Wall -Wcast-align -Wcast-qual -Wno-unused-parameter -CPPFLAGS = -LDFLAGS = -LIBS = -CXXFLAGS = $(CFLAGS) -Wno-non-virtual-dtor -Wreorder -fno-exceptions -fno-rtti -CFLAGS_OPT = -O3 - -ifneq ($(MINGW),) - MINGWPREFIX ?= i586-mingw32msvc- - CC = $(MINGWPREFIX)gcc - CXX = $(MINGWPREFIX)g++ - RANLIB = $(MINGWPREFIX)ranlib - AR = $(MINGWPREFIX)ar - OS := Win32 - CPPFLAGS += -I$(MINGW)/include -D_inline=inline - CFLAGS += - LDFLAGS += -L$(MINGW)/lib - - CPPFLAGS_GLIB = -I$(MINGW)/include/glib-2.0 -I$(MINGW)/lib/glib-2.0/include - LIBS_GLIB = -lglib-2.0 - CPPFLAGS_XML = -I$(MINGW)/include/libxml2 - LIBS_XML = -lxml2 - CPPFLAGS_PNG = -I$(MINGW)/include/libpng12 -DPNG_NO_MMX_CODE - LIBS_PNG = -lpng12 - CPPFLAGS_GTK = -I$(MINGW)/include/gtk-2.0 -I$(MINGW)/lib/gtk-2.0/include -I$(MINGW)/include/atk-1.0 -I$(MINGW)/include/cairo -I$(MINGW)/include/pango-1.0 -I$(MINGW)/include/glib-2.0 -I$(MINGW)/lib/glib-2.0/include -I$(MINGW)/include/libpng12 -DPNG_NO_MMX_CODE - LIBS_GTK = -lgtk-win32-2.0 -lgdk-win32-2.0 -latk-1.0 -lgdk_pixbuf-2.0 -lpangocairo-1.0 -lpango-1.0 -lcairo -lgobject-2.0 -lgmodule-2.0 -lglib-2.0 -lpangowin32-1.0 - CPPFLAGS_GTKGLEXT = -I$(MINGW)/include/gtkglext-1.0 -I$(MINGW)/lib/gtkglext-1.0/include - LIBS_GTKGLEXT = -lgtkglext-win32-1.0 -lgdkglext-win32-1.0 -lgtk-win32-2.0 -lgdk-win32-2.0 -latk-1.0 -lgdk_pixbuf-2.0 -lpangocairo-1.0 -lpango-1.0 -lcairo -lgobject-2.0 -lgmodule-2.0 -lglib-2.0 -lpangowin32-1.0 - CPPFLAGS_GL = - LIBS_GL = -lopengl32 - CPPFLAGS_DL = - LIBS_DL = - CPPFLAGS_ZLIB = - LIBS_ZLIB = -lz -endif +CFLAGS_COMMON = -MMD -W -Wall -Wcast-align -Wcast-qual -Wno-unused-parameter +CPPFLAGS_COMMON = +LDFLAGS_COMMON = +LIBS_COMMON = +CXXFLAGS_COMMON = -Wno-non-virtual-dtor -Wreorder -fno-exceptions -fno-rtti ifeq ($(BUILD),debug) - CFLAGS += -g3 - CPPFLAGS += -D_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) - CFLAGS += $(CFLAGS_OPT) - LDFLAGS += -s +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) +$(error Unsupported build type: $(BUILD)) endif ifeq ($(OS),Linux) - CPPFLAGS += -DPOSIX -DXWINDOWS -D_LINUX - CFLAGS += -fPIC + CPPFLAGS_COMMON += -DPOSIX -DXWINDOWS -D_LINUX + CFLAGS_COMMON += -fPIC LDFLAGS_DLL = -fPIC -ldl - LIBS = -lpthread + LIBS_COMMON = -lpthread EXE = x86 A = a DLL = so MWINDOWS = else ifeq ($(OS),Win32) - CPPFLAGS += -DWIN32 -D_WIN32 -D_inline=inline - CFLAGS += -mms-bitfields + CPPFLAGS_COMMON += -DWIN32 -D_WIN32 -D_inline=inline + CFLAGS_COMMON += -mms-bitfields LDFLAGS_DLL = --dll -Wl,--add-stdcall-alias - LIBS = -lws2_32 -luser32 -lgdi32 + LIBS_COMMON = -lws2_32 -luser32 -lgdi32 EXE = exe A = a DLL = dll MWINDOWS = -mwindows + + # workaround: we have no "ldd" for Win32, so... LDD = - LIBS_GL ?= -lopengl32 - LIBS_DL ?= + # workaround: OpenGL library for Win32 is called opengl32.dll + LIBS_GL = -lopengl32 + # workaround: no -ldl on Win32 + LIBS_DL = #else ifeq ($(OS),Darwin) +# EXE = ppc else $(error Unsupported build OS: $(OS)) endif -CPPFLAGS_GLIB ?= `pkg-config glib-2.0 --cflags` -LIBS_GLIB ?= `pkg-config glib-2.0 --libs-only-L` `pkg-config glib-2.0 --libs-only-l` -CPPFLAGS_XML ?= `pkg-config libxml-2.0 --cflags` -LIBS_XML ?= `pkg-config libxml-2.0 --libs-only-L` `pkg-config libxml-2.0 --libs-only-l` -CPPFLAGS_PNG ?= `pkg-config libpng --cflags` -LIBS_PNG ?= `pkg-config libpng --libs-only-L` `pkg-config libpng --libs-only-l` -CPPFLAGS_GTK ?= `pkg-config gtk+-2.0 --cflags` -LIBS_GTK ?= `pkg-config gtk+-2.0 --libs-only-L` `pkg-config gtk+-2.0 --libs-only-l` -CPPFLAGS_GTKGLEXT ?= `pkg-config gtkglext-1.0 --cflags` -LIBS_GTKGLEXT ?= `pkg-config gtkglext-1.0 --libs-only-L` `pkg-config gtkglext-1.0 --libs-only-l` -CPPFLAGS_GL ?= -LIBS_GL ?= -lGL -CPPFLAGS_DL ?= -LIBS_DL ?= -ldl -CPPFLAGS_ZLIB = -LIBS_ZLIB = -lz - -RADIANT_ABOUTMSG = Custom build - -LDD ?= ldd -FIND ?= find -RANLIB ?= ranlib -AR ?= ar -OBJDUMP ?= objdump -MKDIR ?= mkdir -p -CP ?= cp -CP_R ?= $(CP) -r -RM_R ?= $(RM) -r -TEE_STDERR ?= | tee /dev/stderr - -# from qe3.cpp: const char* const EXECUTABLE_TYPE = -# from qe3.cpp: #if defined(__linux__) || defined (__FreeBSD__) -# from qe3.cpp: "x86" -# from qe3.cpp: #elif defined(__APPLE__) -# from qe3.cpp: "ppc" -# from qe3.cpp: #elif defined(WIN32) -# from qe3.cpp: "exe" -# from qe3.cpp: #else -# from qe3.cpp: #error "unknown platform" -# from qe3.cpp: #endif -# from qe3.cpp: ; +# VERSION! +RADIANT_VERSION = 1.5.0 +RADIANT_MAJOR_VERSION = 5 +RADIANT_MINOR_VERSION = 0 +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 \ + 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 findutils "$(FIND)"; \ + checkbinary diff "$(DIFF)"; \ + checkbinary gcc "$(CC)"; \ + checkbinary g++ "$(CXX)"; \ + checkbinary binutils "$(RANLIB)"; \ + checkbinary binutils "$(AR)"; \ + [ "$(OS)" != "Win32" ] && 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: \ install/heretic2/h2data.$(EXE) \ install/modules/archivepak.$(DLL) \ install/modules/archivewad.$(DLL) \ @@ -147,8 +255,6 @@ all: \ install/q3map2.$(EXE) \ install/qdata3.$(EXE) \ install/radiant.$(EXE) \ - install-data \ - install-dll \ .PHONY: clean clean: @@ -156,24 +262,24 @@ clean: $(FIND) . \( -name \*.o -o -name \*.d -o -name \*.$(DLL) -o -name \*.$(A) -o -name \*.$(EXE) \) -exec $(RM) {} \; %.$(EXE): - dir=$@; $(MKDIR) $${dir%/*} - $(CXX) -o $@ $^ $(LDFLAGS) $(LDFLAGS_EXTRA) $(LIBS_EXTRA) $(LIBS) - [ -z "$(LDD)" ] || [ -z "`$(LDD) -r $@ 2>&1 >/dev/null $(TEE_STDERR)`" ] || { $(RM) $@; exit 1; } + file=$@; $(MKDIR) $${file%/*} + $(CXX) $^ $(LDFLAGS) $(LDFLAGS_COMMON) $(LDFLAGS_EXTRA) $(LIBS_EXTRA) $(LIBS_COMMON) $(LIBS) -o $@ + [ -z "$(LDD)" ] || [ -z "`$(LDD) -r $@ $(STDERR_TO_STDOUT) $(STDOUT_TO_DEVNULL) $(TEE_STDERR)`" ] || { $(RM) $@; exit 1; } %.$(A): $(AR) rc $@ $^ $(RANLIB) $@ %.$(DLL): - dir=$@; $(MKDIR) $${dir%/*} - $(CXX) -shared -o $@ $^ $(LDFLAGS) $(LDFLAGS_DLL) $(LDFLAGS_EXTRA) $(LIBS_EXTRA) $(LIBS) - [ -z "$(LDD)" ] || [ -z "`$(LDD) -r $@ 2>&1 >/dev/null $(TEE_STDERR)`" ] || { $(RM) $@; exit 1; } + file=$@; $(MKDIR) $${file%/*} + $(CXX) $^ $(LDFLAGS) $(LDFLAGS_COMMON) $(LDFLAGS_EXTRA) $(LDFLAGS_DLL) $(LIBS_EXTRA) $(LIBS_COMMON) $(LIBS) -shared -o $@ + [ -z "$(LDD)" ] || [ -z "`$(LDD) -r $@ $(STDERR_TO_STDOUT) $(STDOUT_TO_DEVNULL) $(TEE_STDERR)`" ] || { $(RM) $@; exit 1; } -%.o: %.cpp - $(CXX) -c -o $@ $< $(CXXFLAGS) $(CPPFLAGS) $(CPPFLAGS_EXTRA) +%.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: %.c - $(CC) -c -o $@ $< $(CFLAGS) $(CPPFLAGS) $(CPPFLAGS_EXTRA) +%.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 @@ -702,6 +808,13 @@ install/plugins/ufoaiplug.$(DLL): \ contrib/ufoaiplug/ufoai_level.o \ contrib/ufoaiplug/ufoai.o \ +#install/plugins/bkgrnd2d.$(DLL): LIBS_EXTRA := $(LIBS_GLIB) $(LIBS_GTK) +#install/plugins/bkgrnd2d.$(DLL): CPPFLAGS_EXTRA := $(CPPFLAGS_GLIB) $(CPPFLAGS_GTK) -Ilibs -Iinclude +#install/plugins/bkgrnd2d.$(DLL): \ +# contrib/bkgrnd2d/bkgrnd2d.o \ +# contrib/bkgrnd2d/dialog.o \ +# contrib/bkgrnd2d/plugin.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): \ @@ -737,37 +850,8 @@ install/heretic2/h2data.$(EXE): \ 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 - .PHONY: install-data -install-data: makeversion +install-data: binaries $(MKDIR) install/games $(FIND) install/ -name .svn -exec $(RM_R) {} \; -prune set -ex; \ @@ -782,18 +866,18 @@ install-data: makeversion $(CP_R) "$$GAMEDIR" install/; \ done; \ done - $(CP) include/RADIANT_MAJOR install/ - $(CP) include/RADIANT_MINOR install/ + $(ECHO) $(RADIANT_MINOR_VERSION) > install/RADIANT_MINOR + $(ECHO) $(RADIANT_MAJOR_VERSION) > install/RADIANT_MAJOR $(CP_R) setup/data/tools/* install/ $(FIND) install/ -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)" $(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)