X-Git-Url: http://git.xonotic.org/?a=blobdiff_plain;f=cross-Makefile.conf;h=f503195dce537fde7ef90f55a8f728557e94a44a;hb=015b27d7a1cdf2ddd8e5418fa328414ca8e77ca0;hp=af371dc442305212330b7c2ab1a27684aa064bf1;hpb=57a896dd96d885b0a91e04823925a9c3f8e39d8c;p=xonotic%2Fnetradiant.git diff --git a/cross-Makefile.conf b/cross-Makefile.conf index af371dc4..f503195d 100644 --- a/cross-Makefile.conf +++ b/cross-Makefile.conf @@ -6,10 +6,10 @@ MINGW_EXEC_PREFIX = i586-mingw32msvc- # where the dependencies package is extracted -RADIANT_DEPENDENCIES_PREFIX = $(HOME)/radiantdeps/ +RADIANT_DEPENDENCIES_PREFIX = $(HOME)/radiant-deps-mingw32/ # run the prefix fixing tool -$(shell cd $(RADIANT_DEPENDENCIES_PREFIX) && ./fixprefix.sh) +IGNORETHIS := $(shell cd $(RADIANT_DEPENDENCIES_PREFIX) && ./fixprefix.sh) # set the environment for make OS = Win32 @@ -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