build: change PATH according to emulator-lib-dev

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

diff --git a/package/build.macos-64 b/package/build.macos-64
index fd0e842e89dec9a9a625e3900dc0514ea50d8507..546a38686b2d4cea72482488ef4b42cf0d81c0d7 100755 (executable)
--- a/package/build.macos-64
+++ b/package/build.macos-64
@@ -25,32 +25,32 @@ prepare()
         exit 1
     fi
 
-    PATH=$PATH:$ROOTDIR/Qt_5.3.1/bin
+    PATH=$PATH:$ROOTDIR/bin
     export PATH
 
-    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:$ROOTDIR/Qt_5.3.1/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 "
+    BUILD_CFLAGS="--extra-cflags=-I$ROOTDIR/include "
+    BUILD_LDFLAGS="--extra-ldflags=-L$ROOTDIR/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'`
     sed "s/prefix=\/opt\/local/prefix="$ROOT_TMP"\/libidn/g" $LIBIDN_PC > tmpfile
-    cp -f tmpfile $LIBIDN_PC
+    cp -f tmpfile "$LIBIDN_PC"
     rm -f tmpfile
 
     sed "s/prefix=\/opt\/local/prefix="$ROOT_TMP"\/glib2/g" $GLIB_PC > tmpfile
-    cp -f tmpfile $GLIB_PC
+    cp -f tmpfile "$GLIB_PC"
     rm -f tmpfile
 
     sed "s/prefix=\/opt\/local/prefix="$ROOT_TMP"\/pixman/g" $PIXMAN_PC > tmpfile
-    cp -f tmpfile $PIXMAN_PC
+    cp -f tmpfile "$PIXMAN_PC"
     rm -f tmpfile
 
     #modify Makefile.target

diff --git a/package/build.ubuntu-32 b/package/build.ubuntu-32
index 9fa0b2acdffff87238ca55de05e25c8ac29a8d1e..19c00f18f78d1ed7ba13765f4b51d348151bbf85 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}
        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 a0efc2eaa7295a4cac4e5978c0e4a3cf42cecfbf..4716edd53a10a55dba2f9134ae53b3792d177182 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}
        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 d0ed46146d76778d413196dda27aa2549d45d52c..261eaf39ea239474e5a603ad35d371fbd1a66ba1 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:$PURIFIED_ROOTDIR/Qt_5.3.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:$PURIFIED_ROOTDIR/Qt_5.3.1/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:$PURIFIED_ROOTDIR/Qt_5.3.1/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 003b562de3477a65318fe45fe30ec06f8a985bd6..0242c8ed0ab80c07e8df741946dd9b6f8036bf1e 100755 (executable)
--- a/tizen/src/Makefile
+++ b/tizen/src/Makefile
@@ -142,9 +142,9 @@ endif
 ####### for dibs system...
 # 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
 
 all_dibs: qemu skin_client_dibs