summaryrefslogtreecommitdiff
path: root/Makefile
diff options
context:
space:
mode:
authorZack Middleton <zturtleman@gmail.com>2011-08-02 21:03:14 +0000
committerTim Angus <tim@ngus.net>2013-01-10 23:23:32 +0000
commitfdfff533a049b69f65b4492b7accbc8d7c3d8307 (patch)
tree9da79c6e92c391ed36d5ddfc26214a42b49a393a /Makefile
parent851e05f1d57e95d5bb89a8f23d5c98802202076d (diff)
Change x86_64 to x64 for mingw.
Diffstat (limited to 'Makefile')
-rw-r--r--Makefile13
1 files changed, 8 insertions, 5 deletions
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