Skip to content

Commit

Permalink
build(xcode.mk,thirdparty.mk): add options for universal build and cu…
Browse files Browse the repository at this point in the history
…stom boost path
  • Loading branch information
lotem authored and LEOYoon-Tsaw committed Jan 18, 2021
1 parent 5a6aa59 commit 1363e47
Showing 1 changed file with 5 additions and 8 deletions.
13 changes: 5 additions & 8 deletions xcode.mk
Original file line number Diff line number Diff line change
Expand Up @@ -32,8 +32,6 @@ all: release
release:
cmake . -B$(build) -GXcode \
-DBUILD_STATIC=ON \
-DCMAKE_OSX_DEPLOYMENT_TARGET=10.7 \
-DCMAKE_CXX_FLAGS="-stdlib=libc++" \
-DCMAKE_BUILD_WITH_INSTALL_RPATH=ON \
-DCMAKE_INSTALL_PREFIX="$(dist_dir)" \
$(CMAKE_BOOST_OPTIONS)
Expand All @@ -42,10 +40,6 @@ release:
release-with-icu:
cmake . -B$(build) -GXcode \
-DBUILD_STATIC=ON \
-DCMAKE_OSX_DEPLOYMENT_TARGET=10.7 \
-DCMAKE_CXX_FLAGS="-stdlib=libc++" \
-DCMAKE_BUILD_WITH_INSTALL_RPATH=ON \
-DCMAKE_INSTALL_PREFIX="$(RIME_DIST_DIR)" \
-DBUILD_WITH_ICU=ON \
-DCMAKE_BUILD_WITH_INSTALL_RPATH=ON \
-DCMAKE_INSTALL_PREFIX="$(dist_dir)" \
Expand Down Expand Up @@ -92,7 +86,10 @@ test-debug: debug
(cd $(build)/test; Debug/rime_test)

thirdparty:
$(RIME_COMPILER_OPTIONS) make CFLAGS='-mmacosx-version-min=10.7 -stdlib=libc++' -f thirdparty.mk
make -f thirdparty.mk

thirdparty/boost:
./install-boost.sh

thirdparty/%:
$(RIME_COMPILER_OPTIONS) make CFLAGS='-mmacosx-version-min=10.7 -f thirdparty.mk $(@:thirdparty/%=%)
make -f thirdparty.mk $(@:thirdparty/%=%)

0 comments on commit 1363e47

Please sign in to comment.