From: Evgeny Voevodin <e.voevodin@samsung.com>
Date: Wed, 17 Oct 2012 09:14:14 +0000 (+0400)
Subject: Merge branch 'tizen-arm' of http://121.133.176.49/review/p/sdk/emulator/qemu into... 
X-Git-Tag: Tizen_Studio_1.3_Release_p2.3.1~1405^2~2
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=09d0daa33ba91c8a8417e6a4da4410bdb46f55c8;p=sdk%2Femulator%2Fqemu.git

Merge branch 'tizen-arm' of 121.133.176.49/review/p/sdk/emulator/qemu into tizen-arm

Conflicts:
	tizen/emulator_configure.sh

Signed-off-by: Evgeny Voevodin <e.voevodin@samsung.com>
---

09d0daa33ba91c8a8417e6a4da4410bdb46f55c8
diff --cc tizen/emulator_configure.sh
index ad9f6d3aa8,e7a09af1ad..0ab2a4c445
--- a/tizen/emulator_configure.sh
+++ b/tizen/emulator_configure.sh
@@@ -268,10 -65,10 +268,11 @@@ cd ../.
  
  cd ..
  echo ""
 -echo "##### QEMU configure for emulator"
 +echo "##### QEMU configuring for emulator"
 +echo "##### QEMU configure append:" $CONFIGURE_APPEND
  ./configure \
 + $CONFIGURE_APPEND \
+  --extra-cflags=-mmacosx-version-min=10.4 \
 - --target-list=i386-softmmu \
   --audio-drv-list=coreaudio \
   --enable-mixemu \
   --audio-card-list=ac97 \