diff options
| -rw-r--r-- | Makefile.android | 4 | ||||
| -rw-r--r-- | Makefile.common | 10 | ||||
| -rw-r--r-- | Makefile.target | 4 |
3 files changed, 15 insertions, 3 deletions
diff --git a/Makefile.android b/Makefile.android index 6fccf71..8116758 100644 --- a/Makefile.android +++ b/Makefile.android @@ -202,8 +202,8 @@ endif ifeq ($(HOST_OS),darwin) QEMU_SYSTEM_LDLIBS += -Wl,-framework,Cocoa,-framework,QTKit,-framework,CoreVideo - ifneq ($(filter 10.7 10.7.%,$(DARWIN_VERSION)),) - # Lion/XCode4 needs to be explicitly told the dynamic library + ifneq ($(filter 10.7 10.7.% 10.8 10.8.%,$(DARWIN_VERSION)),) + # Lion (and above) / XCode4 needs to be explicitly told the dynamic library # lookup symbols in the precompiled libSDL are resolved at # runtime QEMU_SYSTEM_LDLIBS += -undefined dynamic_lookup diff --git a/Makefile.common b/Makefile.common index f9d98af..3b37429 100644 --- a/Makefile.common +++ b/Makefile.common @@ -139,11 +139,12 @@ $(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 in non-standalone mode on 64-bit hosts 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) + ifeq ($(HOST_BITS),64) ifneq ($(BUILD_STANDALONE_EMULATOR),true) $(call start-emulator-library, emulator64-common) LOCAL_CFLAGS += $(common_LOCAL_CFLAGS) -m64 @@ -151,6 +152,7 @@ ifeq ($(HOST_OS),linux) $(call gen-hw-config-defs) $(call end-emulator-library) endif # BUILD_STANDALONE_EMULATOR == nil + endif # HOST_BITS == 64 endif # HOST_OS == linux ############################################################################## @@ -295,6 +297,7 @@ $(call end-emulator-library) ## another for 64-bit, see note in emulator64-common ifeq ($(HOST_OS),linux) + ifeq ($(HOST_BITS),64) ifneq ($(BUILD_STANDALONE_EMULATOR),true) $(call start-emulator-library, emulator64-libui) LOCAL_CFLAGS += $(common_LOCAL_CFLAGS) -m64 @@ -302,6 +305,7 @@ ifeq ($(HOST_OS),linux) $(call gen-hw-config-defs) $(call end-emulator-library) endif # BUILD_STANDALONE_EMULATOR == nil + endif # HOST_BITS == 64 endif # HOST_OS == linux @@ -620,6 +624,7 @@ $(call end-emulator-library) ## another for 64-bit, see note in emulator64-common ifeq ($(HOST_OS),linux) + ifeq ($(HOST_BITS),64) ifneq ($(BUILD_STANDALONE_EMULATOR),true) $(call start-emulator-library, emulator64-libqemu) # gdbstub-xml.c contains C-compilable arrays corresponding to the content @@ -639,6 +644,7 @@ ifeq ($(HOST_OS),linux) $(call gen-hw-config-defs) $(call end-emulator-library) endif # BUILD_STANDALONE_EMULATOR == nil + endif # HOST_BITS == 64 endif # HOST_OS == linux @@ -714,6 +720,7 @@ $(call end-emulator-library) ## another for 64-bit, see note in emulator64-common ifeq ($(HOST_OS),linux) + ifeq ($(HOST_BITS),64) ifneq ($(BUILD_STANDALONE_EMULATOR),true) $(call start-emulator-library, emulator64-libelff) LOCAL_CPP_EXTENSION := .cc @@ -721,6 +728,7 @@ ifeq ($(HOST_OS),linux) LOCAL_SRC_FILES += $(common_LOCAL_SRC_FILES) $(call end-emulator-library) endif # BUILD_STANDALONE_EMULATOR == nil + endif # HOST_BITS == 64 endif # HOST_OS == linux diff --git a/Makefile.target b/Makefile.target index 1961acf..916ab21 100644 --- a/Makefile.target +++ b/Makefile.target @@ -247,6 +247,7 @@ $(call end-emulator-library) ## another for 64-bit, see note in file Makefile.common emulator64-common ifeq ($(HOST_OS),linux) + ifeq ($(HOST_BITS),64) ifneq ($(BUILD_STANDALONE_EMULATOR),true) $(call start-emulator-library, emulator64-target-$(EMULATOR_TARGET_CPU)) LOCAL_CFLAGS += $(common_LOCAL_CFLAGS) -m64 @@ -255,6 +256,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_BITS == 64 endif # HOST_OS == linux @@ -434,6 +436,7 @@ $(call end-emulator-program) ## another for 64-bit, see note in file Makefile.common emulator64-common ifeq ($(HOST_OS),linux) + ifeq ($(HOST_BITS),64) ifneq ($(BUILD_STANDALONE_EMULATOR),true) $(call start-emulator-program, emulator64-$(EMULATOR_TARGET_ARCH)) LOCAL_STATIC_LIBRARIES += \ @@ -451,4 +454,5 @@ ifeq ($(HOST_OS),linux) $(call gen-hw-config-defs) $(call end-emulator-program) endif # BUILD_STANDALONE_EMULATOR == nil + endif # HOST_BITS == 64 endif # HOST_OS == linux |