diff --git a/build/tizen.ini b/build/tizen.ini index e5ed2536..06dd5481 100644 --- a/build/tizen.ini +++ b/build/tizen.ini @@ -16,8 +16,8 @@ cfg_x86_host_machine="i386-linux-gnueabi" #only cross compile should define thse variables cfg_is_cross_compile=yes #all these values are arch-specificed values -cfg_armv7_toolchain_bin="${TIZEN_SDK}/tools/arm-linux-gnueabi-gcc-${cfg_default_gcc_version}/bin" -cfg_x86_toolchain_bin="${TIZEN_SDK}/tools/i386-linux-gnueabi-gcc-${cfg_default_gcc_version}/bin" +cfg_armv7_toolchain_bin="${TIZEN_STUDIO_HOME}/tools/arm-linux-gnueabi-gcc-${cfg_default_gcc_version}/bin" +cfg_x86_toolchain_bin="${TIZEN_STUDIO_HOME}/tools/i386-linux-gnueabi-gcc-${cfg_default_gcc_version}/bin" #build arches and build libraries diff --git a/contrib/bootstrap b/contrib/bootstrap index fa5b551c..b1a16030 100755 --- a/contrib/bootstrap +++ b/contrib/bootstrap @@ -345,8 +345,8 @@ check_android_sdk() check_tizen_sdk() { - [ -z "${TIZEN_SDK}" ] && echo "You must set TIZEN_SDK environment variable" && exit 1 - add_make "TIZEN_SDK := ${TIZEN_SDK}" + [ -z "${TIZEN_STUDIO_HOME}" ] && echo "You must set TIZEN_STUDIO_HOME environment variable" && exit 1 + add_make "TIZEN_STUDIO_HOME := ${TIZEN_STUDIO_HOME}" } test -z "$PREFIX" || add_make "PREFIX := $PREFIX" diff --git a/contrib/src/main.mak b/contrib/src/main.mak index 52fe1a8d..69fb286b 100644 --- a/contrib/src/main.mak +++ b/contrib/src/main.mak @@ -97,11 +97,11 @@ endif ifdef HAVE_TIZEN ifeq ($(ARCH),arm) -CC := ${HOST}-gcc --sysroot=$(TIZEN_SDK)/platforms/tizen-$(TIZEN_SDK_VERSION)/mobile/rootstraps/mobile-$(TIZEN_SDK_VERSION)-device.core -CXX := ${HOST}-g++ --sysroot=$(TIZEN_SDK)/platforms/tizen-$(TIZEN_SDK_VERSION)/mobile/rootstraps/mobile-$(TIZEN_SDK_VERSION)-device.core +CC := ${HOST}-gcc --sysroot=$(TIZEN_STUDIO_HOME)/platforms/tizen-$(TIZEN_SDK_VERSION)/mobile/rootstraps/mobile-$(TIZEN_SDK_VERSION)-device.core +CXX := ${HOST}-g++ --sysroot=$(TIZEN_STUDIO_HOME)/platforms/tizen-$(TIZEN_SDK_VERSION)/mobile/rootstraps/mobile-$(TIZEN_SDK_VERSION)-device.core else -CC := ${HOST}-gcc --sysroot=$(TIZEN_SDK)/platforms/tizen-$(TIZEN_SDK_VERSION)/mobile/rootstraps/mobile-$(TIZEN_SDK_VERSION)-emulator.core -CXX := ${HOST}-g++ --sysroot=$(TIZEN_SDK)/platforms/tizen-$(TIZEN_SDK_VERSION)/mobile/rootstraps/mobile-$(TIZEN_SDK_VERSION)-emulator.core +CC := ${HOST}-gcc --sysroot=$(TIZEN_STUDIO_HOME)/platforms/tizen-$(TIZEN_SDK_VERSION)/mobile/rootstraps/mobile-$(TIZEN_SDK_VERSION)-emulator.core +CXX := ${HOST}-g++ --sysroot=$(TIZEN_STUDIO_HOME)/platforms/tizen-$(TIZEN_SDK_VERSION)/mobile/rootstraps/mobile-$(TIZEN_SDK_VERSION)-emulator.core endif endif