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

Mac build

Browse Source
This commit is contained in:
Mastriani 2019-05-16 21:23:46 -03:00
parent 71b362efb7
commit 9f7535a08a
4 changed files with 10 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Builds/QtCreator/defaults.pri
View File

@ -216,7 +216,7 @@ win32 {
} }
macx { macx {
QMAKE_MAC_SDK = macosx10.11 QMAKE_MAC_SDK = macosx10.14
QMAKE_MACOSX_DEPLOYMENT_TARGET = 10.9 QMAKE_MACOSX_DEPLOYMENT_TARGET = 10.9
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++

5
Source/EmberCommon/EmberCommonPch.h
View File

@ -67,8 +67,9 @@
#include <OpenEXR/ImfRgbaFile.h> #include <OpenEXR/ImfRgbaFile.h>
#include <OpenEXR/ImfStringAttribute.h> #include <OpenEXR/ImfStringAttribute.h>
#include <OpenEXR/half.h> #include <OpenEXR/half.h>
#undef FALSE // #undef FALSE -- michel
#undef TRUE // #undef TRUE -- michel
#define ENUM_DYLD_BOOL // michel
#include <mach-o/dyld.h> #include <mach-o/dyld.h>
#else #else
#include <ImfRgbaFile.h> #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_width = JDIMENSION(width);
info.image_height = JDIMENSION(height); info.image_height = JDIMENSION(height);
jpeg_set_defaults(&info); jpeg_set_defaults(&info);
#ifdef _WIN32 #if defined(_WIN32) || defined(__APPLE__) // michel
jpeg_set_quality(&info, quality, static_cast<boolean>(TRUE)); jpeg_set_quality(&info, quality, static_cast<boolean>(TRUE));
jpeg_start_compress(&info, 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" //Win32:TRUE is defined in MSVC2013\Windows Kits\8.1\Include\shared\minwindef.h:"#define TRUE 1"

8
archive/build.sh
View File

@ -38,11 +38,11 @@ cp ./emberanimate.app/Contents/MacOS/emberanimate $FRACTORIUM_FINAL_ROOT
cp ./embergenome.app/Contents/MacOS/embergenome $FRACTORIUM_FINAL_ROOT cp ./embergenome.app/Contents/MacOS/embergenome $FRACTORIUM_FINAL_ROOT
cp ./emberrender.app/Contents/MacOS/emberrender $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 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.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.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.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.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 libImath-2_2.23.dylib
cd $OSX_BUILD_PATH cd $OSX_BUILD_PATH