diff --git a/Builds/QtCreator/defaults.pri b/Builds/QtCreator/defaults.pri index ffd49ad..72381ef 100644 --- a/Builds/QtCreator/defaults.pri +++ b/Builds/QtCreator/defaults.pri @@ -217,8 +217,8 @@ win32 { macx { QMAKE_MAC_SDK = macosx10.14 - QMAKE_MACOSX_DEPLOYMENT_TARGET = 10.9 - QMAKE_CXXFLAGS += -mmacosx-version-min=10.9 -arch x86_64 + 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 fbade3d..bf24e70 100644 --- a/Source/EmberCommon/EmberCommonPch.h +++ b/Source/EmberCommon/EmberCommonPch.h @@ -67,9 +67,7 @@ #include #include #include - // #undef FALSE -- michel - // #undef TRUE -- michel - #define ENUM_DYLD_BOOL // michel + #define ENUM_DYLD_BOOL #include #else #include diff --git a/Source/EmberCommon/JpegUtils.h b/Source/EmberCommon/JpegUtils.h index 472c5e4..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); -#if defined(_WIN32) || defined(__APPLE__) // michel +#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 8bff4d6..086c066 100755 --- a/archive/build.sh +++ b/archive/build.sh @@ -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