From: Kitae Kim <kt920.kim@samsung.com>
Date: Mon, 5 Nov 2012 02:58:59 +0000 (+0900)
Subject: codec: enable to build codec module on Mac.
X-Git-Tag: Tizen_Studio_1.3_Release_p2.3.1~1365
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=c015c4f8e4baa64dbe7daaf5dac8a27d1debc352;p=sdk%2Femulator%2Fqemu.git

codec: enable to build codec module on Mac.

Since gcc-4.7 patch for FFmpeg libs has been applied,
emulator does not need to disable codec module on Mac.

Signed-off-by: Kitae Kim <kt920.kim@samsung.com>
---

diff --git a/tizen/src/Makefile.tizen b/tizen/src/Makefile.tizen
index ede2c2968a..75b0c8def2 100755
--- a/tizen/src/Makefile.tizen
+++ b/tizen/src/Makefile.tizen
@@ -26,7 +26,7 @@ LIBS += -lavformat -lavcodec -lavutil -lm -lcurl -lGL -lXcomposite -lXext
 endif
 ifdef CONFIG_DARWIN
 # FIXME: disabled codec on Mac now
-# LIBS += -lavformat -lavcodec -lavutil -lm
+LIBS += -lavformat -lavcodec -lavutil -lm
 endif
 
 ifdef CONFIG_DEBUG_EXEC
@@ -108,8 +108,8 @@ include $(SRC_PATH)/tizen/src/Makefile.tizen.$(TARGET_BASE_ARCH)
 obj-y += maru_brightness.o
 obj-y += maru_usb_touchscreen.o maru_virtio_touchscreen.o
 obj-y += maru_virtio_keyboard.o
-ifndef CONFIG_DARWIN
 obj-y += maru_codec.o
+ifndef CONFIG_DARWIN
 obj-$(CONFIG_PCI) += maru_camera_common_pci.o
 obj-$(CONFIG_LINUX) += maru_camera_linux_pci.o
 obj-$(CONFIG_WIN32) += maru_camera_win32_pci.o
diff --git a/tizen/src/hw/maru_board.c b/tizen/src/hw/maru_board.c
index ff65e3759b..c65db902d6 100644
--- a/tizen/src/hw/maru_board.c
+++ b/tizen/src/hw/maru_board.c
@@ -331,13 +331,10 @@ static void maru_x86_machine_init(MemoryRegion *system_memory,
         pc_pci_device_init(pci_bus);
     }
 
-#ifndef CONFIG_DARWIN
     // maru specialized device init...
     if (pci_enabled) {
-        //tizen_ac97_init(pci_bus);
         codec_init(pci_bus);        
     }
-#endif
 #ifdef CONFIG_YAGL
     pci_create_simple(pci_bus, -1, "yagl");
 #endif