build: changed CONFIG_PATH according to emulator-lib-dev

Change-Id: I8526a2c0d101d0d75df614f801431cfa6a657388
Signed-off-by: Jihye Won <jihye.won1@samsung.com>

diff --git a/package/build.macos-64 b/package/build.macos-64
index fba1c2440cfa0d4e36f82758a71ceb9d52a2b5ab..0954881a3912b21a13983c8e4c98a5afe04df732 100755 (executable)
--- 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 5aaee6c9fe48ecad8ecc9dde311718c515ed5ddc..4c207109ae25f96a949163c0df3ac75363417895 100755 (executable)
--- 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}
 
        cd $SRCDIR/tizen/
        ./emulator_configure.sh x86

diff --git a/package/build.ubuntu-64 b/package/build.ubuntu-64
index 5aaee6c9fe48ecad8ecc9dde311718c515ed5ddc..4c207109ae25f96a949163c0df3ac75363417895 100755 (executable)
--- 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}
 
        cd $SRCDIR/tizen/
        ./emulator_configure.sh x86

diff --git a/package/build.windows-32 b/package/build.windows-32
index 61aa9f63bfcf5882f8353922c6791942cc1e2d7c..0235a469f5361c5a7d12e1362f2fe2fbc9986173 100755 (executable)
--- 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
 }