Build: Modified build script.

Change-Id: Ia212f4f83c062c6360835d9f0ed63e50cf6edd38
Signed-off-by: minkee.lee <minkee.lee@samsung.com>
Signed-off-by: GiWoong Kim <giwoong.kim@samsung.com>

diff --git a/package/build.windows-32 b/package/build.windows-32
index 345b56e9ef196bd035b39bcce93ae5436b11899e..61aa9f63bfcf5882f8353922c6791942cc1e2d7c 100755 (executable)
--- a/package/build.windows-32
+++ b/package/build.windows-32
@@ -33,7 +33,7 @@ prepare()
                exit 1
        fi
 
-       PURIFIED_ROOTDIR=`TEMP=\`echo "${ROOTDIR}" | cut -c-2 | sed "s/[:/]//g" | awk {'print tolower ($_)'}\`; echo \`echo "${ROOTDIR}" | sed "s/^../\/${TEMP}/"\``
+       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
        export PATH
 
@@ -48,6 +48,7 @@ prepare()
        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 "
+       echo $PURIFIED_ROOTDIR
 }
 
 # build

diff --git a/tizen/src/Makefile b/tizen/src/Makefile
index 273bb8c6ce398e49356a07a59bcb13890848a158..fb0aca2243c6a6ee99a8376f006d6b01ef2a061e 100644 (file)
--- a/tizen/src/Makefile
+++ b/tizen/src/Makefile
@@ -2,7 +2,6 @@ EMUL_DIR=../emulator
 DIBS_X86_DIR=../x86
 DIBS_ARM_DIR=../arm
 DIBS_COMMON_DIR=../common
-DIBS_SWT_DIR=-Dclasspath.dibs=$(ROOTDIR)/tools/emulator/bin
 
 ifeq ($(CC),"")
        @echo "cc does not exist"
@@ -32,6 +31,13 @@ qemu_clean:
 qemu_distclean:
        cd ../../ && $(MAKE) distclean
 
+# DIBS classpath for emulator-skin.jar
+ifdef CONFIG_WIN32
+DIBS_SWT_DIR=-Dclasspath.dibs=$(MSYS_ROOTDIR)/platforms/tizen-2.3/common/emulator/bin
+else
+DIBS_SWT_DIR=-Dclasspath.dibs=$(ROOTDIR)/platforms/tizen-2.3/common/emulator/bin
+endif
+
 # Building check-gl
 CHECK_GL_OBJS = util/check_gl.o util/check_gl_core.o
 CHECK_GL_CFLAGS = -c -I$(SRC_PATH)/hw/yagl/yagl_inc