From 96c3b162e5e4c037efd897ed34d5670200b39deb Mon Sep 17 00:00:00 2001 From: Michel Mastriani Date: Thu, 12 Mar 2020 23:05:06 -0300 Subject: [PATCH] Mac build adjustments --- Builds/QtCreator/defaults.pri | 4 ++-- Source/EmberCommon/EmberCommonPch.h | 9 +++++++++ archive/build.sh | 10 +++++----- 3 files changed, 16 insertions(+), 7 deletions(-) diff --git a/Builds/QtCreator/defaults.pri b/Builds/QtCreator/defaults.pri index 880c057..59f4371 100644 --- a/Builds/QtCreator/defaults.pri +++ b/Builds/QtCreator/defaults.pri @@ -216,8 +216,8 @@ win32 { } macx { - QMAKE_MAC_SDK = macosx10.14 - QMAKE_MACOSX_DEPLOYMENT_TARGET = 10.14 + QMAKE_MAC_SDK = macosx10.12 + QMAKE_MACOSX_DEPLOYMENT_TARGET = 10.12 QMAKE_CXXFLAGS += -mmacosx-version-min=10.9 -arch x86_64 QMAKE_CXXFLAGS += -stdlib=libc++ } diff --git a/Source/EmberCommon/EmberCommonPch.h b/Source/EmberCommon/EmberCommonPch.h index 0517231..72c3293 100644 --- a/Source/EmberCommon/EmberCommonPch.h +++ b/Source/EmberCommon/EmberCommonPch.h @@ -71,6 +71,15 @@ #include #define ENUM_DYLD_BOOL #include + + #define _MM_DENORMALS_ZERO_MASK 0x0040 + #define _MM_DENORMALS_ZERO_ON 0x0040 + #define _MM_DENORMALS_ZERO_OFF 0x0000 + + #define _MM_SET_DENORMALS_ZERO_MODE(mode) \ + _mm_setcsr((_mm_getcsr() & ~_MM_DENORMALS_ZERO_MASK) | (mode)) + #define _MM_GET_DENORMALS_ZERO_MODE() \ + (_mm_getcsr() & _MM_DENORMALS_ZERO_MASK) #else #include #include diff --git a/archive/build.sh b/archive/build.sh index 409c7d8..5989d3c 100755 --- a/archive/build.sh +++ b/archive/build.sh @@ -2,8 +2,8 @@ OSX_BUILD_PATH=$PWD FRACTORIUM_RELEASE_ROOT=$PWD/../Bin/release -# replace 5.11.2 by your QT version, and ensure the installation path is the same -QT_MACDEPLOY=~/Qt/5.12.2/clang_64/bin/macdeployqt +# replace 5.11.3 by your QT version, and ensure the installation path is the same +QT_MACDEPLOY=~/Qt/5.11.3/clang_64/bin/macdeployqt cd $FRACTORIUM_RELEASE_ROOT @@ -40,9 +40,9 @@ cp ./emberrender.app/Contents/MacOS/emberrender $FRACTORIUM_FINAL_ROOT #solving macdeployqt bug cd $FRACTORIUM_FINAL_FRAMEWORKS -install_name_tool -change /usr/local/Cellar/ilmbase/2.2.1/lib/libIex-2_2.23.dylib @executable_path/../Frameworks/libIex-2_2.23.dylib libIexMath-2_2.23.dylib -install_name_tool -change /usr/local/Cellar/ilmbase/2.2.1/lib/libIex-2_2.23.dylib @executable_path/../Frameworks/libIex-2_2.23.dylib libIlmThread-2_2.23.dylib -install_name_tool -change /usr/local/Cellar/ilmbase/2.2.1/lib/libIex-2_2.23.dylib @executable_path/../Frameworks/libIex-2_2.23.dylib libImath-2_2.23.dylib +install_name_tool -change /usr/local/Cellar/ilmbase/2.3.0/lib/libIex-2_3.24.dylib @executable_path/../Frameworks/libIex-2_3.24.dylib libIexMath-2_3.24.dylib +install_name_tool -change /usr/local/Cellar/ilmbase/2.3.0/lib/libIex-2_3.24.dylib @executable_path/../Frameworks/libIex-2_3.24.dylib libIlmThread-2_3.24.dylib +install_name_tool -change /usr/local/Cellar/ilmbase/2.3.0/lib/libIex-2_3.24.dylib @executable_path/../Frameworks/libIex-2_3.24.dylib libImath-2_3.24.dylib cd $OSX_BUILD_PATH