package: modified build scripts on Windows and Mac

As emulator-lib-dev package is updated,
remove unnecessary cflags and ldflags.

Change-Id: I05eaafc040f7b7342b7ab4d3aa6c27f2000153cd
Signed-off-by: Kitae Kim <kt920.kim@samsung.com>

diff --git a/package/build.macos-64 b/package/build.macos-64
index f810429..2d2afd3 100755 (executable)
--- a/package/build.macos-64
+++ b/package/build.macos-64
@@ -25,29 +25,10 @@ prepare()
         exit 1
     fi
 
-    export PKG_CONFIG_PATH=$PKG_CONFIG_PATH:$ROOTDIR/glib2/lib/pkgconfig:$ROOTDIR/curl/lib/pkgconfig:$ROOTDIR/libffi/lib/pkgconfig:$ROOTDIR/libiconv/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
-
-    BUILD_CFLAGS="--extra-cflags=-I$ROOTDIR/curl/include "
-    BUILD_CFLAGS+="--extra-cflags=-I$ROOTDIR/libffi/include "
-    BUILD_CFLAGS+="--extra-cflags=-I$ROOTDIR/glib2/include/glib-2.0 "
-    BUILD_CFLAGS+="--extra-cflags=-I$ROOTDIR/libiconv/include "
-    BUILD_CFLAGS+="--extra-cflags=-I$ROOTDIR/libidn/include "
-    BUILD_CFLAGS+="--extra-cflags=-I$ROOTDIR/libxml2/include "
-    BUILD_CFLAGS+="--extra-cflags=-I$ROOTDIR/ncurses/include "
-    BUILD_CFLAGS+="--extra-cflags=-I$ROOTDIR/openssl/include "
-    BUILD_CFLAGS+="--extra-cflags=-I$ROOTDIR/pixman/include "
-    BUILD_CFLAGS+="--extra-cflags=-I$ROOTDIR/zlib/include "
-
-    BUILD_LDFLAGS="--extra-ldflags=-L$ROOTDIR/curl/lib "
-    BUILD_LDFLAGS+="--extra-ldflags=-L$ROOTDIR/libffi/lib "
-    BUILD_LDFLAGS+="--extra-ldflags=-L$ROOTDIR/glib2/lib "
-    BUILD_LDFLAGS+="--extra-ldflags=-L$ROOTDIR/libiconv/lib "
-    BUILD_LDFLAGS+="--extra-ldflags=-L$ROOTDIR/libidn/lib "
-    BUILD_LDFLAGS+="--extra-ldflags=-L$ROOTDIR/libxml2/lib "
-    BUILD_LDFLAGS+="--extra-ldflags=-L$ROOTDIR/ncurses/lib "
-    BUILD_LDFLAGS+="--extra-ldflags=-L$ROOTDIR/openssl/lib "
-    BUILD_LDFLAGS+="--extra-ldflags=-L$ROOTDIR/pixman/lib "
-    BUILD_LDFLAGS+="--extra-ldflags=-L$ROOTDIR/zlib/lib "
+    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:$PKG_CONFIG_PATH
+
+    BUILD_CFLAGS="--extra-cflags=-I$ROOTDIR/libiconv/include "
+    BUILD_LDFLAGS="--extra-ldflags=-L$ROOTDIR/libiconv/lib "
 }
 
 modify_files(){
@@ -87,14 +68,13 @@ modify_files(){
 #    sed 's/export PKG_CONFIG_PATH/ export PKG_CONFIG_PATH/g' $SRCDIR/Makefile.target > tmp
 #    cp -f tmp $SRCDIR/Makefile.target
 #    rm -f tmp
-
 }
 # build
 build()
 {
     prepare
 
-    modify_files
+    #modify_files
 
     cd $SRCDIR/tizen/
 

diff --git a/package/build.windows-32 b/package/build.windows-32
index 6f091e7..1a913aa 100755 (executable)
--- a/package/build.windows-32
+++ b/package/build.windows-32
@@ -39,15 +39,15 @@ prepare()
 
        export PKG_CONFIG_PATH=$PKG_CONFIG_PATH:$ROOTDIR/libav/lib/pkgconfig:$ROOTDIR/SDL_1.2.15/lib/pkgconfig:$ROOTDIR/gtk-bundle_2.24.10/lib/pkgconfig:$ROOTDIR/libcurl-4_1.0.1/lib/pkgconfig:$ROOTDIR/pixman_0.30.0/lib/pkgconfig
 
-       BUILD_CFLAGS+=--extra-cflags="-I$ROOTDIR/SDL_1.2.15/include/SDL "
-       BUILD_CFLAGS+=--extra-cflags="-I$ROOTDIR/gtk-bundle_2.24.10/include "
-       BUILD_CFLAGS+=--extra-cflags="-I$ROOTDIR/libcurl-4_1.0.1/include "
-       BUILD_CFLAGS+=--extra-cflags="-I$ROOTDIR/pixman_0.30.0/include/pixman-1"
-       BUILD_LDFLAGS+=--extra-ldflags="-L$ROOTDIR/apache-ant_1.9.2/lib "
-       BUILD_LDFLAGS+=--extra-ldflags="-L$ROOTDIR/SDL_1.2.15/lib "
-       BUILD_LDFLAGS+=--extra-ldflags="-L$ROOTDIR/gtk-bundle_2.24.10/lib "
-       BUILD_LDFLAGS+=--extra-ldflags="-L$ROOTDIR/libcurl-4_1.0.1/lib "
-       BUILD_LDFLAGS+=--extra-ldflags="-L$ROOTDIR/pixman_0.30.0/lib"
+       #BUILD_CFLAGS+=--extra-cflags="-I$ROOTDIR/SDL_1.2.15/include/SDL "
+       #BUILD_CFLAGS+=--extra-cflags="-I$ROOTDIR/gtk-bundle_2.24.10/include "
+       #BUILD_CFLAGS+=--extra-cflags="-I$ROOTDIR/libcurl-4_1.0.1/include "
+       #BUILD_CFLAGS+=--extra-cflags="-I$ROOTDIR/pixman_0.30.0/include/pixman-1"
+       #BUILD_LDFLAGS+=--extra-ldflags="-L$ROOTDIR/apache-ant_1.9.2/lib "
+       #BUILD_LDFLAGS+=--extra-ldflags="-L$ROOTDIR/SDL_1.2.15/lib "
+       #BUILD_LDFLAGS+=--extra-ldflags="-L$ROOTDIR/gtk-bundle_2.24.10/lib "
+       #BUILD_LDFLAGS+=--extra-ldflags="-L$ROOTDIR/libcurl-4_1.0.1/lib "
+       #BUILD_LDFLAGS+=--extra-ldflags="-L$ROOTDIR/pixman_0.30.0/lib"
 }
 
 # build

diff --git a/package/changelog b/package/changelog
index b03f8cc..94321ae 100644 (file)
--- a/package/changelog
+++ b/package/changelog
@@ -1,3 +1,6 @@
+* 1.7.31
+- modify build script on windows and mac.
+== Kitae Kim <kt920.kim@samsung.com> 2014-04-04
 * 1.7.30
 - added enable-libav option to configure
 == Kitae Kim <kt920.kim@samsung.com> 2014-04-01
@@ -281,10 +284,10 @@
 - Enable pbuffer surface.
 == Sangjin Kim <sangjin3.kim@samsung.com> 2013-03-20
 * 1.5.12
-- modified virtio hwkey device and improved hwkey mapping 
+- modified virtio hwkey device and improved hwkey mapping
 == Sungmin Ha <sungmin82.ha@samsung.com> 2013-03-20
 * 1.5.10
-- moved kvm script files from qemu-common to qemu-x86 package. 
+- moved kvm script files from qemu-common to qemu-x86 package.
 == Kitae Kim <kt920.kim@samsung.com> 2013-03-15
 * 1.5.9
 - update a display when window is de-iconified

diff --git a/package/pkginfo.manifest b/package/pkginfo.manifest
index df4ef43..5b2fe7e 100644 (file)
--- a/package/pkginfo.manifest
+++ b/package/pkginfo.manifest
@@ -1,4 +1,4 @@
-Version: 1.7.30
+Version: 1.7.31
 Maintainer: Yeong-Kyoon Lee<yeongkyoon.lee@samsung.com>
 Source: emulator