From: Rudolf Polzer <divverent@xonotic.org>
Date: Mon, 14 Jan 2013 10:52:27 +0000 (+0100)
Subject: split up mingw-Makefile.inc into mingw-Makefile.inc, mingw-radiantdeps-Makefile.inc
X-Git-Tag: xonotic-v0.7.0~10
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=23757210d141b8781de7548a1888c2251f2f6aaa;p=xonotic%2Fnetradiant.git

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

diff --git a/cross-Makefile.conf b/cross-Makefile.conf
index bf4ae3a8..caba2e6f 100644
--- 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 a023aae1..a1281826 100644
--- 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 32dc6b1b..d72cfe2b 100644
--- 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
index 00000000..82e750ee
--- /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