Merge branch 'transfilterfix' into 'master'

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

diff --git a/mingw-Makefile.inc b/mingw-Makefile.inc
index 0710fe150649a76ece70fa00034046b958c7a0a6..d72cfe2b8ce00f5944b4460da58765b19fef7e8a 100644 (file)
--- a/mingw-Makefile.inc
+++ b/mingw-Makefile.inc
@@ -1,22 +1,8 @@
 # how to call the mingw tools
 MINGW_EXEC_PREFIX ?=
 
-# 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
-CPPFLAGS += -I$(RADIANT_DEPENDENCIES_PREFIX)/gtk/include
-LDFLAGS += -L$(RADIANT_DEPENDENCIES_PREFIX)/gtk/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
 
 #CPPFLAGS_XML =
 #LIBS_XML = -lxml2