Commit 08be38d7 authored by Drake Arconis's avatar Drake Arconis

Update mac build

parent 4737592f
......@@ -15,6 +15,20 @@
<string>cef-bin</string>
<key>platforms</key>
<map>
<key>darwin</key>
<map>
<key>archive</key>
<map>
<key>hash</key>
<string>5ead5cb011448f843482c62a0467143a</string>
<key>hash_algorithm</key>
<string>md5</string>
<key>url</key>
<string>https://pkg.dl.alchemyviewer.org/cef_bin/cef_bin-75.1.14+gc81164e+chromium-75.0.3770.100.192081830-darwin-192081830.tar.bz2</string>
</map>
<key>name</key>
<string>darwin</string>
</map>
<key>darwin64</key>
<map>
<key>archive</key>
......@@ -55,7 +69,7 @@
</map>
</map>
<key>version</key>
<string>75.1.14+gc81164e+chromium-75.0.3770.100.192081218</string>
<string>75.1.14+gc81164e+chromium-75.0.3770.100.192081830</string>
</map>
</map>
<key>package_description</key>
......@@ -106,7 +120,7 @@
<key>name</key>
<string>common</string>
</map>
<key>darwin64</key>
<key>darwin</key>
<map>
<key>configurations</key>
<map>
......
......@@ -101,13 +101,13 @@ pushd "$DULLAHAN_SOURCE_DIR"
# create project file
cmake -G Xcode \
-DCMAKE_OSX_ARCHITECTURES="$AUTOBUILD_CONFIGURE_ARCH" \
-DCMAKE_OSX_ARCHITECTURES="x86_64" \
-DCEF_INCLUDE_DIR="$stage/packages/include/cef/include" \
-DCEF_LIB_DIR="$stage/packages/lib" \
-DCEF_BIN_DIR="$stage/packages/bin" \
-DCEF_RESOURCE_DIR="$stage/packages/resources" \
-DCMAKE_C_FLAGS:STRING="$LL_BUILD_RELEASE" \
-DCMAKE_CXX_FLAGS:STRING="$LL_BUILD_RELEASE" \
-DCMAKE_OSX_SYSROOT:STRING="macosx10.14" \
-DCMAKE_OSX_DEPLOYMENT_TARGET:STRING="10.13" \
..
# populate version_file (after CMake runs)
......
......@@ -76,8 +76,8 @@ if(CMAKE_SYSTEM_NAME STREQUAL "Windows")
set(CMAKE_CXX_FLAGS_DEBUG "${CMAKE_CXX_FLAGS_DEBUG} -W4 -wd4100 -wd4127 -wd4505")
set(CMAKE_CXX_FLAGS_RELEASE "${CMAKE_CXX_FLAGS_RELEASE} -W4 -wd4100 -wd4127 -wd4505")
elseif(CMAKE_SYSTEM_NAME STREQUAL "Darwin")
set(CMAKE_CXX_FLAGS_DEBUG "${CMAKE_CXX_FLAGS_DEBUG} -std=c++11 -xobjective-c++")
set(CMAKE_CXX_FLAGS_RELEASE "${CMAKE_CXX_FLAGS_RELEASE} -std=c++11 -xobjective-c++")
set(CMAKE_CXX_FLAGS_DEBUG "${CMAKE_CXX_FLAGS_DEBUG} -xobjective-c++")
set(CMAKE_CXX_FLAGS_RELEASE "${CMAKE_CXX_FLAGS_RELEASE} -xobjective-c++")
endif()
################################################################################
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment