From dc3ceac21d1e1fe2dc5e59465032e80bb7d5148c Mon Sep 17 00:00:00 2001 From: Tindy X <49061470+tindy2013@users.noreply.github.com> Date: Thu, 26 Dec 2019 21:50:20 +0800 Subject: [PATCH] Update build script --- CMakeLists.txt | 4 ++++ scripts/build.macos.release.sh | 4 ++-- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index ddd9903..00ed11d 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -7,6 +7,10 @@ ENDIF() SET(CMAKE_CXX_STANDARD 17) ADD_DEFINITIONS(-Wall -Wextra -Wno-unused-parameter -Wno-unused-result) +IF(MACOS) + ADD_DEFINITIONS(_MACOS) +ENDIF() + ADD_EXECUTABLE(subconverter src/logger.cpp src/main.cpp diff --git a/scripts/build.macos.release.sh b/scripts/build.macos.release.sh index 8eda4f1..c4bfe38 100644 --- a/scripts/build.macos.release.sh +++ b/scripts/build.macos.release.sh @@ -21,8 +21,8 @@ cp /usr/local/lib/libpcre.a . cp /usr/local/lib/libpcrecpp.a . cp /usr/local/opt/bzip2/lib/libbz2.a . -export CMAKE_CXX_FLAGS="-D_MACOS -I/usr/local/include -I/usr/local/opt/openssl@1.1/include -I/usr/local/opt/curl/include" -cmake -DOPENSSL_ROOT_DIR=/usr/local/opt/openssl@1.1 . +export CMAKE_CXX_FLAGS="-I/usr/local/include -I/usr/local/opt/openssl@1.1/include -I/usr/local/opt/curl/include" +cmake -DOPENSSL_ROOT_DIR=/usr/local/opt/openssl@1.1 -DMACOS=on . make -j8 c++ -Xlinker -unexported_symbol -Xlinker "*" -o base/subconverter CMakeFiles/subconverter.dir/src/*.o libpcrecpp.a libpcre.a libevent.a libcurl.a libz.a libssl.a libcrypto.a libyaml-cpp.a libbz2.a -ldl -lpthread -O3