diff options
| author | Sangho Park <sangho1206.park@samsung.com> | 2014-03-28 02:19:27 -0700 |
|---|---|---|
| committer | Gerrit Code Review <gerrit@review.vlan103.tizen.org> | 2014-03-28 02:19:27 -0700 |
| commit | 648717ee3aa015c895930871876682d555fecdaa (patch) | |
| tree | 69a5b23158d5308cfc3fbf6cd04094b50c551e5f /tizen | |
| parent | 2c9176bba2032db0705171529204392d4bcac37f (diff) | |
| parent | 6f623fec184fdfbe14d4322022947d1ca15b503d (diff) | |
| download | qemu-648717ee3aa015c895930871876682d555fecdaa.tar.gz qemu-648717ee3aa015c895930871876682d555fecdaa.tar.bz2 qemu-648717ee3aa015c895930871876682d555fecdaa.zip | |
Merge "configure: add enable-libav option" into tizen
Diffstat (limited to 'tizen')
| -rw-r--r-- | tizen/src/Makefile | 9 | ||||
| -rw-r--r-- | tizen/src/Makefile.tizen | 5 | ||||
| -rw-r--r-- | tizen/src/hw/maru_board.c | 4 |
3 files changed, 7 insertions, 11 deletions
diff --git a/tizen/src/Makefile b/tizen/src/Makefile index e846aa5ea2..31241337fa 100644 --- a/tizen/src/Makefile +++ b/tizen/src/Makefile @@ -98,7 +98,6 @@ install: all # resources and jar for skin cp -pP skin/client/emulator-skin.jar $(EMUL_DIR)/bin - cp -pP skin/client/lib/swt.jar $(EMUL_DIR)/bin cp -pPR skin/client/skins $(EMUL_DIR) ifndef CONFIG_USE_SHM cp -pP skin/client/resource/images/blank-guide.png $(EMUL_DIR)/images @@ -157,10 +156,6 @@ ifdef CONFIG_DARWIN install_name_tool -change /opt/local/lib/libncurses.5.dylib @loader_path/libncurses.5.dylib $(EMUL_DIR)/bin/emulator-x86 ;\ install_name_tool -change /opt/local/lib/libcurl.4.dylib @loader_path/libcurl.4.dylib $(EMUL_DIR)/bin/emulator-x86 ;\ install_name_tool -change /opt/local/lib/libpixman-1.0.dylib @loader_path/libpixman-1.0.dylib $(EMUL_DIR)/bin/emulator-x86 ;\ - install_name_tool -change .//lib/libavformat-emul.54.dylib @loader_path/libavformat-emul.54.dylib $(EMUL_DIR)/bin/emulator-x86 ;\ - install_name_tool -change .//lib/libavcodec-emul.54.dylib @loader_path/libavcodec-emul.54.dylib $(EMUL_DIR)/bin/emulator-x86 ;\ - install_name_tool -change .//lib/libavresample-emul.1.dylib @loader_path/libavresample-emul.1.dylib $(EMUL_DIR)/bin/emulator-x86 ;\ - install_name_tool -change .//lib/libavutil-emul.52.dylib @loader_path/libavutil-emul.52.dylib $(EMUL_DIR)/bin/emulator-x86 ;\ ;; \ arm-softmmu) \ ;; \ @@ -265,10 +260,6 @@ ifdef CONFIG_DARWIN install_name_tool -change /opt/local/lib/libncurses.5.dylib @loader_path/libncurses.5.dylib $(DIBS_X86_DIR)/bin/emulator-x86 ;\ install_name_tool -change /opt/local/lib/libcurl.4.dylib @loader_path/libcurl.4.dylib $(DIBS_X86_DIR)/bin/emulator-x86 ;\ install_name_tool -change /opt/local/lib/libpixman-1.0.dylib @loader_path/libpixman-1.0.dylib $(DIBS_X86_DIR)/bin/emulator-x86 ;\ - install_name_tool -change .//lib/libavformat-emul.54.dylib @loader_path/libavformat-emul.54.dylib $(DIBS_X86_DIR)/bin/emulator-x86 ;\ - install_name_tool -change .//lib/libavcodec-emul.54.dylib @loader_path/libavcodec-emul.54.dylib $(DIBS_X86_DIR)/bin/emulator-x86 ;\ - install_name_tool -change .//lib/libavresample-emul.1.dylib @loader_path/libavresample-emul.1.dylib $(DIBS_X86_DIR)/bin/emulator-x86 ;\ - install_name_tool -change .//lib/libavutil-emul.52.dylib @loader_path/libavutil-emul.52.dylib $(DIBS_X86_DIR)/bin/emulator-x86 ;\ ;; \ arm-softmmu) \ ;; \ diff --git a/tizen/src/Makefile.tizen b/tizen/src/Makefile.tizen index a2a4dd1fa2..ff9d6e54f7 100644 --- a/tizen/src/Makefile.tizen +++ b/tizen/src/Makefile.tizen @@ -18,7 +18,7 @@ CFLAGS += -g -O0 endif # codec -LIBS+= -lavformat-emul -lavcodec-emul -lavresample-emul -lavutil-emul +#LIBS+= -lavformat-emul -lavcodec-emul -lavresample-emul -lavutil-emul ifdef CONFIG_WIN32 LIBS += -lcurl -lopengl32 -lglu32 -lgdi32 -lpng14 @@ -122,7 +122,8 @@ obj-y += maru_virtio_nfc.o obj-y += maru_virtio_jack.o obj-y += maru_virtio_power.o obj-y += maru_virtio_esm.o -obj-y += maru_brill_codec.o +#obj-y += maru_brill_codec.o +obj-$(CONFIG_LIBAV) += maru_brill_codec.o obj-$(CONFIG_PCI) += maru_camera_common_pci.o obj-$(CONFIG_LINUX) += maru_camera_linux_pci.o diff --git a/tizen/src/hw/maru_board.c b/tizen/src/hw/maru_board.c index d3d6d1b5b5..7635aaeff9 100644 --- a/tizen/src/hw/maru_board.c +++ b/tizen/src/hw/maru_board.c @@ -84,7 +84,9 @@ extern int enable_spice; #define MAX_IDE_BUS 2 +#if defined(CONFIG_LIBAV) int maru_brill_codec_pci_device_init(PCIBus *bus); +#endif static const int ide_iobase[MAX_IDE_BUS] = { 0x1f0, 0x170 }; static const int ide_iobase2[MAX_IDE_BUS] = { 0x3f6, 0x376 }; @@ -119,7 +121,9 @@ static void maru_device_init(void) pci_maru_overlay_init(pci_bus); pci_maru_brightness_init(pci_bus); +#if defined(CONFIG_LIBAV) maru_brill_codec_pci_device_init(pci_bus); +#endif if (enable_vigs || enable_yagl) { render_queue = work_queue_create(); |