Build: Modified build script. Applied 'MSYS_ROOTDIR'.

Change-Id: I4a514b69d0ea3bb3848a3554e2d8a04428bf8122
Signed-off-by: minkee.lee <minkee.lee@samsung.com>

diff --git a/package/build.windows-32 b/package/build.windows-32
index fbf76ea5622659f9f579ee6177167d44fa11a16f..e6bda30feec3a72cd55c923dae80625920f5080f 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
 

diff --git a/tizen/src/Makefile b/tizen/src/Makefile
index 8ee6a63d8c88c0850b327573876229acccf76cf3..15694b439b76e0f97414f71f7e4b0aa02266b339 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)/tools/emulator/bin
+else
+DIBS_SWT_DIR=-Dclasspath.dibs=$(ROOTDIR)/tools/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
@@ -231,7 +237,7 @@ ifdef CONFIG_USE_SHM
        TIZEN_SDK_DEV_PATH=${TIZEN_SDK_DEV_PATH} ant -DdoNotUseSHM=false ${DIBS_SWT_DIR} -buildfile skin/client/build.xml make-jar
 else
 ifdef CONFIG_SDL
-       TIZEN_SDK_DEV_PATH=${TIZEN_SDK_DEV_PATH} ant -DdoNotNotUseSHM=true ${DIBS_SWT_DIR} -buildfile skin/client/build.xml make-jar
+       TIZEN_SDK_DEV_PATH=${TIZEN_SDK_DEV_PATH} ant -DdoNotUseSHM=true ${DIBS_SWT_DIR} -buildfile skin/client/build.xml make-jar
 endif
 endif