From 137cec47592ec5417b7903a1b4ac0d9266083dc2 Mon Sep 17 00:00:00 2001 From: Kitae Kim Date: Fri, 10 Oct 2014 10:28:47 +0900 Subject: [PATCH] build: remove gcc dependency on Mac OS X. Change-Id: I1ffa24aafe9fbdfddcb72e4d0ae4bf4e52ef2b87 Signed-off-by: Kitae Kim --- tizen/src/Makefile | 9 +++++++-- tizen/src/skin/client/build.xml | 4 ++-- tizen/src/skin/client/native_src/make_so_mac.sh | 4 ++-- 3 files changed, 11 insertions(+), 6 deletions(-) diff --git a/tizen/src/Makefile b/tizen/src/Makefile index f7e01f1..273bb8c 100644 --- a/tizen/src/Makefile +++ b/tizen/src/Makefile @@ -4,6 +4,11 @@ DIBS_ARM_DIR=../arm DIBS_COMMON_DIR=../common DIBS_SWT_DIR=-Dclasspath.dibs=$(ROOTDIR)/tools/emulator/bin +ifeq ($(CC),"") + @echo "cc does not exist" + @exit 1 +endif + ifndef TIZEN_SDK_DEV_PATH TIZEN_SDK_DEV_PATH=${HOME}/tizen-sdk-dev endif @@ -46,9 +51,9 @@ CHECK_GL_LDFLAGS += -mmacosx-version-min=10.4 `pkg-config --cflags --libs glib-2 endif util/check-gl$(EXESUF): $(CHECK_GL_OBJS) - gcc $(CHECK_GL_OBJS) $(CHECK_GL_LDFLAGS) -o $@ + $(CC) $(CHECK_GL_OBJS) $(CHECK_GL_LDFLAGS) -o $@ $(CHECK_GL_OBJS): %.o: %.c - gcc $< $(CHECK_GL_CFLAGS) -o $@ + $(CC) $< $(CHECK_GL_CFLAGS) -o $@ # Building check-cam CHECK_CAM_CFLAGS = -c diff --git a/tizen/src/skin/client/build.xml b/tizen/src/skin/client/build.xml index b1c27b1..305116c 100644 --- a/tizen/src/skin/client/build.xml +++ b/tizen/src/skin/client/build.xml @@ -123,7 +123,7 @@ - + @@ -131,7 +131,7 @@ - + diff --git a/tizen/src/skin/client/native_src/make_so_mac.sh b/tizen/src/skin/client/native_src/make_so_mac.sh index d7262f6..2ecbba9 100755 --- a/tizen/src/skin/client/native_src/make_so_mac.sh +++ b/tizen/src/skin/client/native_src/make_so_mac.sh @@ -5,5 +5,5 @@ javah -classpath ../emulator-skin.jar:../lib/swt.jar -jni org.tizen.emulator.skin.EmulatorShmSkin rm ./org_tizen_emulator_skin_EmulatorShmSkin_PollFBThread.h #TODO: jdk path -gcc -c share.c -o share.o -I/System/Library/Frameworks/JavaVM.framework/Headers -gcc -dynamiclib share.o -o libshared.dylib +cc -c share.c -o share.o -I/System/Library/Frameworks/JavaVM.framework/Headers +cc -dynamiclib share.o -o libshared.dylib -- 2.7.4