diff options
| author | Vladimir Chtchetkine <vchtchetkine@google.com> | 2012-01-31 16:21:06 -0800 |
|---|---|---|
| committer | Vladimir Chtchetkine <vchtchetkine@google.com> | 2012-02-01 07:03:32 -0800 |
| commit | 70a18cd874a22452aca9e39e22275ed4538ed20b (patch) | |
| tree | f67e6501f8d1195147a57a93230ed61fe7525b2a /Makefile.common | |
| parent | 34f234393256163101b05c41ee4676bc68b57c65 (diff) | |
| download | external_qemu-70a18cd874a22452aca9e39e22275ed4538ed20b.zip external_qemu-70a18cd874a22452aca9e39e22275ed4538ed20b.tar.gz external_qemu-70a18cd874a22452aca9e39e22275ed4538ed20b.tar.bz2 | |
Include JPEG compression / decompression library into emulator build
We are going to need JPEG compression for transferring emulator's framebuffers to
the multi-touch supporting application running on an android device. The source
for JPEG compressor has been copied over from external/jpeg
To that I've added distrib/jpeg-6b/sources.make containing build instruction for
JPEG compressor. That file gets included into Makefile.common to compile JPEG
compressor sources along with the emulator sources.
Change-Id: I7bfccb7a10f873f90edabab5d3b1b2ca4dd57449
Diffstat (limited to 'Makefile.common')
| -rw-r--r-- | Makefile.common | 12 |
1 files changed, 12 insertions, 0 deletions
diff --git a/Makefile.common b/Makefile.common index 4a711c6..8b98df8 100644 --- a/Makefile.common +++ b/Makefile.common @@ -280,6 +280,18 @@ EMULATOR_LIBQEMU_CFLAGS := 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) + +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 := |