From 83df59cef8e9bb631efec48c8baedce1647e90c1 Mon Sep 17 00:00:00 2001 From: Andrew Hsieh Date: Tue, 24 Jul 2012 16:06:28 -0700 Subject: Enable 64-bit emulator for MacOSX host 64-bit emulator can now be enabled for MacOSX host because the newly upgraded sdl-1.2.15 no longer depends on NSQuickDrawView lacking 64-bit implementation. Also rename makefile variable MSDK to OSX_VERSION Change-Id: Ia36863f7708d281f90f5fa40a1507b52b1b68a79 --- Makefile.android | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) (limited to 'Makefile.android') diff --git a/Makefile.android b/Makefile.android index 0441652..817c562 100644 --- a/Makefile.android +++ b/Makefile.android @@ -84,18 +84,18 @@ ifeq ($(HOST_OS),darwin) endif ifneq ($(filter 10.5 10.5.% 10.6 10.6.%,$(DARWIN_VERSION)),) # We are on Leopard or Snow Leopard - MSDK=10.5 + OSX_VERSION=10.5 else # We are on Lion or beyond, and 10.6 SDK is the minimum in Xcode 4.x - MSDK=10.6 + OSX_VERSION=10.6 endif - MACOSX_SDK := /Developer/SDKs/MacOSX$(MSDK).sdk + MACOSX_SDK := /Developer/SDKs/MacOSX$(OSX_VERSION).sdk ifeq ($(strip $(wildcard $(MACOSX_SDK))),) - $(info Please install the $(MSDK) SDK on this machine at $(MACOSX_SDK)) + $(info Please install the $(OSX_VERSION) SDK on this machine at $(MACOSX_SDK)) $(error Aborting the build.) endif - MY_CFLAGS += -isysroot $(MACOSX_SDK) -mmacosx-version-min=$(MSDK) -DMACOSX_DEPLOYMENT_TARGET=$(MSDK) - MY_LDLIBS += -isysroot $(MACOSX_SDK) -Wl,-syslibroot,$(MACOSX_SDK) -mmacosx-version-min=$(MSDK) + MY_CFLAGS += -isysroot $(MACOSX_SDK) -mmacosx-version-min=$(OSX_VERSION) -DMACOSX_DEPLOYMENT_TARGET=$(OSX_VERSION) + MY_LDLIBS += -isysroot $(MACOSX_SDK) -Wl,-syslibroot,$(MACOSX_SDK) -mmacosx-version-min=$(OSX_VERSION) endif # BUILD_STANDALONE_EMULATOR is only defined when building with -- cgit v1.1