update changelog; make the Makefile support a MAKEFILE_CONF parameter to not have...

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

diff --git a/cross-Makefile.conf b/cross-Makefile.conf
index 26fcdc652a3fd40179969d3d990737772fd600dd..dd4229a791b561584dbf433689800c6a51905490 100644 (file)
--- a/cross-Makefile.conf
+++ b/cross-Makefile.conf
@@ -3,10 +3,10 @@
 # edit the paths in here
 
 # how to call the mingw tools
-MINGW_EXEC_PREFIX = i586-mingw32msvc-
+MINGW_EXEC_PREFIX = i386-mingw32-
 
 # where the dependencies package is extracted
-RADIANT_DEPENDENCIES_PREFIX = $(HOME)/radiantdeps/
+RADIANT_DEPENDENCIES_PREFIX = /home/divverent/radiant-deps-mingw32/
 
 # run the prefix fixing tool
 IGNORETHIS := $(shell cd $(RADIANT_DEPENDENCIES_PREFIX) && ./fixprefix.sh)
@@ -25,3 +25,4 @@ CXX = $(MINGW_EXEC_PREFIX)g++
 LDD =
 RANLIB = $(MINGW_EXEC_PREFIX)ranlib
 AR = $(MINGW_EXEC_PREFIX)ar
+WINDRES = $(MINGW_EXEC_PREFIX)windres