Skip to content

Commit

Permalink
change environment variable from tizen_sdk to tizen_studio_home
Browse files Browse the repository at this point in the history
  • Loading branch information
zilongshanren committed Feb 9, 2017
1 parent fe9fe22 commit 190e050
Show file tree
Hide file tree
Showing 3 changed files with 8 additions and 8 deletions.
4 changes: 2 additions & 2 deletions build/tizen.ini
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
4 changes: 2 additions & 2 deletions contrib/bootstrap
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
8 changes: 4 additions & 4 deletions contrib/src/main.mak
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand Down

0 comments on commit 190e050

Please sign in to comment.