]> de.git.xonotic.org Git - xonotic/netradiant.git/blobdiff - Makefile
radiant: make rotate/scale dialogs non-modal
[xonotic/netradiant.git] / Makefile
index 5899613272ebb03ec4bde529a70dd4513c4313c1..7bd232ccc2ecaf5632905af08c9cf86c79b89d49 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -4,9 +4,10 @@
 # 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           ?=
@@ -15,39 +16,51 @@ RADIANT_ABOUTMSG   ?= Custom build
 
 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    ?=
-export 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      ?= $(shell PKG_CONFIG_PATH=$(PKG_CONFIG_PATH) $(PKGCONFIG) glib-2.0 --cflags)
-LIBS_GLIB          ?= $(shell PKG_CONFIG_PATH=$(PKG_CONFIG_PATH) $(PKGCONFIG) glib-2.0 --libs-only-L) \
-                      $(shell PKG_CONFIG_PATH=$(PKG_CONFIG_PATH) $(PKGCONFIG) glib-2.0 --libs-only-l)
-CPPFLAGS_XML       ?= $(shell PKG_CONFIG_PATH=$(PKG_CONFIG_PATH) $(PKGCONFIG) libxml-2.0 --cflags)
-LIBS_XML           ?= $(shell PKG_CONFIG_PATH=$(PKG_CONFIG_PATH) $(PKGCONFIG) libxml-2.0 --libs-only-L) \
-                      $(shell PKG_CONFIG_PATH=$(PKG_CONFIG_PATH) $(PKGCONFIG) libxml-2.0 --libs-only-l)
-CPPFLAGS_PNG       ?= $(shell PKG_CONFIG_PATH=$(PKG_CONFIG_PATH) $(PKGCONFIG) libpng --cflags)
-LIBS_PNG           ?= $(shell PKG_CONFIG_PATH=$(PKG_CONFIG_PATH) $(PKGCONFIG) libpng --libs-only-L) \
-                      $(shell PKG_CONFIG_PATH=$(PKG_CONFIG_PATH) $(PKGCONFIG) libpng --libs-only-l)
-CPPFLAGS_GTK       ?= $(shell PKG_CONFIG_PATH=$(PKG_CONFIG_PATH) $(PKGCONFIG) gtk+-2.0 --cflags)
-LIBS_GTK           ?= $(shell PKG_CONFIG_PATH=$(PKG_CONFIG_PATH) $(PKGCONFIG) gtk+-2.0 --libs-only-L) \
-                      $(shell PKG_CONFIG_PATH=$(PKG_CONFIG_PATH) $(PKGCONFIG) gtk+-2.0 --libs-only-l)
-CPPFLAGS_GTKGLEXT  ?= $(shell PKG_CONFIG_PATH=$(PKG_CONFIG_PATH) $(PKGCONFIG) gtkglext-1.0 --cflags)
-LIBS_GTKGLEXT      ?= $(shell PKG_CONFIG_PATH=$(PKG_CONFIG_PATH) $(PKGCONFIG) gtkglext-1.0 --libs-only-L) \
-                      $(shell PKG_CONFIG_PATH=$(PKG_CONFIG_PATH) $(PKGCONFIG) gtkglext-1.0 --libs-only-l)
+TR                 ?= tr
+FIND               ?= find
+DIFF               ?= diff
+
+# 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        ?=
@@ -55,17 +68,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             ?= $(shell PKG_CONFIG_PATH=$(PKG_CONFIG_PATH) $(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 MKDIR
-export CP
-export CAT
-export GTKDIR
-export WHICHDLL
-
 # alias mingw32 OSes
 ifeq ($(OS),MINGW32_NT-6.0)
        OS = Win32
@@ -78,11 +87,41 @@ 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),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
@@ -120,9 +159,101 @@ else
 $(error Unsupported build OS: $(OS))
 endif
 
+# VERSION!
+RADIANT_VERSION = 1.5.0
+RADIANT_MAJOR_VERSION = 5
+RADIANT_MINOR_VERSION = 0
+
+SVN_VERSION := $(shell $(SVNVERSION) -n $(STDERR_TO_DEVNULL) | $(TR) -cd 0-9:)
+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 \
+       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 coreutils "$(TR)"; \
+       checkbinary findutils "$(FIND)"; \
+       checkbinary diff "$(DIFF)"; \
+       checkbinary gcc "$(CC)"; \
+       checkbinary g++ "$(CXX)"; \
+       checkbinary binutils "$(RANLIB)"; \
+       checkbinary binutils "$(AR)"; \
+       [ "$(OS)" = "Win32" ] && checkbinary mingw32 "$(WINDRES)"; \
+       [ "$(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) \
@@ -149,19 +280,17 @@ all: \
        install/q3map2.$(EXE) \
        install/qdata3.$(EXE) \
        install/radiant.$(EXE) \
-       install-data \
-       install-dll \
 
 .PHONY: clean
 clean:
        $(RM_R) install/
        $(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 $@ $^
@@ -170,7 +299,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 $@
@@ -233,6 +370,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): \
@@ -327,6 +465,7 @@ 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)
@@ -419,6 +558,7 @@ install/radiant.$(EXE): \
        libmathlib.$(A) \
        libprofile.$(A) \
        libxmllib.$(A) \
+       $(if $(findstring $(OS),Win32),icons/radiant.o,) \
 
 libcmdlib.$(A): CPPFLAGS_EXTRA := -Ilibs
 libcmdlib.$(A): \
@@ -659,6 +799,7 @@ 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
@@ -696,6 +837,7 @@ 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
@@ -705,6 +847,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): \
@@ -739,38 +888,10 @@ 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
+install-data: binaries
        $(MKDIR) install/games
        $(FIND) install/ -name .svn -exec $(RM_R) {} \; -prune
        set -ex; \
@@ -785,18 +906,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)