mirror-github-bspeice/fractorium
1
0
Fork 0
mirror of https://bitbucket.org/mfeemster/fractorium.git synced 2025-01-21 05:00:06 -05:00
Code Issues Actions Packages Projects Releases Wiki Activity

finishing mac build

Browse Source
This commit is contained in:
Michel Mastriani 2019-05-16 22:06:09 -03:00
parent 7d8007d3f7
commit d2d5a0d55b
4 changed files with 5 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
Builds/QtCreator/defaults.pri
View File

@ -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++
}

4
Source/EmberCommon/EmberCommonPch.h
View File

@ -67,9 +67,7 @@
#include <OpenEXR/ImfRgbaFile.h>
#include <OpenEXR/ImfStringAttribute.h>
#include <OpenEXR/half.h>
// #undef FALSE -- michel
// #undef TRUE -- michel
#define ENUM_DYLD_BOOL // michel
#define ENUM_DYLD_BOOL
#include <mach-o/dyld.h>
#else
#include <ImfRgbaFile.h>

2
Source/EmberCommon/JpegUtils.h
View File

@ -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<boolean>(TRUE));
jpeg_start_compress(&info, static_cast<boolean>(TRUE));
//Win32:TRUE is defined in MSVC2013\Windows Kits\8.1\Include\shared\minwindef.h:"#define TRUE 1"

1
archive/build.sh
View File

@ -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