Merge remote-tracking branch 'score/develop' into tizen-arm

diff --cc Makefile.target
index 8f52874,14573b6..03d1bfe
--- 1/Makefile.target
--- 2/Makefile.target
+++ b/Makefile.target
@@@ -205,11 -218,22 +205,16 @@@ QEMU_CFLAGS += $(VNC_PNG_CFLAGS
  obj-$(CONFIG_XEN) += xen-all.o xen_machine_pv.o xen_domainbuild.o xen-mapcache.o
  obj-$(CONFIG_NO_XEN) += xen-stub.o
  
 -obj-i386-$(CONFIG_XEN) += xen_platform.o
 -
 +obj-i386-$(CONFIG_XEN) += xen_platform.o xen_apic.o
  
  # HAX support
 -ifeq ($(TARGET_ARCH), i386)
 -ifdef CONFIG_WIN32
 -obj-$(CONFIG_HAX) += \
 -      hax-all.o       \
 -      hax-windows.o
 -endif
 +obj-$(CONFIG_HAX) += hax-all.o hax-windows.o
 +obj-$(CONFIG_NO_HAX) += hax-stub.o
+ ifdef CONFIG_DARWIN
+ obj-$(CONFIG_HAX) += \
+         hax-all.o       \
+         hax-darwin.o
+ endif
 -endif
  
  # Inter-VM PCI shared memory
  CONFIG_IVSHMEM =

diff --cc input.c
Simple merge

diff --cc tizen/emulator_configure.sh
index 0692357,622a00c..a98eabd
--- 1/tizen/emulator_configure.sh
--- 2/tizen/emulator_configure.sh
+++ b/tizen/emulator_configure.sh
@@@ -69,7 -75,9 +69,8 @@@ echo "##### QEMU configure for emulator
   --enable-mixemu \
   --audio-card-list=ac97 \
   --enable-maru \
+  --enable-hax \
   --disable-vnc \
 - --disable-sdl \
 - --disable-gl
 + --disable-sdl $1
  ;;
  esac

diff --cc tizen/src/Makefile
index 23d4c69,0b25511..7bbc5a7
--- 1/tizen/src/Makefile
--- 2/tizen/src/Makefile
+++ b/tizen/src/Makefile
@@@ -8,18 -8,7 +8,17 @@@ config-host.mak
        @exit 1
  endif
  
 +export CONFIG_OPENGLES
 +
 +ifdef CONFIG_OPENGLES
 +ifdef CONFIG_WIN32
 +GLESLIBS_LIST:=$(wildcard ../../arm-softmmu/*.dll)
 +else
 +GLESLIBS_LIST:=$(wildcard ../../arm-softmmu/lib*)
 +endif
 +endif
 +
  all: qemu skin_client
- 
  qemu: build_info ffmpeg_install check_hax
        cd ../../ && $(MAKE)
  qemu_clean:
@@@ -117,9 -62,10 +118,16 @@@ endi
        cp skin/client/emulator-skin.jar $(EMUL_DIR)/bin
  ifdef CONFIG_WIN32
        cp check-hax.exe $(EMUL_DIR)/bin
-       
+ endif
+ ifdef CONFIG_DARWIN
+       cp check-hax $(EMUL_DIR)/bin
+ endif
++ifdef CONFIG_LINUX
++      cp -pPr ../distrib/initscript/tizen-kvm $(EMUL_DIR)/etc
++      cp -pPr ../distrib/initscript/45-tizen-kvm.rules $(EMUL_DIR)/etc
 +else
++
 +endif
  
  ifndef CONFIG_DARWIN
        cp ../../qemu-img $(EMUL_DIR)/bin
@@@ -129,10 -79,22 +137,11 @@@
  else
        cp ../../qemu-img $(EMUL_DIR)/bin
        cp -pPR ../license $(EMUL_DIR)
 -      cp -pPR ../../pc-bios/bios.bin $(EMUL_DIR)/data/bios
 -      cp -pPR ../../pc-bios/linuxboot.bin $(EMUL_DIR)/data/bios
 -      cp -pPR ../../pc-bios/pxe-rtl8139.rom $(EMUL_DIR)/data/bios
 -      cp -pPR ../../pc-bios/pxe-virtio.rom $(EMUL_DIR)/data/bios
        cp skin/client/lib/swt.jar $(EMUL_DIR)/bin/swt.jar
        cp -pPR skin/client/skins $(EMUL_DIR)
+       cp -pPR skin/client/native_src/libshared.dylib $(EMUL_DIR)/bin
  endif
  
 -ifdef CONFIG_LINUX
 -      cp -pPr ../distrib/initscript/tizen-kvm $(EMUL_DIR)/etc
 -      cp -pPr ../distrib/initscript/45-tizen-kvm.rules $(EMUL_DIR)/etc
 -else
 -
 -endif
 -
  # for dibs system...
  all_dibs: qemu skin_client_dibs
  skin_client_dibs:
@@@ -196,15 -111,29 +205,21 @@@ ifdef CONFIG_WIN3
  else
        
  endif
++ifdef CONFIG_LINUX
++      echo "Copying tizen-kvm to $(EMUL_DIR)/etc"
++      cp -pPr ../distrib/initscript/tizen-kvm $(EMUL_DIR)/etc
++      cp -pPr ../distrib/initscript/45-tizen-kvm.rules $(EMUL_DIR)/etc
++else
++
++endif
  
  ifndef CONFIG_DARWIN
        cp ../../qemu-img $(EMUL_DIR)/bin
        cp -dpr ../license $(EMUL_DIR)
-       cp skin/client/lib/swt.jar $(EMUL_DIR)/bin/swt.jar
 -      cp -dpr ../../pc-bios/bios.bin $(EMUL_DIR)/data/bios
 -      cp -dpr ../../pc-bios/linuxboot.bin $(EMUL_DIR)/data/bios
 -      cp -dpr ../../pc-bios/pxe-rtl8139.rom $(EMUL_DIR)/data/bios
 -      cp -dpr ../../pc-bios/pxe-virtio.rom $(EMUL_DIR)/data/bios
        cp -dpr skin/client/skins $(EMUL_DIR)
  else
        cp ../../qemu-img $(EMUL_DIR)/bin
        cp -pPR ../license $(EMUL_DIR)
-       cp skin/client/lib/swt.jar $(EMUL_DIR)/bin/swt.jar
 -      cp -pPR ../../pc-bios/bios.bin $(EMUL_DIR)/data/bios
 -      cp -pPR ../../pc-bios/linuxboot.bin $(EMUL_DIR)/data/bios
 -      cp -pPR ../../pc-bios/pxe-rtl8139.rom $(EMUL_DIR)/data/bios
 -      cp -pPR ../../pc-bios/pxe-virtio.rom $(EMUL_DIR)/data/bios
        cp -pPR skin/client/skins $(EMUL_DIR)
+       cp -pPR skin/client/native_src/libshared.dylib $(EMUL_DIR)/bin
  endif
 -
 -ifdef CONFIG_LINUX
 -      cp -pPr ../distrib/initscript/tizen-kvm $(EMUL_DIR)/etc
 -      cp -pPr ../distrib/initscript/45-tizen-kvm.rules $(EMUL_DIR)/etc
 -else
 -
 -endif

diff --cc tizen/src/Makefile.tizen
index 7f00bbe,d4596c9..6c69d10
--- 1/tizen/src/Makefile.tizen
--- 2/tizen/src/Makefile.tizen
+++ b/tizen/src/Makefile.tizen
@@@ -9,11 -9,10 +9,14 @@@ QEMU_CFLAGS += -I$(SRC_PATH)/tizen/dist
  QEMU_CFLAGS += -L$(SRC_PATH)/tizen/distrib/libav/$(ARCH)/lib
  QEMU_CFLAGS += $(SDL_CFLAGS)
  QEMU_CFLAGS += $(GLIB_CFLAGS)
+ ifdef CONFIG_DARWIN
+ QEMU_CFLAGS += -framework Foundation -framework SystemConfiguration
+ endif
 +ifndef CONFIG_DEBUG_EXEC
  CFLAGS += -g -O2
 +else
 +CFLAGS += -g -O0
 +endif
  
  ifdef CONFIG_WIN32
  LIBS += -lavformat -lavcodec -lavutil -lm -lcurl -lopengl32 -lglu32 -lgdi32

diff --cc tizen/src/hw/maru_camera_linux_pci.c
Simple merge

diff --cc tizen/src/skin/client/src/org/tizen/emulator/skin/EmulatorSkin.java
Simple merge

diff --cc tizen/src/skin/maruskin_operation.c
Simple merge

diff --cc tizen/src/skin/maruskin_server.c
Simple merge

diff --cc vl.c
Simple merge