Merge branch 'gamepackdeps' into 'master'

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

diff --git a/cross-Makefile.conf b/cross-Makefile.conf
index f503195dce537fde7ef90f55a8f728557e94a44a..caba2e6ff2b059484c19e3aa6cce4fbbc822df99 100644 (file)
--- a/cross-Makefile.conf
+++ b/cross-Makefile.conf
@@ -3,26 +3,8 @@
 # edit the paths in here
 
 # how to call the mingw tools
-MINGW_EXEC_PREFIX = i586-mingw32msvc-
+MINGW_EXEC_PREFIX = i486-mingw32-
 
-# where the dependencies package is extracted
-RADIANT_DEPENDENCIES_PREFIX = $(HOME)/radiant-deps-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
-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
+# use mingw32
+include mingw-Makefile.inc
+include mingw-radiantdeps-Makefile.inc