split up mingw-Makefile.inc into mingw-Makefile.inc, mingw-radiantdeps-Makefile.inc

diff --git a/cross-Makefile.conf b/cross-Makefile.conf
index bf4ae3a83d95943c1a97eec7b9d0f10a530fa6bc..caba2e6ff2b059484c19e3aa6cce4fbbc822df99 100644 (file)
--- a/cross-Makefile.conf
+++ b/cross-Makefile.conf
@@ -7,3 +7,4 @@ MINGW_EXEC_PREFIX = i486-mingw32-
 
 # use mingw32
 include mingw-Makefile.inc
+include mingw-radiantdeps-Makefile.inc

diff --git a/mingw-Makefile.conf b/mingw-Makefile.conf
index a023aae138e75d9c8d1935fe892af42dbaf6018f..a1281826ba39584213eeaa49ef985d3f76590253 100644 (file)
--- a/mingw-Makefile.conf
+++ b/mingw-Makefile.conf
@@ -15,3 +15,4 @@ UNZIPPER ?= start $(RADIANT_DEPENDENCIES_PREFIX)/util/bin/unzip
 
 # use mingw32
 include mingw-Makefile.inc
+include mingw-radiantdeps-Makefile.inc

diff --git a/mingw-Makefile.inc b/mingw-Makefile.inc
index 32dc6b1b5994fdd0b94218e7c0d885833c45c92a..d72cfe2b8ce00f5944b4460da58765b19fef7e8a 100644 (file)
--- a/mingw-Makefile.inc
+++ b/mingw-Makefile.inc
@@ -1,22 +1,8 @@
 # how to call the mingw tools
 MINGW_EXEC_PREFIX ?=
 
-# where the dependencies package is extracted
-RADIANT_DEPENDENCIES_PREFIX = $(HOME)/netradiant-dependencies-mingw32/
-
-# run the prefix fixing tool
-IGNORETHIS := $(shell cd $(RADIANT_DEPENDENCIES_PREFIX) && ./fixprefix.sh)
-
 # set the environment for make
 OS = Win32
-CFLAGS +=
-CXXFLAGS +=
-CPPFLAGS += -I$(RADIANT_DEPENDENCIES_PREFIX)/radiantdeps/include
-LDFLAGS += -L$(RADIANT_DEPENDENCIES_PREFIX)/radiantdeps/lib
-CPPFLAGS += -I$(RADIANT_DEPENDENCIES_PREFIX)/gtk/include
-LDFLAGS += -L$(RADIANT_DEPENDENCIES_PREFIX)/gtk/lib
-PKG_CONFIG_PATH := $(RADIANT_DEPENDENCIES_PREFIX)/gtk/lib/pkgconfig:$(RADIANT_DEPENDENCIES_PREFIX)/radiantdeps/lib/pkgconfig:$(PKG_CONFIG_PATH)
-WHICHDLL = $(RADIANT_DEPENDENCIES_PREFIX)/whichdll.sh
 
 #CPPFLAGS_XML =
 #LIBS_XML = -lxml2

diff --git a/mingw-radiantdeps-Makefile.inc b/mingw-radiantdeps-Makefile.inc
new file mode 100644 (file)
index 0000000..82e750e
--- /dev/null
+++ b/mingw-radiantdeps-Makefile.inc
@@ -0,0 +1,15 @@
+# where the dependencies package is extracted
+RADIANT_DEPENDENCIES_PREFIX = $(HOME)/netradiant-dependencies-mingw32/
+
+# run the prefix fixing tool
+IGNORETHIS := $(shell cd $(RADIANT_DEPENDENCIES_PREFIX) && ./fixprefix.sh)
+
+# set the environment for make
+CFLAGS +=
+CXXFLAGS +=
+CPPFLAGS += -I$(RADIANT_DEPENDENCIES_PREFIX)/radiantdeps/include
+LDFLAGS += -L$(RADIANT_DEPENDENCIES_PREFIX)/radiantdeps/lib
+CPPFLAGS += -I$(RADIANT_DEPENDENCIES_PREFIX)/gtk/include
+LDFLAGS += -L$(RADIANT_DEPENDENCIES_PREFIX)/gtk/lib
+PKG_CONFIG_PATH := $(RADIANT_DEPENDENCIES_PREFIX)/gtk/lib/pkgconfig:$(RADIANT_DEPENDENCIES_PREFIX)/radiantdeps/lib/pkgconfig:$(PKG_CONFIG_PATH)
+WHICHDLL = $(RADIANT_DEPENDENCIES_PREFIX)/whichdll.sh