From: syeon.hwang Date: Wed, 18 Jul 2012 12:58:40 +0000 (+0900) Subject: [Title] Modify build related files for SDK refactoring X-Git-Tag: Tizen_Studio_1.3_Release_p2.3.1~1528^2~102^2~1 X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=bebebe2d4093fec8b1955f867d62c946581d9e69;p=sdk%2Femulator%2Fqemu.git [Title] Modify build related files for SDK refactoring [Type] [Module] [Priority] [CQ#] [Redmine#] [Problem] [Cause] [Solution] [TestCase] --- diff --git a/tizen/Makefile b/tizen/Makefile index 05d761f025..6c94fd5d9b 100644 --- a/tizen/Makefile +++ b/tizen/Makefile @@ -1,11 +1,5 @@ all: cd src && $(MAKE) -check_hax: - cd src && $(MAKE) check_hax -qemu: - cd src && $(MAKE) qemu -skin_client: - cd src && $(MAKE) skin_client clean: cd src && $(MAKE) clean distclean: diff --git a/tizen/build.sh b/tizen/build.sh index dbc266c1fb..b353ce1fd6 100755 --- a/tizen/build.sh +++ b/tizen/build.sh @@ -1,4 +1,4 @@ #!/bin/sh -xe -./qemu_configure.sh -make && make install +./emulator_configure.sh +make -j12 install diff --git a/tizen/emulator_configure.sh b/tizen/emulator_configure.sh new file mode 100755 index 0000000000..eb246efccc --- /dev/null +++ b/tizen/emulator_configure.sh @@ -0,0 +1,72 @@ +#!/bin/sh +# OS specific +#--target-list=i386-softmmu,arm-softmmu \ + +targetos=`uname -s` +targetarch=`echo | gcc -E -dM | grep __x86_64` +bindir="i386" + +if test "$targetarch" = "x86_64" +then + bindir="x86_64" +fi + +echo "##### checking for os... targetos $targetos" +case $targetos in +Linux*) +cd distrib/libav +echo "" +echo "##### FFMPEG configure for emulator" +./configure \ + --prefix=./$bindir --arch=x86 --enable-static --enable-pic --enable-optimizations --disable-doc --disable-gpl --disable-yasm --disable-postproc --disable-swscale --disable-ffmpeg --disable-ffprobe --disable-ffserver --disable-ffplay --disable-decoders --disable-encoders --disable-muxers --disable-demuxers --disable-parsers --disable-protocols --disable-network --disable-bsfs --disable-devices --disable-filters --enable-encoder=h263 --enable-encoder=h263p --enable-encoder=mpeg4 --enable-encoder=msmpeg4v2 --enable-encoder=msmpeg4v3 --enable-decoder=aac --enable-decoder=h263 --enable-decoder=h264 --enable-decoder=mp3 --enable-decoder=mp3adu --enable-decoder=mpeg4 --enable-decoder=mpegvideo --enable-decoder=msmpeg4v1 --enable-decoder=msmpeg4v2 --enable-decoder=msmpeg4v3 --enable-decoder=wmav1 --enable-decoder=wmav2 --enable-decoder=wmv3 --enable-decoder=vc1 +cd ../.. + +cd .. +echo "" +echo "##### QEMU configure for emulator" +./configure \ + --target-list=i386-softmmu \ + --disable-werror \ + --audio-drv-list=alsa \ + --enable-mixemu \ + --disable-vnc-tls \ + --audio-card-list=ac97 \ + --enable-ldst-optimization \ + --enable-maru \ + --disable-vnc-jpeg \ + --disable-vnc-png \ + --enable-gl +# --enable-ffmpeg +# --enable-v4l2 \ +# --enable-debug \ +# --enable-profiler \ +# --enable-gles2 --gles2dir=/usr +;; +MINGW*) +cd distrib/libav +echo "" +echo "##### FFMPEG configure for emulator" +./configure \ + --prefix=./$bindir --arch=x86 --enable-static --enable-w32threads --enable-optimizations --enable-memalign-hack --disable-doc --disable-gpl --disable-yasm --disable-postproc --disable-swscale --disable-ffmpeg --disable-ffprobe --disable-ffserver --disable-ffplay --disable-decoders --disable-encoders --disable-muxers --disable-demuxers --disable-parsers --disable-protocols --disable-network --disable-bsfs --disable-devices --disable-filters --enable-encoder=h263 --enable-encoder=h263p --enable-encoder=mpeg4 --enable-encoder=msmpeg4v2 --enable-encoder=msmpeg4v3 --enable-decoder=aac --enable-decoder=h263 --enable-decoder=h264 --enable-decoder=mp3 --enable-decoder=mp3adu --enable-decoder=mpeg4 --enable-decoder=mpegvideo --enable-decoder=msmpeg4v1 --enable-decoder=msmpeg4v2 --enable-decoder=msmpeg4v3 --enable-decoder=wmav1 --enable-decoder=wmav2 --enable-decoder=wmv3 --enable-decoder=vc1 +cd ../.. + +cd .. +echo "" +echo "##### QEMU configure for emulator" +./configure \ + --target-list=i386-softmmu \ + --audio-drv-list=winwave \ + --enable-mixemu \ + --disable-vnc-tls \ + --audio-card-list=ac97 \ + --enable-ldst-optimization \ + --enable-hax \ + --enable-maru \ + --disable-vnc-jpeg \ + --disable-vnc-png \ + --enable-gl $1 +# --enable-ffmpeg +# --disable-vnc-jpeg \ +# --disable-jpeg +;; +esac diff --git a/tizen/qemu_configure.sh b/tizen/qemu_configure.sh deleted file mode 100755 index afc7451446..0000000000 --- a/tizen/qemu_configure.sh +++ /dev/null @@ -1,46 +0,0 @@ -#!/bin/sh -# OS specific -#--target-list=i386-softmmu,arm-softmmu \ -targetos=`uname -s` - -cd .. -case $targetos in -Linux*) -echo "checking for os... targetos $targetos" -exec ./configure \ - --target-list=i386-softmmu \ - --disable-werror \ - --audio-drv-list=alsa \ - --enable-mixemu \ - --disable-vnc-tls \ - --audio-card-list=ac97 \ - --enable-ldst-optimization \ - --enable-maru \ - --disable-vnc-jpeg \ - --disable-vnc-png \ - --enable-gl -# --enable-ffmpeg -# --enable-v4l2 \ -# --enable-debug \ -# --enable-profiler \ -# --enable-gles2 --gles2dir=/usr -;; -MINGW*) -echo "checking for os... targetos $targetos" -exec ./configure \ - --target-list=i386-softmmu \ - --audio-drv-list=winwave \ - --enable-mixemu \ - --disable-vnc-tls \ - --audio-card-list=ac97 \ - --enable-ldst-optimization \ - --enable-hax \ - --enable-maru \ - --disable-vnc-jpeg \ - --disable-vnc-png \ - --enable-gl $1 -# --enable-ffmpeg -# --disable-vnc-jpeg \ -# --disable-jpeg -;; -esac diff --git a/tizen/src/Makefile b/tizen/src/Makefile index 45e7515e9f..c3c95c4eb2 100755 --- a/tizen/src/Makefile +++ b/tizen/src/Makefile @@ -1,4 +1,4 @@ -EMUL_DIR=../Emulator +EMUL_DIR=../emulator ifneq ($(wildcard ../../config-host.mak),) include ../../config-host.mak @@ -8,9 +8,13 @@ config-host.mak: @exit 1 endif -all: build_info qemu skin_client check_hax -qemu: +all: qemu skin_client +qemu: build_info ffmpeg_install check_hax cd ../../ && $(MAKE) +qemu_clean: + cd ../../ && $(MAKE) clean +qemu_distclean: + cd ../../ && $(MAKE) distclean check_hax: ifdef CONFIG_WIN32 $(CC) -o check-hax.exe check_hax.c @@ -34,16 +38,21 @@ build_info: @echo "const char build_version[] = \"`cat VERSION`\";" >> build_info.h @echo "const char build_date[] = \"`date +"%F %T %Z"`\";" >> build_info.h @echo "const char pkginfo_version[] = \"`sed -n '2p' ./../../package/pkginfo.manifest`\";" >> build_info.h - -clean: +ffmpeg: + cd ../distrib/libav/ && $(MAKE) +ffmpeg_install: ffmpeg + cd ../distrib/libav/ && $(MAKE) install +ffmpeg_clean: + cd ../distrib/libav/ && $(MAKE) clean +ffmpeg_distclean: + cd ../distrib/libav/ && $(MAKE) clean +clean: qemu_clean ffmpeg_clean ifdef CONFIG_WIN32 rm -f check-hax.exe else endif - cd ../../ && $(MAKE) clean -distclean: - cd ../../ && $(MAKE) distclean +distclean: qemu_distclean ffmpeg_distclean install: all mkdir -p $(EMUL_DIR)/bin mkdir -p $(EMUL_DIR)/etc