From: Jihye Won Date: Tue, 8 Sep 2015 10:11:16 +0000 (+0900) Subject: build: changed PATH according to emulator-lib-dev X-Git-Tag: Tizen_Studio_1.3_Release_p2.3.1~41 X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=1ac1d63b1b813b535f2d5b711e275b5f039cc343;p=sdk%2Femulator%2Fqemu.git build: changed PATH according to emulator-lib-dev - changed SWT_PATH in tizen/src/Makefile. - changed PKG_CONFIG_PATH in all build scripts. - this commit was affected becuase directory structure of emulator-lib-dev was changed. Change-Id: I9394dfbf3660c59682c5f6f8b991d3f28f07586d Signed-off-by: Jihye Won --- diff --git a/package/build.macos-64 b/package/build.macos-64 index 99066cf5c3..d069085f50 100755 --- a/package/build.macos-64 +++ b/package/build.macos-64 @@ -25,16 +25,16 @@ prepare() exit 1 fi - export PKG_CONFIG_PATH=$ROOTDIR/glib2/lib/pkgconfig:$ROOTDIR/curl/lib/pkgconfig:$ROOTDIR/libffi/lib/pkgconfig:$ROOTDIR/libidn/lib/pkgconfig:$ROOTDIR/libxml2/lib/pkgconfig:$ROOTDIR/ncurses/lib/pkgconfig:$ROOTDIR/openssl/lib/pkgconfig:$ROOTDIR/pixman/lib/pkgconfig:$ROOTDIR/zlib/lib/pkgconfig:$ROOTDIR/libav/lib/pkgconfig:$ROOTDIR/libpng/lib/pkgconfig:$ROOTDIR/x264/lib/pkgconfig:$PKG_CONFIG_PATH + export PKG_CONFIG_PATH=$ROOTDIR/libav/lib/pkgconfig:$ROOTDIR/lib/pkgconfig:$PKG_CONFIG_PATH BUILD_CFLAGS="--extra-cflags=-I$ROOTDIR/libiconv/include " BUILD_LDFLAGS="--extra-ldflags=-L$ROOTDIR/libiconv/lib " } modify_files(){ - LIBIDN_PC=$ROOTDIR/libidn/lib/pkgconfig/libidn.pc - GLIB_PC=$ROOTDIR/glib2/lib/pkgconfig/glib-2.0.pc - PIXMAN_PC=$ROOTDIR/pixman/lib/pkgconfig/pixman-1.pc + LIBIDN_PC=$ROOTDIR/lib/pkgconfig/libidn.pc + GLIB_PC=$ROOTDIR/lib/pkgconfig/glib-2.0.pc + PIXMAN_PC=$ROOTDIR/lib/pkgconfig/pixman-1.pc #modify .pc files ROOT_TMP=`echo $ROOTDIR | sed 's,/,\\\\\\/,g'` diff --git a/package/build.ubuntu-32 b/package/build.ubuntu-32 index fc97f1416e..5dce15da1d 100755 --- a/package/build.ubuntu-32 +++ b/package/build.ubuntu-32 @@ -4,7 +4,7 @@ clean() { prepare - export PKG_CONFIG_PATH=${ROOTDIR}/x264/lib/pkgconfig:${ROOTDIR}/remote/lib/pkgconfig:${ROOTDIR}/libav/lib/pkgconfig:${PKG_CONFIG_PATH} + export PKG_CONFIG_PATH=${ROOTDIR}/lib/pkgconfig:${ROOTDIR}/remote/lib/pkgconfig:${ROOTDIR}/libav/lib/pkgconfig:${PKG_CONFIG_PATH} cd $SRCDIR/tizen if test -e "Makefile" @@ -48,7 +48,7 @@ prepare() # build build() { - export PKG_CONFIG_PATH=${ROOTDIR}/x264/lib/pkgconfig:${ROOTDIR}/remote/lib/pkgconfig:${ROOTDIR}/libav/lib/pkgconfig:${PKG_CONFIG_PATH} + export PKG_CONFIG_PATH=${ROOTDIR}/lib/pkgconfig:${ROOTDIR}/remote/lib/pkgconfig:${ROOTDIR}/libav/lib/pkgconfig:${PKG_CONFIG_PATH} export LD_LIBRARY_PATH=${LD_LIBRARY_PATH}:${ROOTDIR}/remote/lib cd $SRCDIR/tizen/ diff --git a/package/build.ubuntu-64 b/package/build.ubuntu-64 index fc97f1416e..5dce15da1d 100755 --- a/package/build.ubuntu-64 +++ b/package/build.ubuntu-64 @@ -4,7 +4,7 @@ clean() { prepare - export PKG_CONFIG_PATH=${ROOTDIR}/x264/lib/pkgconfig:${ROOTDIR}/remote/lib/pkgconfig:${ROOTDIR}/libav/lib/pkgconfig:${PKG_CONFIG_PATH} + export PKG_CONFIG_PATH=${ROOTDIR}/lib/pkgconfig:${ROOTDIR}/remote/lib/pkgconfig:${ROOTDIR}/libav/lib/pkgconfig:${PKG_CONFIG_PATH} cd $SRCDIR/tizen if test -e "Makefile" @@ -48,7 +48,7 @@ prepare() # build build() { - export PKG_CONFIG_PATH=${ROOTDIR}/x264/lib/pkgconfig:${ROOTDIR}/remote/lib/pkgconfig:${ROOTDIR}/libav/lib/pkgconfig:${PKG_CONFIG_PATH} + export PKG_CONFIG_PATH=${ROOTDIR}/lib/pkgconfig:${ROOTDIR}/remote/lib/pkgconfig:${ROOTDIR}/libav/lib/pkgconfig:${PKG_CONFIG_PATH} export LD_LIBRARY_PATH=${LD_LIBRARY_PATH}:${ROOTDIR}/remote/lib cd $SRCDIR/tizen/ diff --git a/package/build.windows-32 b/package/build.windows-32 index 1ff1c335d4..b537c778ab 100755 --- a/package/build.windows-32 +++ b/package/build.windows-32 @@ -34,20 +34,20 @@ prepare() fi PURIFIED_ROOTDIR=${MSYS_ROOTDIR} - PATH=$PATH:$PURIFIED_ROOTDIR/bin:$PURIFIED_ROOTDIR/apache-ant_1.9.2/bin:$PURIFIED_ROOTDIR/SDL_1.2.15/bin:$PURIFIED_ROOTDIR/pixman_0.30.0/bin:$PURIFIED_ROOTDIR/gtk-bundle_2.24.10/bin:$PURIFIED_ROOTDIR/libcurl-4_1.0.1/bin + PATH=$PATH:$PURIFIED_ROOTDIR/bin export PATH if [ -z ${PKG_CONFIG_PATH} ] then - PKG_CONFIG_PATH=$PURIFIED_ROOTDIR/libav/lib/pkgconfig:$PURIFIED_ROOTDIR/SDL_1.2.15/lib/pkgconfig:$PURIFIED_ROOTDIR/pixman_0.30.0/lib/pkgconfig:$PURIFIED_ROOTDIR/gtk-bundle_2.24.10/lib/pkgconfig:$PURIFIED_ROOTDIR/libcurl-4_1.0.1/lib/pkgconfig:$PURIFIED_ROOTDIR/x264/lib/pkgconfig + PKG_CONFIG_PATH=$PURIFIED_ROOTDIR/libav/lib/pkgconfig:$PURIFIED_ROOTDIR/lib/pkgconfig else - PKG_CONFIG_PATH=$PURIFIED_ROOTDIR/libav/lib/pkgconfig:$PURIFIED_ROOTDIR/SDL_1.2.15/lib/pkgconfig:$PURIFIED_ROOTDIR/pixman_0.30.0/lib/pkgconfig:$PURIFIED_ROOTDIR/gtk-bundle_2.24.10/lib/pkgconfig:$PURIFIED_ROOTDIR/libcurl-4_1.0.1/lib/pkgconfig:$PURIFIED_ROOTDIR/x264/lib/pkgconfig:${PKG_CONFIG_PATH} + PKG_CONFIG_PATH=$PURIFIED_ROOTDIR/libav/lib/pkgconfig:$PURIFIED_ROOTDIR/lib/pkgconfig:${PKG_CONFIG_PATH} fi export PKG_CONFIG_PATH echo $PKG_CONFIG_PATH - BUILD_CFLAGS+=--extra-cflags="-I$PURIFIED_ROOTDIR/gtk-bundle_2.24.10/include " - BUILD_LDFLAGS+=--extra-ldflags="-L$PURIFIED_ROOTDIR/gtk-bundle_2.24.10/lib " + BUILD_CFLAGS+=--extra-cflags="-I$PURIFIED_ROOTDIR/include " + BUILD_LDFLAGS+=--extra-ldflags="-L$PURIFIED_ROOTDIR/lib " echo $PURIFIED_ROOTDIR } diff --git a/tizen/src/Makefile b/tizen/src/Makefile index 8709709fde..2627d50e16 100644 --- a/tizen/src/Makefile +++ b/tizen/src/Makefile @@ -33,9 +33,9 @@ qemu_distclean: # DIBS classpath for emulator-skin.jar ifdef CONFIG_WIN32 -DIBS_SWT_DIR=-Dclasspath.dibs=$(MSYS_ROOTDIR)/swt/4.332 +DIBS_SWT_DIR=-Dclasspath.dibs=$(MSYS_ROOTDIR)/swt_4.3 else -DIBS_SWT_DIR=-Dclasspath.dibs=$(ROOTDIR)/swt/4.332 +DIBS_SWT_DIR=-Dclasspath.dibs=$(ROOTDIR)/swt_4.3 endif # Building check-gl