From 089f40b8e6f12ebf11e7dcb9640b4f6cea58ca31 Mon Sep 17 00:00:00 2001 From: Lance Date: Wed, 24 Oct 2012 12:49:23 +0000 Subject: [PATCH] Prefer the stable MinGW 64bit compiler over the experimental one. git-svn-id: https://svn.code.sf.net/p/fteqw/code/trunk@4143 fc73d0e0-1445-4013-8a0c-d673dee63da5 --- engine/Makefile | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/engine/Makefile b/engine/Makefile index 91cb0f822..a04365ae5 100644 --- a/engine/Makefile +++ b/engine/Makefile @@ -39,18 +39,18 @@ endif ifeq ($(FTE_TARGET),win64) ifeq ($(shell $(CC) -v 2>&1 | grep mingw),) #CC didn't state that it was mingw... so try fixing that up - ifneq ($(shell which amd64-mingw32msvc-gcc 2> /dev/null),) - #yup, the alternative exists (this matches the one debian has) - CC=amd64-mingw32msvc-gcc -m64 - WINDRES=amd64-mingw32msvc-windres - STRIP=amd64-mingw32msvc-strip -# BITS=64 - endif ifneq ($(shell which x86_64-w64-mingw32-gcc 2> /dev/null),) #yup, the alternative exists (this matches the one debian has) CC=x86_64-w64-mingw32-gcc -m64 WINDRES=x86_64-w64-mingw32-windres STRIP=x86_64-w64-mingw32-strip +# BITS=64 + endif + ifneq ($(shell which amd64-mingw32msvc-gcc 2> /dev/null),) + #yup, the alternative exists (this matches the one debian has) + CC=amd64-mingw32msvc-gcc -m64 + WINDRES=amd64-mingw32msvc-windres + STRIP=amd64-mingw32msvc-strip # BITS=64 endif endif