From fdfff533a049b69f65b4492b7accbc8d7c3d8307 Mon Sep 17 00:00:00 2001 From: Zack Middleton Date: Tue, 2 Aug 2011 21:03:14 +0000 Subject: Change x86_64 to x64 for mingw. --- Makefile | 13 ++++++++----- 1 file changed, 8 insertions(+), 5 deletions(-) (limited to 'Makefile') diff --git a/Makefile b/Makefile index b17ab36b..9de1d488 100644 --- a/Makefile +++ b/Makefile @@ -17,6 +17,12 @@ ifeq ($(COMPILE_PLATFORM),darwin) COMPILE_ARCH=$(shell uname -p | sed -e s/i.86/x86/) endif +ifeq ($(COMPILE_PLATFORM),mingw32) + ifeq ($(COMPILE_ARCH),x86_64) + COMPILE_ARCH=x64 + endif +endif + ifndef BUILD_STANDALONE BUILD_STANDALONE = endif @@ -630,7 +636,7 @@ ifeq ($(PLATFORM),freebsd) endif # cross-compiling tweaks - ifeq ($(ARCH),i386) + ifeq ($(ARCH),x86) ifeq ($(CROSS_COMPILING),1) BASE_CFLAGS += -m32 endif @@ -711,10 +717,7 @@ else # ifeq openbsd ifeq ($(PLATFORM),netbsd) - ifeq ($(shell uname -m),i386) - ARCH=x86 - endif - + ARCH=x86 LIBS=-lm SHLIBEXT=so SHLIBCFLAGS=-fPIC -- cgit