dibs: cleaned-up DIBS build scripts

Change-Id: Ia72722bcca12a9d3eb88d9e8f9a57e76f22c9372
Signed-off-by: SeokYeon Hwang <syeon.hwang@samsung.com>

8 files changed, 133 insertions, 380 deletions

diff --git a/package/build.common b/package/build.common
new file mode 100644
index 0000000000..e8c2d77c4b
--- /dev/null
+++ b/package/build.common
@@ -0,0 +1,51 @@
+# build_common
+build_common()
+{
+	prepare
+
+	cd ${SRCDIR}/tizen
+
+	PKG_CONFIG_PATH=${ROOTDIR}/lib/pkgconfig:${ROOTDIR}/remote/lib/pkgconfig:${ROOTDIR}/libav/lib/pkgconfig
+	PATH=${PATH}:${ROOTDIR}/bin
+
+	PKG_CONFIG_PATH=${PKG_CONFIG_PATH} ./emulator_configure.sh x86
+
+	make clean
+	# FIXME: PKG_CONFIG_PATH is only for qt5_msg_box
+	PATH=${PATH} PKG_CONFIG_PATH=${PKG_CONFIG_PATH} make all_dibs -j8
+	make install_dibs
+
+	if [ $? -eq 0 ]
+	then
+		echo "x86 build success"
+	else
+		echo "x86 build failure"
+		exit 1
+	fi
+}
+
+# install_common
+install_common()
+{
+	X86_BIN_DIR=$SRCDIR/package/2.4-emulator-qemu-x86.package.${TARGET_OS}/data/platforms/tizen-2.4/common
+	COMMON_BIN_DIR=$SRCDIR/package/2.4-emulator-qemu-common.package.${TARGET_OS}/data/platforms/tizen-2.4/common
+	MOBILE_2_4_SKIN_RESOURCE_DIR=$SRCDIR/package/mobile-2.4-emulator-qemu-skins.package.${TARGET_OS}/data/platforms/tizen-2.4/mobile/emulator-resources/skins
+	WEARABLE_2_4_SKIN_RESOURCE_DIR=$SRCDIR/package/wearable-2.4-emulator-qemu-skins.package.${TARGET_OS}/data/platforms/tizen-2.4/wearable/emulator-resources/skins
+	TV_2_4_SKIN_RESOURCE_DIR=$SRCDIR/package/tv-2.4-emulator-qemu-skins.package.${TARGET_OS}/data/platforms/tizen-2.4/tv/emulator-resources/skins
+
+	cd $SRCDIR/tizen
+
+	mkdir -p $X86_BIN_DIR
+	mkdir -p $COMMON_BIN_DIR
+	mkdir -p $MOBILE_2_4_SKIN_RESOURCE_DIR
+	mkdir -p $WEARABLE_2_4_SKIN_RESOURCE_DIR
+	mkdir -p $TV_2_4_SKIN_RESOURCE_DIR
+
+	mv x86 $X86_BIN_DIR/emulator
+	mv common $COMMON_BIN_DIR/emulator
+
+	#profile skins
+	mv skins/mobile/* $MOBILE_2_4_SKIN_RESOURCE_DIR
+	mv skins/wearable/* $WEARABLE_2_4_SKIN_RESOURCE_DIR
+	mv skins/tv/* $TV_2_4_SKIN_RESOURCE_DIR
+}
diff --git a/package/build.linux b/package/build.linux
new file mode 100755
index 0000000000..343ac2121d
--- /dev/null
+++ b/package/build.linux
@@ -0,0 +1,55 @@
+#!/bin/sh -xe
+# check build environment
+prepare()
+{
+	if [ "$JAVA_HOME" = "" ]
+	then
+		echo "Make sure that you have installed JDK"
+		echo "and then set installed JDK/bin path into JAVA_HOME"
+		echo "as a system environment variable on your PC!!"
+		exit 1
+	fi
+
+	REQUIRED_PKG="ant python zlib1g-dev libglib2.0-dev libsdl1.2-dev libasound2-dev \
+	 libx11-dev libv4l-dev libxcomposite-dev libpixman-1-dev libcurl4-gnutls-dev \
+	 libcap-dev libattr1-dev"
+
+	echo "Checking required packages before compling!!"
+	for pkg in ${REQUIRED_PKG}
+	do
+		dpkg -s ${pkg} > /dev/null
+		if [ "x$?" = "x0" ]
+		then
+			echo "checking ${pkg} ... OK"
+		else
+			echo "checking ${pkg} ... failure"
+			exit 1
+		fi
+	done
+}
+
+# clean
+clean()
+{
+    echo "nothing to do"
+}
+
+# build
+build()
+{
+    . $SRCDIR/package/build.common
+    build_common
+}
+
+# install
+install()
+{
+    . $SRCDIR/package/build.common
+    install_common
+}
+
+[ "$1" = "clean" ] && clean
+[ "$1" = "build" ] && build
+[ "$1" = "install" ] && install
+
+echo "success"
diff --git a/package/build.macos-64 b/package/build.macos-64
index 546a38686b..b3e72fe053 100755
--- a/package/build.macos-64
+++ b/package/build.macos-64
@@ -1,19 +1,4 @@
 #!/bin/bash -xe
-# clean
-clean()
-{
-    prepare
-
-    cd $SRCDIR/tizen
-    if test -e "Makefile"
-    then
-        ./emulator_configure.sh x86 -e "$BUILD_CFLAGS $BUILD_LDFLAGS"
-        make clean
-    fi
-    rm -rf $SRCDIR/*.zip
-    rm -rf $SRCDIR/*.tar.gz
-}
-
 # check build environment
 prepare()
 {
@@ -24,112 +9,26 @@ prepare()
         echo "as a system environment variable on your PC!!"
         exit 1
     fi
-
-    PATH=$PATH:$ROOTDIR/bin
-    export PATH
-
-    export PKG_CONFIG_PATH=$ROOTDIR/libav/lib/pkgconfig:$ROOTDIR/lib/pkgconfig:$PKG_CONFIG_PATH
-
-    BUILD_CFLAGS="--extra-cflags=-I$ROOTDIR/include "
-    BUILD_LDFLAGS="--extra-ldflags=-L$ROOTDIR/lib "
 }
 
-modify_files(){
-    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"
-    rm -f tmpfile
-
-    sed "s/prefix=\/opt\/local/prefix="$ROOT_TMP"\/glib2/g" $GLIB_PC > tmpfile
-    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"
-    rm -f tmpfile
-
-    #modify Makefile.target
-    sed "/check-gl: check_gl.o/a \\
-        export PKG_CONFIG_PATH=$PKG_CONFIG_PATH
-    " $SRCDIR/Makefile.target > tmpfile
-
-    sed 's/export PKG_CONFIG_PATH/	export PKG_CONFIG_PATH/g' tmpfile > $SRCDIR/Makefile.target
-    rm -f tmpfile
-
-    #just in case
-#    sed "1 i\\
-#    export PKG_CONFIG_PATH=$PKG_CONFIG_PATH
-#
-#    " $SRCDIR/Makefile.target > tmp
-#    cp -f tmp $SRCDIR/Makefile.target
-#    rm -f tmp
-#    sed 's/export PKG_CONFIG_PATH/ export PKG_CONFIG_PATH/g' $SRCDIR/Makefile.target > tmp
-#    cp -f tmp $SRCDIR/Makefile.target
-#    rm -f tmp
+# clean
+clean()
+{
+    echo "nothing to do"
 }
+
 # build
 build()
 {
-    prepare
-
-    #modify_files
-
-    cd $SRCDIR/tizen/
-
-    make all_dibs -j4
-    if [ $? -eq 0 ]
-    then
-        echo "build success"
-    else
-        echo "build failure"
-        exit 1
-    fi
-
-#   make install_dibs
-#   make clean
-#
-#   ./emulator_configure.sh arm
-#   make all_dibs
-#   if [ $? -eq 0 ]
-#   then
-#       echo "arm build success"
-#   else
-#       echo "arm build failure"
-#       exit 1
-#   fi
-#   make install_dibs
+    . $SRCDIR/package/build.common
+    build_common
 }
 
 # install
 install()
 {
-    X86_BIN_DIR=$SRCDIR/package/2.4-emulator-qemu-x86.package.${TARGET_OS}/data/platforms/tizen-2.4/common
-    COMMON_BIN_DIR=$SRCDIR/package/2.4-emulator-qemu-common.package.${TARGET_OS}/data/platforms/tizen-2.4/common
-    MOBILE_2_4_SKIN_RESOURCE_DIR=$SRCDIR/package/mobile-2.4-emulator-qemu-skins.package.${TARGET_OS}/data/platforms/tizen-2.4/mobile/emulator-resources/skins
-    WEARABLE_2_4_SKIN_RESOURCE_DIR=$SRCDIR/package/wearable-2.4-emulator-qemu-skins.package.${TARGET_OS}/data/platforms/tizen-2.4/wearable/emulator-resources/skins
-    TV_2_4_SKIN_RESOURCE_DIR=$SRCDIR/package/tv-2.4-emulator-qemu-skins.package.${TARGET_OS}/data/platforms/tizen-2.4/tv/emulator-resources/skins
-
-    mkdir -p $X86_BIN_DIR
-    mkdir -p $COMMON_BIN_DIR
-    mkdir -p $MOBILE_2_4_SKIN_RESOURCE_DIR
-    mkdir -p $WEARABLE_2_4_SKIN_RESOURCE_DIR
-    mkdir -p $TV_2_4_SKIN_RESOURCE_DIR
-
-    cd $SRCDIR/tizen
-    make install_dibs
-
-    mv x86 $X86_BIN_DIR/emulator
-    mv common $COMMON_BIN_DIR/emulator
-
-    #profile skins
-    mv skins/mobile/* $MOBILE_2_4_SKIN_RESOURCE_DIR
-    mv skins/wearable/* $WEARABLE_2_4_SKIN_RESOURCE_DIR
-    mv skins/tv/* $TV_2_4_SKIN_RESOURCE_DIR
+    . $SRCDIR/package/build.common
+    install_common
 }
 
 [ "$1" = "clean" ] && clean
diff --git a/package/build.ubuntu-32 b/package/build.ubuntu-32
deleted file mode 100755
index 19c00f18f7..0000000000
--- a/package/build.ubuntu-32
+++ /dev/null
@@ -1,98 +0,0 @@
-#!/bin/sh -xe
-# clean
-clean()
-{
-	prepare
-
-	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"
-	then
-		./emulator_configure.sh x86
-		make clean
-	fi
-	rm -rf $SRCDIR/*.zip
-	rm -rf $SRCDIR/*.tar.gz
-}
-
-# check build environment
-prepare()
-{
-	if [ "$JAVA_HOME" = "" ]
-	then
-		echo "Make sure that you have installed JDK"
-		echo "and then set installed JDK/bin path into JAVA_HOME"
-		echo "as a system environment variable on your PC!!"
-		exit 1
-	fi
-
-	REQUIRED_PKG="ant python zlib1g-dev libglib2.0-dev libsdl1.2-dev libasound2-dev \
-	 libx11-dev libv4l-dev libxcomposite-dev libpixman-1-dev libcurl4-gnutls-dev \
-	 libcap-dev libattr1-dev"
-
-	echo "Checking required packages before compling!!"
-	for pkg in ${REQUIRED_PKG}
-	do
-		dpkg -s ${pkg} > /dev/null
-		if [ "x$?" = "x0" ]
-		then
-			echo "checking ${pkg} ... OK"
-		else
-			echo "checking ${pkg} ... failure"
-			exit 1
-		fi
-	done
-}
-
-# build
-build()
-{
-	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/
-	make all_dibs -j4
-	if [ $? -eq 0 ]
-	then
-		echo "x86 build success"
-	else
-		echo "x86 build failure"
-		exit 1
-	fi
-}
-
-# install
-install()
-{
-	X86_BIN_DIR=$SRCDIR/package/2.4-emulator-qemu-x86.package.${TARGET_OS}/data/platforms/tizen-2.4/common
-	COMMON_BIN_DIR=$SRCDIR/package/2.4-emulator-qemu-common.package.${TARGET_OS}/data/platforms/tizen-2.4/common
-	MOBILE_2_4_SKIN_RESOURCE_DIR=$SRCDIR/package/mobile-2.4-emulator-qemu-skins.package.${TARGET_OS}/data/platforms/tizen-2.4/mobile/emulator-resources/skins
-	WEARABLE_2_4_SKIN_RESOURCE_DIR=$SRCDIR/package/wearable-2.4-emulator-qemu-skins.package.${TARGET_OS}/data/platforms/tizen-2.4/wearable/emulator-resources/skins
-	TV_2_4_SKIN_RESOURCE_DIR=$SRCDIR/package/tv-2.4-emulator-qemu-skins.package.${TARGET_OS}/data/platforms/tizen-2.4/tv/emulator-resources/skins
-
-	mkdir -p $X86_BIN_DIR
-	mkdir -p $COMMON_BIN_DIR
-	mkdir -p $MOBILE_2_4_SKIN_RESOURCE_DIR
-	mkdir -p $WEARABLE_2_4_SKIN_RESOURCE_DIR
-	mkdir -p $TV_2_4_SKIN_RESOURCE_DIR
-
-	export LD_LIBRARY_PATH=${LD_LIBRARY_PATH}:${ROOTDIR}/remote/lib
-
-	cd $SRCDIR/tizen
-	make install_dibs
-
-	mv x86 $X86_BIN_DIR/emulator
-	mv common $COMMON_BIN_DIR/emulator
-
-	#profile skins
-	mv skins/mobile/* $MOBILE_2_4_SKIN_RESOURCE_DIR
-	mv skins/wearable/* $WEARABLE_2_4_SKIN_RESOURCE_DIR
-	mv skins/tv/* $TV_2_4_SKIN_RESOURCE_DIR
-}
-
-[ "$1" = "clean" ] && clean
-[ "$1" = "build" ] && build
-[ "$1" = "install" ] && install
-
-echo "success"
diff --git a/package/build.ubuntu-64 b/package/build.ubuntu-64
deleted file mode 100755
index 4716edd53a..0000000000
--- a/package/build.ubuntu-64
+++ /dev/null
@@ -1,98 +0,0 @@
-#!/bin/sh -xe
-# clean
-clean()
-{
-	prepare
-
-	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"
-	then
-		./emulator_configure.sh x86
-		make clean
-	fi
-	rm -rf $SRCDIR/*.zip
-	rm -rf $SRCDIR/*.tar.gz
-}
-
-# check build environment
-prepare()
-{
-	if [ "$JAVA_HOME" = "" ]
-	then
-		echo "Make sure that you have installed JDK"
-		echo "and then set installed JDK/bin path into JAVA_HOME"
-		echo "as a system environment variable on your PC!!"
-		exit 1
-	fi
-
-	REQUIRED_PKG="ant python zlib1g-dev libglib2.0-dev libsdl1.2-dev libasound2-dev \
-	 libx11-dev libv4l-dev libxcomposite-dev libpixman-1-dev libcurl4-gnutls-dev \
-	 libcap-dev libattr1-dev"
-
-	echo "Checking required packages before compling!!"
-	for pkg in ${REQUIRED_PKG}
-	do
-		dpkg -s ${pkg} > /dev/null
-		if [ "x$?" = "x0" ]
-		then
-			echo "checking ${pkg} ... OK"
-		else
-			echo "checking ${pkg} ... failure"
-			exit 1
-		fi
-	done
-}
-
-# build
-build()
-{
-	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/
-	make all_dibs -j4
-	if [ $? -eq 0 ]
-	then
-		echo "x86 build success"
-	else
-		echo "x86 build failure"
-		exit 1
-	fi
-}
-
-# install
-install()
-{
-    X86_BIN_DIR=$SRCDIR/package/2.4-emulator-qemu-x86.package.${TARGET_OS}/data/platforms/tizen-2.4/common
-	COMMON_BIN_DIR=$SRCDIR/package/2.4-emulator-qemu-common.package.${TARGET_OS}/data/platforms/tizen-2.4/common
-	MOBILE_2_4_SKIN_RESOURCE_DIR=$SRCDIR/package/mobile-2.4-emulator-qemu-skins.package.${TARGET_OS}/data/platforms/tizen-2.4/mobile/emulator-resources/skins
-	WEARABLE_2_4_SKIN_RESOURCE_DIR=$SRCDIR/package/wearable-2.4-emulator-qemu-skins.package.${TARGET_OS}/data/platforms/tizen-2.4/wearable/emulator-resources/skins
-	TV_2_4_SKIN_RESOURCE_DIR=$SRCDIR/package/tv-2.4-emulator-qemu-skins.package.${TARGET_OS}/data/platforms/tizen-2.4/tv/emulator-resources/skins
-
-	mkdir -p $X86_BIN_DIR
-	mkdir -p $COMMON_BIN_DIR
-	mkdir -p $MOBILE_2_4_SKIN_RESOURCE_DIR
-	mkdir -p $WEARABLE_2_4_SKIN_RESOURCE_DIR
-	mkdir -p $TV_2_4_SKIN_RESOURCE_DIR
-
-	export LD_LIBRARY_PATH=${LD_LIBRARY_PATH}:${ROOTDIR}/remote/lib
-
-	cd $SRCDIR/tizen
-	make install_dibs
-
-	mv x86 $X86_BIN_DIR/emulator
-	mv common $COMMON_BIN_DIR/emulator
-
-	#profile skins
-	mv skins/mobile/* $MOBILE_2_4_SKIN_RESOURCE_DIR
-	mv skins/wearable/* $WEARABLE_2_4_SKIN_RESOURCE_DIR
-	mv skins/tv/* $TV_2_4_SKIN_RESOURCE_DIR
-}
-
-[ "$1" = "clean" ] && clean
-[ "$1" = "build" ] && build
-[ "$1" = "install" ] && install
-
-echo "success"
diff --git a/package/build.windows-32 b/package/build.windows-32
index 261eaf39ea..f1d742e5f5 100755
--- a/package/build.windows-32
+++ b/package/build.windows-32
@@ -1,19 +1,4 @@
 #!/bin/sh -xe
-# clean
-clean()
-{
-	prepare
-
-	cd $SRCDIR/tizen
-	if test -e "Makefile"
-	then
-		./emulator_configure.sh x86 -e "$BUILD_CFLAGS $BUILD_LDFLAGS"
-		make clean
-	fi
-	rm -rf $SRCDIR/*.zip
-	rm -rf $SRCDIR/*.tar.gz
-}
-
 #prepare
 prepare()
 {
@@ -33,67 +18,28 @@ prepare()
 		exit 1
 	fi
 
-	PURIFIED_ROOTDIR=${MSYS_ROOTDIR}
-	PATH=$PATH:$PURIFIED_ROOTDIR/bin
-	export PATH
-
-	if [ -z ${PKG_CONFIG_PATH} ]
-	then
-		PKG_CONFIG_PATH=$PURIFIED_ROOTDIR/libav/lib/pkgconfig:$PURIFIED_ROOTDIR/lib/pkgconfig
-	else
-		PKG_CONFIG_PATH=$PURIFIED_ROOTDIR/libav/lib/pkgconfig:$PURIFIED_ROOTDIR/lib/pkgconfig:${PKG_CONFIG_PATH}
-	fi
-	export PKG_CONFIG_PATH
+    ROOTDIR=$MSYS_ROOTDIR
+}
 
-	echo $PKG_CONFIG_PATH
-	BUILD_CFLAGS+=--extra-cflags="-I$PURIFIED_ROOTDIR/include "
-	BUILD_LDFLAGS+=--extra-ldflags="-L$PURIFIED_ROOTDIR/lib "
-	echo $PURIFIED_ROOTDIR
+# clean
+clean()
+{
+    echo "nothing to do"
 }
 
+
 # build
 build()
 {
-	prepare
-
-	cd $SRCDIR/tizen
-	make all_dibs -j4
-	if [ $? -eq 0 ]
-	then
-		echo "x86 build success"
-	else
-		echo "x86 build failure"
-		exit 1
-	fi
+    . $SRCDIR/package/build.common
+    build_common
 }
 
 # install
 install()
 {
-	prepare
-
-    X86_BIN_DIR=$SRCDIR/package/2.4-emulator-qemu-x86.package.${TARGET_OS}/data/platforms/tizen-2.4/common
-	COMMON_BIN_DIR=$SRCDIR/package/2.4-emulator-qemu-common.package.${TARGET_OS}/data/platforms/tizen-2.4/common
-	MOBILE_2_4_SKIN_RESOURCE_DIR=$SRCDIR/package/mobile-2.4-emulator-qemu-skins.package.${TARGET_OS}/data/platforms/tizen-2.4/mobile/emulator-resources/skins
-	WEARABLE_2_4_SKIN_RESOURCE_DIR=$SRCDIR/package/wearable-2.4-emulator-qemu-skins.package.${TARGET_OS}/data/platforms/tizen-2.4/wearable/emulator-resources/skins
-	TV_2_4_SKIN_RESOURCE_DIR=$SRCDIR/package/tv-2.4-emulator-qemu-skins.package.${TARGET_OS}/data/platforms/tizen-2.4/tv/emulator-resources/skins
-
-	mkdir -p $X86_BIN_DIR
-	mkdir -p $COMMON_BIN_DIR
-	mkdir -p $MOBILE_2_4_SKIN_RESOURCE_DIR
-	mkdir -p $WEARABLE_2_4_SKIN_RESOURCE_DIR
-	mkdir -p $TV_2_4_SKIN_RESOURCE_DIR
-
-	cd $SRCDIR/tizen
-	make install_dibs
-
-	mv x86 $X86_BIN_DIR/emulator
-	mv common $COMMON_BIN_DIR/emulator
-
-	#profile skins
-	mv skins/mobile/* $MOBILE_2_4_SKIN_RESOURCE_DIR
-	mv skins/wearable/* $WEARABLE_2_4_SKIN_RESOURCE_DIR
-	mv skins/tv/* $TV_2_4_SKIN_RESOURCE_DIR
+    . $SRCDIR/package/build.common
+    install_common
 }
 
 [ "$1" = "clean" ] && clean
diff --git a/tizen/emulator_configure.sh b/tizen/emulator_configure.sh
index b5f1ca2067..2873da48de 100755
--- a/tizen/emulator_configure.sh
+++ b/tizen/emulator_configure.sh
@@ -76,7 +76,8 @@ if [ -z "$EMUL_TARGET_LIST" ] ; then
   set_target all
 fi
 
-if [ -z ${PKG_CONFIG_PATH} ] ; then	# avoid pkg-config bug on Windows
+# avoid pkg-config bug on Windows
+if [ -z ${PKG_CONFIG_PATH} ] ; then
 export PKG_CONFIG_PATH=${TIZEN_SDK_DEV_PATH}/distrib/lib/pkgconfig
 else
 export PKG_CONFIG_PATH=${TIZEN_SDK_DEV_PATH}/distrib/lib/pkgconfig:${PKG_CONFIG_PATH}
diff --git a/tizen/src/Makefile b/tizen/src/Makefile
index 0242c8ed0a..605eb8235f 100755
--- a/tizen/src/Makefile
+++ b/tizen/src/Makefile
@@ -1,8 +1,4 @@
 EMUL_DIR=../emulator
-DIBS_X86_DIR=../x86
-DIBS_ARM_DIR=../arm
-DIBS_COMMON_DIR=../common
-DIBS_SKINS_DIR=../skins
 
 ifeq ($(CC),"")
 	@echo "cc does not exist"
@@ -140,12 +136,13 @@ ifdef CONFIG_LINUX
 endif
 
 ####### for dibs system...
+DIBS_X86_DIR=../x86
+DIBS_ARM_DIR=../arm
+DIBS_COMMON_DIR=../common
+DIBS_SKINS_DIR=../skins
+
 # DIBS classpath for emulator-skin.jar
-ifdef CONFIG_WIN32
-DIBS_SWT_DIR=-Dclasspath.dibs=${MSYS_ROOTDIR}/swt_4.3
-else
 DIBS_SWT_DIR=-Dclasspath.dibs=${ROOTDIR}/swt_4.3
-endif
 
 all_dibs: qemu skin_client_dibs
 skin_client_dibs: