summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJunghoon Park <jh9216.park@samsung.com>2018-07-11 09:18:38 +0900
committerJunghoon Park <jh9216.park@samsung.com>2018-07-11 09:18:38 +0900
commitad20daebcff7cd40374f2f11d052be3e6eda56c6 (patch)
treed1bdd3c1d1f048776eadf9a884e27e5073453cf6
parentab676838c797041804cdefaf86da67c74310a4be (diff)
downloadtidl-ad20daebcff7cd40374f2f11d052be3e6eda56c6.tar.gz
tidl-ad20daebcff7cd40374f2f11d052be3e6eda56c6.tar.bz2
tidl-ad20daebcff7cd40374f2f11d052be3e6eda56c6.zip
Support build for 64bit Mac OS
Change-Id: I3f10bebe0d00f706581495ab036c7389b6504209 Signed-off-by: Junghoon Park <jh9216.park@samsung.com>
-rwxr-xr-xbuild.sh12
-rw-r--r--idlc/CMakeLists.txt23
2 files changed, 27 insertions, 8 deletions
diff --git a/build.sh b/build.sh
index e54447d..acfecac 100755
--- a/build.sh
+++ b/build.sh
@@ -16,6 +16,7 @@ usage() {
echo " build Build the package"
echo " build_win Build the package for 64bit Windows"
echo " build_win32 Build the package for 32bit Windows"
+ echo " build_mac Build the package for 64bit macos"
echo " clean Clean all artifacts"
echo " clean_build Clean & Build the package"
}
@@ -30,6 +31,16 @@ cmd_build() {
make
}
+cmd_build_mac() {
+ echo "[TIDL] Build the package"
+ mkdir -p $SCRIPT_DIR/$BUILD_DIR
+ cd $SCRIPT_DIR/$BUILD_DIR
+ VER=`cat ../packaging/tidl.spec | grep 'Version' | sed 's/Version://' | tr -d ' \r'`
+ cmake .. -DFULLVER=$VER -DMINIMUM_BUILD="yes" -DBUILD_MACOS="yes"
+ make clean
+ make
+}
+
cmd_build_win() {
echo "[TIDL] Build the package"
mkdir -p $SCRIPT_DIR/$BUILD_DIR
@@ -70,6 +81,7 @@ case "$cmd" in
build|--build|-b) cmd_build $@ ;;
build_win|--build_win|-bw) cmd_build_win $@ ;;
build_win32|--build_win32|-bw32) cmd_build_win32 $@ ;;
+ build_mac|--build_mac|-bm) cmd_build_mac $@ ;;
clean|--clean|-c) cmd_clean $@ ;;
clean_build |--clean_build |-cb) cmd_clean_build $@ ;;
*) usage ;;
diff --git a/idlc/CMakeLists.txt b/idlc/CMakeLists.txt
index 44b8124..0cabeef 100644
--- a/idlc/CMakeLists.txt
+++ b/idlc/CMakeLists.txt
@@ -6,20 +6,27 @@ ENDFOREACH(flag)
LINK_DIRECTORIES(${LIBPKGS_LIBRARY_DIRS})
IF(DEFINED BUILD_WIN)
-IF(DEFINED BUILD_32)
-SET(CMAKE_CXX_COMPILER "i686-w64-mingw32-g++")
-ELSE(DEFINED BUILD_32)
-SET(CMAKE_CXX_COMPILER "x86_64-w64-mingw32-g++")
-ENDIF(DEFINED BUILD_32)
-SET(EXE_STATIC "-static")
+ IF(DEFINED BUILD_32)
+ SET(CMAKE_CXX_COMPILER "i686-w64-mingw32-g++")
+ ELSE(DEFINED BUILD_32)
+ SET(CMAKE_CXX_COMPILER "x86_64-w64-mingw32-g++")
+ ENDIF(DEFINED BUILD_32)
+ SET(EXE_STATIC "-static")
ENDIF(DEFINED BUILD_WIN)
+IF(DEFINED BUILD_MACOS)
+ SET(CMAKE_CXX_COMPILER "x86_64-apple-darwin15-clang++")
+ SET(EXTRA_CFLAGS "${EXTRA_CFLAGS} -stdlib=libc++")
+ELSE(DEFINED BUILD_MACOS)
+ SET(CMAKE_EXE_LINKER_FLAGS "-static-libgcc")
+ SET(EXTRA_CFLAGS "${EXTRA_CFLAGS} -Werror")
+ENDIF(DEFINED BUILD_MACOS)
+
SET(EXTRA_CFLAGS "${EXTRA_CFLAGS} -Wno-unused-function -Wno-sign-compare")
SET(EXTRA_CFLAGS "${EXTRA_CFLAGS} -fvisibility=hidden")
-SET(EXTRA_CFLAGS "${EXTRA_CFLAGS} -Werror")
SET(EXTRA_CFLAGS "${EXTRA_CFLAGS} -std=c++11")
SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${EXTRA_CFLAGS}")
-SET(CMAKE_EXE_LINKER_FLAGS "-static-libgcc -static-libstdc++")
+SET(CMAKE_EXE_LINKER_FLAGS "-static-libstdc++")
SET(CMAKE_SHARED_LIBRARY_LINK_CXX_FLAGS "")
ADD_DEFINITIONS("-DFULLVER=\"${FULLVER}\"")