split up mingw-Makefile.inc into mingw-Makefile.inc, mingw-radiantdep…

…s-Makefile.inc
fhomolka · Jan 14, 2013 · 2375721 · 2375721
1 parent 4b757e9
commit 2375721
Show file tree

Hide file tree

Showing 4 changed files with 17 additions and 14 deletions.
diff --git 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
@@ -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
@@ -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
@@ -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
Original file line number	Diff line number	Diff line change
Expand Up		@@ -7,3 +7,4 @@ MINGW_EXEC_PREFIX = i486-mingw32-

		# use mingw32
		include mingw-Makefile.inc
		include mingw-radiantdeps-Makefile.inc
Original file line number	Diff line number	Diff line change
Expand Up		@@ -15,3 +15,4 @@ UNZIPPER ?= start $(RADIANT_DEPENDENCIES_PREFIX)/util/bin/unzip

		# use mingw32
		include mingw-Makefile.inc
		include mingw-radiantdeps-Makefile.inc