diff --git a/Builds/QtCreator/defaults.pri b/Builds/QtCreator/defaults.pri index 391bf94..72381ef 100644 --- a/Builds/QtCreator/defaults.pri +++ b/Builds/QtCreator/defaults.pri @@ -216,9 +216,9 @@ win32 { } macx { - QMAKE_MAC_SDK = macosx10.11 - QMAKE_MACOSX_DEPLOYMENT_TARGET = 10.9 - QMAKE_CXXFLAGS += -mmacosx-version-min=10.9 -arch x86_64 + QMAKE_MAC_SDK = macosx10.14 + QMAKE_MACOSX_DEPLOYMENT_TARGET = 10.14 + 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 8f5a8dd..bf24e70 100644 --- a/Source/EmberCommon/EmberCommonPch.h +++ b/Source/EmberCommon/EmberCommonPch.h @@ -67,9 +67,8 @@ #include #include #include - #undef FALSE - #undef TRUE - #include + #define ENUM_DYLD_BOOL + #include #else #include #include diff --git a/Source/EmberCommon/JpegUtils.h b/Source/EmberCommon/JpegUtils.h index de6ce50..78f6d84 100644 --- a/Source/EmberCommon/JpegUtils.h +++ b/Source/EmberCommon/JpegUtils.h @@ -59,7 +59,7 @@ static bool WriteJpeg(const char* filename, byte* image, size_t width, size_t he info.image_width = JDIMENSION(width); info.image_height = JDIMENSION(height); jpeg_set_defaults(&info); -#ifdef _WIN32 +#if defined(_WIN32) || defined(__APPLE__) jpeg_set_quality(&info, quality, static_cast(TRUE)); jpeg_start_compress(&info, static_cast(TRUE)); //Win32:TRUE is defined in MSVC2013\Windows Kits\8.1\Include\shared\minwindef.h:"#define TRUE 1" diff --git a/archive/build.sh b/archive/build.sh index 1219d6f..086c066 100755 --- a/archive/build.sh +++ b/archive/build.sh @@ -38,11 +38,11 @@ cp ./emberanimate.app/Contents/MacOS/emberanimate $FRACTORIUM_FINAL_ROOT cp ./embergenome.app/Contents/MacOS/embergenome $FRACTORIUM_FINAL_ROOT cp ./emberrender.app/Contents/MacOS/emberrender $FRACTORIUM_FINAL_ROOT -#solving macdeployqt 5.9.3 bug (wasn't necessary when using 5.4.2) +#solving macdeployqt bug cd $FRACTORIUM_FINAL_FRAMEWORKS -install_name_tool -change /usr/local/Cellar/ilmbase/2.2.0/lib/libIex-2_2.12.dylib @executable_path/../Frameworks/libIex-2_2.12.dylib libIexMath-2_2.12.dylib -install_name_tool -change /usr/local/Cellar/ilmbase/2.2.0/lib/libIex-2_2.12.dylib @executable_path/../Frameworks/libIex-2_2.12.dylib libIlmThread-2_2.12.dylib -install_name_tool -change /usr/local/Cellar/ilmbase/2.2.0/lib/libIex-2_2.12.dylib @executable_path/../Frameworks/libIex-2_2.12.dylib libImath-2_2.12.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 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 cd $OSX_BUILD_PATH @@ -54,6 +54,7 @@ cp flam3-palettes.xml $FRACTORIUM_FINAL_ROOT cp *.gradient $FRACTORIUM_FINAL_ROOT cp *.ugr $FRACTORIUM_FINAL_ROOT cp Info.plist $FRACTORIUM_FINAL_ROOT/../ +cp -r Bench $FRACTORIUM_FINAL_ROOT cd $FRACTORIUM_RELEASE_ROOT