Merge remote-tracking branch 'ttimo/master'

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

diff --git a/mingw-Makefile.conf b/mingw-Makefile.conf
index e6c08904a1bc50377ee0993b8498366d5c08ca4d..a023aae138e75d9c8d1935fe892af42dbaf6018f 100644 (file)
--- a/mingw-Makefile.conf
+++ b/mingw-Makefile.conf
@@ -3,7 +3,15 @@
 # edit the paths in here
 
 # how to get pkg-config
-PKGCONFIG = $(RADIANT_DEPENDENCIES_PREFIX)/gtk/bin/pkg-config.exe
+PKGCONFIG ?= $(RADIANT_DEPENDENCIES_PREFIX)/gtk/bin/pkg-config.exe
+
+# extra utils
+GIT ?= $(RADIANT_DEPENDENCIES_PREFIX)/util/bin/git
+SVN ?= $(RADIANT_DEPENDENCIES_PREFIX)/util/bin/svn
+
+# 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
 
 # use mingw32
 include mingw-Makefile.inc