diff options
| author | Andrew Hsieh <andrewhsieh@google.com> | 2012-08-23 02:28:22 -0700 |
|---|---|---|
| committer | android code review <noreply-gerritcodereview@google.com> | 2012-08-23 02:28:22 -0700 |
| commit | 1ffbb6b1f80ccd557080b4e91b35e18b97f981e6 (patch) | |
| tree | ab9801e19c6acc57865c8a7891092b0a0f5743ce /Makefile.common | |
| parent | 08c435499f131d82b5d887dd836cfddbc3384f4c (diff) | |
| parent | 33da99a33cab75287d483c2602bb2e40b34b666a (diff) | |
| download | external_qemu-1ffbb6b1f80ccd557080b4e91b35e18b97f981e6.zip external_qemu-1ffbb6b1f80ccd557080b4e91b35e18b97f981e6.tar.gz external_qemu-1ffbb6b1f80ccd557080b4e91b35e18b97f981e6.tar.bz2 | |
Merge "Fix double optimization on buildsystem for emulator"
Diffstat (limited to 'Makefile.common')
| -rw-r--r-- | Makefile.common | 54 |
1 files changed, 41 insertions, 13 deletions
diff --git a/Makefile.common b/Makefile.common index 233be48..cbb22e5 100644 --- a/Makefile.common +++ b/Makefile.common @@ -314,18 +314,6 @@ EMULATOR_LIBQEMU_CFLAGS := common_LOCAL_CFLAGS += $(EMULATOR_COMMON_CFLAGS) -########################################################### -# Jpeg configuration -# -LIBJPEG_DIR := distrib/jpeg-6b -include $(LOCAL_PATH)/$(LIBJPEG_DIR)/sources.make - -EMULATOR_LIBQEMU_CFLAGS += \ - $(LIBJPEG_CFLAGS) \ - -I$(LOCAL_PATH)/$(LIBJPEG_DIR) - -common_LOCAL_SRC_FILES += $(LIBJPEG_SOURCES) - AUDIO_SOURCES := noaudio.c wavaudio.c wavcapture.c mixeng.c AUDIO_CFLAGS := -I$(LOCAL_PATH)/audio -DHAS_AUDIO AUDIO_LDLIBS := @@ -517,7 +505,7 @@ endif common_LOCAL_SRC_FILES += $(CORE_MISC_SOURCES) # Required -common_LOCAL_CFLAGS += -D_XOPEN_SOURCE=600 -D_BSD_SOURCE=1 +common_LOCAL_CFLAGS += -D_XOPEN_SOURCE=600 -D_BSD_SOURCE=1 -I$(LOCAL_PATH)/distrib/jpeg-6b SLIRP_SOURCES := \ bootp.c \ @@ -664,6 +652,46 @@ endif BLOCK_CFLAGS += $(EMULATOR_COMMON_CFLAGS) BLOCK_CFLAGS += -DCONFIG_BDRV_WHITELIST="" +############################################################################## +############################################################################## +### +### emulator-libjpeg: TARGET-INDEPENDENT QEMU FUNCTIONS +### +### THESE ARE USED BY EVERYTHING EXCEPT 'emulator-ui' +### + +common_LOCAL_CFLAGS = +common_LOCAL_SRC_FILES = + +########################################################### +# Jpeg configuration +# +LIBJPEG_DIR := distrib/jpeg-6b +include $(LOCAL_PATH)/$(LIBJPEG_DIR)/sources.make + +common_LOCAL_SRC_FILES += $(LIBJPEG_SOURCES) + +common_LOCAL_CFLAGS += \ + $(LIBJPEG_CFLAGS) \ + -I$(LOCAL_PATH)/$(LIBJPEG_DIR) + +## one for 32-bit +$(call start-emulator-library, emulator-libjpeg) +LOCAL_CFLAGS += $(common_LOCAL_CFLAGS) +LOCAL_SRC_FILES += $(common_LOCAL_SRC_FILES) +$(call end-emulator-library) + + +## another for 64-bit, see note in emulator64-common +ifeq ($(HOST_OS),linux) + ifneq ($(BUILD_STANDALONE_EMULATOR),true) + $(call start-emulator-library, emulator64-libjpeg) + LOCAL_CFLAGS += $(common_LOCAL_CFLAGS) -m64 + LOCAL_SRC_FILES += $(common_LOCAL_SRC_FILES) + $(call end-emulator-library) + endif # BUILD_STANDALONE_EMULATOR == nil +endif # HOST_OS == linux + ############################################################################## ############################################################################## |