X-Git-Url: http://git.xonotic.org/?a=blobdiff_plain;f=cross-Makefile.conf;h=2b44320d998e6a08251fdb76bbf3e68375f3dcbc;hb=e8f27310d6e17f99f55b4fc9184f5115c90e3ec7;hp=af371dc442305212330b7c2ab1a27684aa064bf1;hpb=57a896dd96d885b0a91e04823925a9c3f8e39d8c;p=xonotic%2Fnetradiant.git

diff --git a/cross-Makefile.conf b/cross-Makefile.conf
index af371dc4..2b44320d 100644
--- a/cross-Makefile.conf
+++ b/cross-Makefile.conf
@@ -5,23 +5,5 @@
 # how to call the mingw tools
 MINGW_EXEC_PREFIX = i586-mingw32msvc-
 
-# where the dependencies package is extracted
-RADIANT_DEPENDENCIES_PREFIX = $(HOME)/radiantdeps/
-
-# run the prefix fixing tool
-$(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
+# use mingw32
+include mingw-Makefile.inc