From: Jihye Won Date: Thu, 18 Jun 2015 07:33:51 +0000 (+0900) Subject: configure: modified emulator_configure script to add the configure of emulator-supple... X-Git-Tag: Tizen_Studio_1.3_Release_p2.3.2~360 X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=3b39f811f04babadff27a1ff34de69fcb60af0b8;p=sdk%2Femulator%2Fqemu.git configure: modified emulator_configure script to add the configure of emulator-supplements. Change-Id: I273680ac1d004f8ff54e6903c25c07740dffe270 Signed-off-by: Jihye Won --- diff --git a/tizen/emulator_configure.sh b/tizen/emulator_configure.sh index c2a2c2b62c..b9597c95e3 100755 --- a/tizen/emulator_configure.sh +++ b/tizen/emulator_configure.sh @@ -1,14 +1,12 @@ #!/bin/sh if [ -z "$TIZEN_SDK_DEV_PATH" ] ; then - TIZEN_SDK_DEV_PATH=${HOME}/tizen-sdk-dev + TIZEN_SDK_DEV_PATH=${HOME}/tizen-sdk-dev fi CONFIGURE_APPEND="" -EMUL_TARGET_LIST="" -YAGL_EN="" -YAGL_STATS_EN="" -VIGS_EN="" +EMUL_TARGET_LIST="i386-softmmu" +SUPPLEMENTS_EN="" usage() { echo "usage: build.sh [options] [target]" @@ -19,97 +17,23 @@ usage() { echo "options:" echo "-d, --debug" echo " build debug configuration" - echo "-yagl|--yagl-device" - echo " enable YaGL passthrough device" - echo "-ys|--yagl-stats" - echo " enable YaGL stats" - echo "-vigs|--vigs-device" - echo " enable VIGS device" echo "-e|--extra" echo " extra options for QEMU configure" echo "-u|-h|--help|--usage" echo " display this help message and exit" } -yagl_enable() { - case "$1" in - 0|no|disable) - YAGL_EN="no" - ;; - 1|yes|enable) - YAGL_EN="yes" - ;; - *) - usage - exit 1 - ;; - esac -} - -yagl_stats_enable() { - case "$1" in - 0|no|disable) - YAGL_STATS_EN="no" - ;; - 1|yes|enable) - YAGL_STATS_EN="yes" - ;; - *) - usage - exit 1 - ;; - esac -} - -vigs_enable() { - case "$1" in - 0|no|disable) - VIGS_EN="no" - ;; - 1|yes|enable) - VIGS_EN="yes" - ;; - *) - usage - exit 1 - ;; - esac -} - set_target() { - if [ ! -z "$EMUL_TARGET_LIST" ] ; then - usage - exit 1 - fi - case "$1" in x86|i386|i486|i586|i686) EMUL_TARGET_LIST="i386-softmmu" - if [ -z "$YAGL_EN" ] ; then - yagl_enable yes - fi - if [ -z "$VIGS_EN" ] ; then - vigs_enable yes - fi ;; arm) EMUL_TARGET_LIST="arm-softmmu" - if [ -z "$YAGL_EN" ] && [ "$targetos" != "Darwin" ] ; then - yagl_enable yes - fi - if [ -z "$VIGS_EN" ] && [ "$targetos" != "Darwin" ] ; then - vigs_enable yes - fi ;; all) # EMUL_TARGET_LIST="i386-softmmu,arm-softmmu" EMUL_TARGET_LIST="i386-softmmu" - if [ -z "$YAGL_EN" ] ; then - yagl_enable yes - fi - if [ -z "$VIGS_EN" ] ; then - vigs_enable yes - fi ;; esac } @@ -136,19 +60,13 @@ do shift CONFIGURE_APPEND="$CONFIGURE_APPEND $1" ;; - -yagl|--yagl-device) - yagl_enable 1 - ;; - -ys|--yagl-stats) - yagl_stats_enable 1 - ;; - -vigs|--vigs-device) - vigs_enable 1 - ;; -u|-h|--help|--usage) usage exit 0 ;; + supplements) + SUPPLEMENTS_EN="yes" + ;; *) echo "Syntax Error" usage @@ -162,29 +80,16 @@ if [ -z "$EMUL_TARGET_LIST" ] ; then set_target all fi -CONFIGURE_APPEND="--target-list=$EMUL_TARGET_LIST $CONFIGURE_APPEND" - -if test "$YAGL_EN" = "yes" ; then - CONFIGURE_APPEND="$CONFIGURE_APPEND --enable-yagl" -else - CONFIGURE_APPEND="$CONFIGURE_APPEND --disable-yagl" -fi - -if test "$YAGL_STATS_EN" = "yes" ; then - CONFIGURE_APPEND="$CONFIGURE_APPEND --enable-yagl-stats" -else - CONFIGURE_APPEND="$CONFIGURE_APPEND --disable-yagl-stats" -fi +# append common flags +CONFIGURE_APPEND="--target-list=$EMUL_TARGET_LIST --enable-yagl --enable-curl --disable-gtk --disable-quorum" -if test "$VIGS_EN" = "yes" ; then - CONFIGURE_APPEND="$CONFIGURE_APPEND --enable-vigs" -else +# for emulator-supplemnts +if test "$SUPPLEMENTS_EN" = "yes" ; then CONFIGURE_APPEND="$CONFIGURE_APPEND --disable-vigs" +else + CONFIGURE_APPEND="$CONFIGURE_APPEND --enable-vigs --enable-maru --enable-libav --enable-libpng" fi -# append common flags -CONFIGURE_APPEND="--enable-maru --enable-libav --enable-curl --enable-libpng --disable-gtk --disable-quorum $CONFIGURE_APPEND" - if [ -z ${PKG_CONFIG_PATH} ] ; then # avoid pkg-config bug on Windows export PKG_CONFIG_PATH=${TIZEN_SDK_DEV_PATH}/distrib/lib/pkgconfig else