Merge branch 'iqmmodel' into 'master'

[xonotic/netradiant.git] / mingw-Makefile.conf

diff --git a/mingw-Makefile.conf b/mingw-Makefile.conf
index 652421aca0f0f2f82b0ab326e1738434b097d049..a1281826ba39584213eeaa49ef985d3f76590253 100644 (file)
--- a/mingw-Makefile.conf
+++ b/mingw-Makefile.conf
@@ -2,28 +2,17 @@
 # copy this file to Makefile.conf
 # edit the paths in here
 
-# how to call the mingw tools
-MINGW_EXEC_PREFIX = 
+# how to get pkg-config
+PKGCONFIG ?= $(RADIANT_DEPENDENCIES_PREFIX)/gtk/bin/pkg-config.exe
 
-# where the dependencies package is extracted
-RADIANT_DEPENDENCIES_PREFIX = /c/mingw/radiant-deps-mingw32/
+# extra utils
+GIT ?= $(RADIANT_DEPENDENCIES_PREFIX)/util/bin/git
+SVN ?= $(RADIANT_DEPENDENCIES_PREFIX)/util/bin/svn
 
-# run the prefix fixing tool
-IGNORETHIS := $(shell cd $(RADIANT_DEPENDENCIES_PREFIX) && ./fixprefix.sh)
+# these two need the "start" workaround, or they seem to crash (TODO figure out why)
+WGET ?= start $(RADIANT_DEPENDENCIES_PREFIX)/util/bin/wget
+UNZIPPER ?= start $(RADIANT_DEPENDENCIES_PREFIX)/util/bin/unzip
 
-# set the environment for make
-OS = Win32
-CFLAGS +=
-CXXFLAGS +=
-CPPFLAGS += -I$(RADIANT_DEPENDENCIES_PREFIX)/radiantdeps/include
-LDFLAGS += -L$(RADIANT_DEPENDENCIES_PREFIX)/radiantdeps/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
-
-CC = $(MINGW_EXEC_PREFIX)gcc
-CXX = $(MINGW_EXEC_PREFIX)g++
-LDD =
-RANLIB = $(MINGW_EXEC_PREFIX)ranlib
-AR = $(MINGW_EXEC_PREFIX)ar
-WINDRES = $(MINGW_EXEC_PREFIX)windres
-PKGCONFIG = $(RADIANT_DEPENDENCIES_PREFIX)/gtk/bin/pkg-config
+# use mingw32
+include mingw-Makefile.inc
+include mingw-radiantdeps-Makefile.inc