Merged in mmastriani/fractorium_michel (pull request #48)

MacOS version updated to QT 5.12.8
This commit is contained in:
Michel Mastriani 2020-04-18 15:59:46 +00:00 committed by Matt Feemster
commit f54325dfd2
2 changed files with 3 additions and 3 deletions

View File

@ -216,8 +216,8 @@ win32 {
} }
macx { macx {
QMAKE_MAC_SDK = macosx10.12 QMAKE_MAC_SDK = macosx10.14
QMAKE_MACOSX_DEPLOYMENT_TARGET = 10.12 QMAKE_MACOSX_DEPLOYMENT_TARGET = 10.14
QMAKE_CXXFLAGS += -mmacosx-version-min=10.9 -arch x86_64 QMAKE_CXXFLAGS += -mmacosx-version-min=10.9 -arch x86_64
QMAKE_CXXFLAGS += -stdlib=libc++ QMAKE_CXXFLAGS += -stdlib=libc++
} }

View File

@ -2,7 +2,7 @@
OSX_BUILD_PATH=$PWD OSX_BUILD_PATH=$PWD
FRACTORIUM_RELEASE_ROOT=$PWD/../Bin/release FRACTORIUM_RELEASE_ROOT=$PWD/../Bin/release
# replace 5.11.3 by your QT version, and ensure the installation path is the same # replace 5.12.8 by your QT version, and ensure the installation path is the same
QT_MACDEPLOY=~/Qt/5.12.8/clang_64/bin/macdeployqt QT_MACDEPLOY=~/Qt/5.12.8/clang_64/bin/macdeployqt
cd $FRACTORIUM_RELEASE_ROOT cd $FRACTORIUM_RELEASE_ROOT