diff options
| -rw-r--r-- | Makefile.android | 12 | ||||
| -rw-r--r-- | Makefile.common | 21 | ||||
| -rw-r--r-- | Makefile.target | 8 |
3 files changed, 20 insertions, 21 deletions
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 diff --git a/Makefile.common b/Makefile.common index 51fcb85..233be48 100644 --- a/Makefile.common +++ b/Makefile.common @@ -139,11 +139,10 @@ $(call gen-hw-config-defs) $(call end-emulator-library) ## another for 64-bit -# NOTE: only linux in non-standalone mode is supported, because +# NOTE: only linux and darwin in non-standalone mode is supported, because # 1) For Windows: amd64-mingw32msvc-gcc doesn't work, see http://b/issue?id=5949152. -# 2) For MacOSX: 64-bit libSDL*.a 1.2.x depends on NSQuickDrawView doesn't exist -# 3) Standalone has --try-64 -ifeq ($(HOST_OS),linux) +# 2) Standalone has --try-64 +ifneq ($(filter linux darwin,$(HOST_OS)),) ifneq ($(BUILD_STANDALONE_EMULATOR),true) $(call start-emulator-library, emulator64-common) LOCAL_CFLAGS += $(common_LOCAL_CFLAGS) -m64 @@ -151,7 +150,7 @@ ifeq ($(HOST_OS),linux) $(call gen-hw-config-defs) $(call end-emulator-library) endif # BUILD_STANDALONE_EMULATOR == nil -endif # HOST_OS == linux +endif # HOST_OS == linux || darwin ############################################################################## ############################################################################## @@ -288,7 +287,7 @@ $(call end-emulator-library) ## another for 64-bit, see note in emulator64-common -ifeq ($(HOST_OS),linux) +ifneq ($(filter linux darwin,$(HOST_OS)),) ifneq ($(BUILD_STANDALONE_EMULATOR),true) $(call start-emulator-library, emulator64-libui) LOCAL_CFLAGS += $(common_LOCAL_CFLAGS) -m64 @@ -296,7 +295,7 @@ ifeq ($(HOST_OS),linux) $(call gen-hw-config-defs) $(call end-emulator-library) endif # BUILD_STANDALONE_EMULATOR == nil -endif # HOST_OS == linux +endif # HOST_OS == linux || darwin ############################################################################## @@ -612,7 +611,7 @@ $(call end-emulator-library) ## another for 64-bit, see note in emulator64-common -ifeq ($(HOST_OS),linux) +ifneq ($(filter linux darwin,$(HOST_OS)),) ifneq ($(BUILD_STANDALONE_EMULATOR),true) $(call start-emulator-library, emulator64-libqemu) # gdbstub-xml.c contains C-compilable arrays corresponding to the content @@ -632,7 +631,7 @@ ifeq ($(HOST_OS),linux) $(call gen-hw-config-defs) $(call end-emulator-library) endif # BUILD_STANDALONE_EMULATOR == nil -endif # HOST_OS == linux +endif # HOST_OS == linux || darwin # Block sources, we must compile them with each executable because they @@ -706,7 +705,7 @@ $(call end-emulator-library) ## another for 64-bit, see note in emulator64-common -ifeq ($(HOST_OS),linux) +ifneq ($(filter linux darwin,$(HOST_OS)),) ifneq ($(BUILD_STANDALONE_EMULATOR),true) $(call start-emulator-library, emulator64-libelff) LOCAL_CPP_EXTENSION := .cc @@ -714,7 +713,7 @@ ifeq ($(HOST_OS),linux) LOCAL_SRC_FILES += $(common_LOCAL_SRC_FILES) $(call end-emulator-library) endif # BUILD_STANDALONE_EMULATOR == nil -endif # HOST_OS == linux +endif # HOST_OS == linux || darwin ############################################################################## diff --git a/Makefile.target b/Makefile.target index 608761c..dcf9a80 100644 --- a/Makefile.target +++ b/Makefile.target @@ -281,7 +281,7 @@ $(call gen-hx-header,qemu-options.hx,qemu-options.def,os-posix.c os-win32.c) $(call end-emulator-library) ## another for 64-bit, see note in file Makefile.common emulator64-common -ifeq ($(HOST_OS),linux) +ifneq ($(filter linux darwin,$(HOST_OS)),) ifneq ($(BUILD_STANDALONE_EMULATOR),true) $(call start-emulator-library, emulator64-target-$(EMULATOR_TARGET_CPU)) LOCAL_CFLAGS += $(common_LOCAL_CFLAGS) -m64 @@ -290,7 +290,7 @@ ifeq ($(HOST_OS),linux) $(call gen-hx-header,qemu-options.hx,qemu-options.def,os-posix.c os-win32.c) $(call end-emulator-library) endif # BUILD_STANDALONE_EMULATOR == nil -endif # HOST_OS == linux +endif # HOST_OS == linux || darwin @@ -475,7 +475,7 @@ $(call end-emulator-program) ## another for 64-bit, see note in file Makefile.common emulator64-common -ifeq ($(HOST_OS),linux) +ifneq ($(filter linux darwin,$(HOST_OS)),) ifneq ($(BUILD_STANDALONE_EMULATOR),true) $(call start-emulator-program, emulator64-$(EMULATOR_TARGET_ARCH)) LOCAL_STATIC_LIBRARIES += \ @@ -493,5 +493,5 @@ ifeq ($(HOST_OS),linux) $(call gen-hw-config-defs) $(call end-emulator-program) endif # BUILD_STANDALONE_EMULATOR == nil -endif # HOST_OS == linux +endif # HOST_OS == linux || darwin |