]> de.git.xonotic.org Git - xonotic/netradiant.git/blobdiff - Makefile
support misc_*model as misc_model in the radiant editor (way more convenient)
[xonotic/netradiant.git] / Makefile
index 8e183bb1348e4b115871717de281f4ac945f41b0..5cdeee6947a9c0aef605e7baa4bd568f56421ca7 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -1,37 +1,55 @@
--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
+OTOOL              ?= # only used on OS X
+WINDRES            ?= windres # only used on Win32
+
 PKGCONFIG          ?= pkg-config
 PKG_CONFIG_PATH    ?=
 
-FIND               ?= find
-MKDIR              ?= mkdir -p
-CP                 ?= cp
-CAT                ?= cat
-SH                 ?= sh
+SH                 ?= $(SHELL)
 ECHO               ?= echo
 ECHO_NOLF          ?= echo -n
-DIFF               ?= diff
+CAT                ?= cat
+MKDIR              ?= mkdir -p
+CP                 ?= cp
 CP_R               ?= $(CP) -r
+RM                 ?= rm
 RM_R               ?= $(RM) -r
 TEE_STDERR         ?= | tee /dev/stderr
+TR                 ?= tr
+FIND               ?= find
+DIFF               ?= diff
+SED                ?= sed
+GIT                ?= git
+SVN                ?= svn
+WGET               ?= wget
+MV                 ?= mv
+UNZIP              ?= unzip
+
 STDOUT_TO_DEVNULL  ?= >/dev/null
 STDERR_TO_DEVNULL  ?= 2>/dev/null
 STDERR_TO_STDOUT   ?= 2>&1
@@ -59,7 +77,10 @@ LIBS_DL            ?= -ldl # nothing on Win32
 CPPFLAGS_ZLIB      ?=
 LIBS_ZLIB          ?= -lz
 DEPEND_ON_MAKEFILE ?= yes
+DOWNLOAD_GAMEPACKS ?= yes
+# set to no to disable gamepack, set to all to even download undistributable gamepacks
 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))
@@ -69,18 +90,53 @@ WHICHDLL           ?= which
 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 =
 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)
@@ -89,24 +145,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
+       EXE ?= exe
        A = a
        DLL = dll
        MWINDOWS = -mwindows
@@ -117,17 +181,57 @@ else ifeq ($(OS),Win32)
        LIBS_GL = -lopengl32
        # workaround: no -ldl on Win32
        LIBS_DL = 
-#else ifeq ($(OS),Darwin)
-#      EXE = ppc
 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/X11R6/lib
+       #LDFLAGS_COMMON += -L/sw/lib -L/usr/lib -L/usr/X11R6/lib
+       LDFLAGS_DLL += -dynamiclib -ldl
+       EXE ?= ppc
+       MACLIBDIR ?= /sw/lib
+       A = a
+       DLL = dylib
+       MWINDOWS =
+       MACVERSION ?= 16
+       CPPFLAGS_COMMON += -DMACVERSION="$(MACVERSION)"
+       # 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-div0
+RADIANT_VERSION = 1.5.0n
 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)\""
+Q3MAP_VERSION = 2.5.17n
+
+# 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)\"" -DQ3MAP_VERSION="\"$(Q3MAP_VERSION)\"" -DRADIANT_EXECUTABLE="\"$(RADIANT_EXECUTABLE)\""
 
 .PHONY: all
 all: \
@@ -137,46 +241,76 @@ all: \
        install-dll \
 
 .PHONY: dependencies-check
+ifeq ($(findstring $(DEPENDENCIES_CHECK),off),off)
+dependencies-check:
+       @$(ECHO) dependencies checking disabled, good luck...
+else
 dependencies-check:
        @$(ECHO)
-       @$(ECHO) checking that the system tools exist
-       $(FIND) --help $(TO_DEVNULL); [ $$? != 127 ]
-       $(MKDIR) --help $(TO_DEVNULL); [ $$? != 127 ]
-       $(CP) --help $(TO_DEVNULL); [ $$? != 127 ]
-       $(CAT) --help $(TO_DEVNULL); [ $$? != 127 ]
-       $(SH) --help $(TO_DEVNULL); [ $$? != 127 ]
-       $(ECHO) --help $(TO_DEVNULL); [ $$? != 127 ]
-       $(ECHO_NOLF) --help $(TO_DEVNULL); [ $$? != 127 ]
-       $(DIFF) --help $(TO_DEVNULL); [ $$? != 127 ]
-       $(CP_R) --help $(TO_DEVNULL); [ $$? != 127 ]
-       $(RM_R) --help $(TO_DEVNULL); [ $$? != 127 ]
-       $(ECHO) 42 $(TEE_STDERR) $(TO_DEVNULL); [ $$? != 127 ]
-       @$(ECHO)
-       @$(ECHO) checking that the build tools exist
-       $(CC) --help $(TO_DEVNULL); [ $$? != 127 ]
-       $(CXX) --help $(TO_DEVNULL); [ $$? != 127 ]
-       [ -n "$(LDD)" ] && $(LDD) --help $(TO_DEVNULL); [ $$? != 127 ]
-       $(RANLIB) --help $(TO_DEVNULL); [ $$? != 127 ]
-       $(AR) --help $(TO_DEVNULL); [ $$? != 127 ]
+       @if [ x"$(DEPENDENCIES_CHECK)" = x"verbose" ]; then set -x; fi; \
+       failed=0; \
+       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"; \
+                       failed=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 "$(MV)"; \
+       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)"; \
+       checkbinary unzip "$(UNZIP)"; \
+       checkbinary git-core "$(GIT)"; \
+       checkbinary subversion "$(SVN)"; \
+       checkbinary wget "$(WGET)"; \
+       [ "$(OS)" = "Win32" ] && checkbinary mingw32 "$(WINDRES)"; \
+       [ -n "$(LDD)" ] && checkbinary libc6 "$(LDD)"; \
+       [ -n "$(OTOOL)" ] && checkbinary xcode "$(OTOOL)"; \
+       [ "$$failed" = "0" ] && $(ECHO) All required tools have been found!
        @$(ECHO)
-       @$(ECHO) checking that the dependencies exist
        @if [ x"$(DEPENDENCIES_CHECK)" = x"verbose" ]; then set -x; fi; \
+       failed=0; \
        checkheader() \
        { \
-               $(ECHO_NOLF) "Checking for $$1... "; \
+               $(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_COMMON) $$5 $(LIBS_COMMON) $(LIBS) -o conftest $(TO_DEVNULL); \
+                       $(CXX) conftest.o $(LDFLAGS) $(LDFLAGS_COMMON) $$5 $(LIBS_COMMON) $(LIBS) -o conftest $(TO_DEVNULL); \
                then \
-                       $(RM) conftest conftest.o; \
+                       $(RM) conftest conftest.o conftest.d; \
                        $(ECHO) "found."; \
                else \
-                       $(RM) conftest conftest.o; \
+                       $(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"; \
-                       exit 1; \
+                       $(ECHO) "To proceed anyway, set DEPENDENCIES_CHECK=off"; \
+                       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 libxml2-dev libxml/xpath.h xmlXPathInit "$(CPPFLAGS_XML)" "$(LIBS_XML)"; \
        checkheader libpng12-dev png.h png_create_read_struct "$(CPPFLAGS_PNG)" "$(LIBS_PNG)"; \
@@ -185,41 +319,44 @@ dependencies-check:
        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: \
-       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) \
+       $(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_BASE)/
        $(FIND) . \( -name \*.o -o -name \*.d -o -name \*.$(DLL) -o -name \*.$(A) -o -name \*.$(EXE) \) -exec $(RM) {} \;
+       $(RM) icons/*.rc
 
 %.$(EXE):
        file=$@; $(MKDIR) $${file%/*}
@@ -235,15 +372,24 @@ clean:
        $(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; }
 
+%.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 $@
+       $(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 $@
+       $(CC) $< $(CFLAGS) $(CFLAGS_COMMON) $(CPPFLAGS_EXTRA) $(CPPFLAGS_COMMON) $(CPPFLAGS) $(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) $(LIBS_ZLIB)
+$(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 \
@@ -296,6 +442,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): \
@@ -365,9 +512,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 \
@@ -390,11 +537,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) $(LIBS_ZLIB)
+$(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 \
@@ -482,6 +630,7 @@ install/radiant.$(EXE): \
        libmathlib.$(A) \
        libprofile.$(A) \
        libxmllib.$(A) \
+       $(if $(findstring $(OS),Win32),icons/radiant.o,) \
 
 libcmdlib.$(A): CPPFLAGS_EXTRA := -Ilibs
 libcmdlib.$(A): \
@@ -526,28 +675,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 \
@@ -569,8 +718,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 \
@@ -580,39 +729,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 \
@@ -621,28 +770,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 \
@@ -670,18 +819,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 \
@@ -689,20 +838,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 \
@@ -722,10 +871,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 \
@@ -759,18 +909,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 \
@@ -802,35 +960,33 @@ install/heretic2/h2data.$(EXE): \
        tools/quake2/qdata_heretic2/tmix.o \
        tools/quake2/qdata_heretic2/video.o \
        libl_net.$(A) \
+       $(if $(findstring $(OS),Win32),icons/h2data.o,) \
 
 .PHONY: install-data
 install-data: binaries
-       $(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; \
-               for GAMEDIR in $$GAME/*.game; do \
-                       $(CP_R) "$$GAMEDIR" install/; \
-               done; \
-       done
-       $(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
+       $(MKDIR) $(INSTALLDIR)/games
+       $(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)" UNZIP="$(UNZIP)" 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)/
+       $(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)" $(SH) install-dlls.sh
+       MKDIR="$(MKDIR)" CP="$(CP)" CAT="$(CAT)" GTKDIR="$(GTKDIR)" WHICHDLL="$(WHICHDLL)" INSTALLDIR="$(INSTALLDIR)" $(SH) install-dlls.sh
+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
 
 -include $(shell find . -name \*.d)