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

successful Mac build on OSX 10.10

Browse Source
This commit is contained in:
Gambhiro 2015-12-09 16:14:33 +00:00
parent fd6e14d651
commit 66aa8fa6a1
5 changed files with 14 additions and 40 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
Builds/QtCreator/Fractorium/Fractorium.pro
View File

@ -7,6 +7,10 @@ TARGET = fractorium
include(../defaults.pri)
# TODO: Figure out how to build the app bundle correctly.
# This will build a binary instead of an app bundle.
macx:CONFIG -= app_bundle
PRJ_DIR = $$SRC_DIR/Fractorium
target.path = $$BIN_INSTALL_DIR
@ -16,8 +20,7 @@ assets.path = $$SHARE_INSTALL_DIR
assets.files = $$ASSETS_DIR/flam3-palettes.xml $$ASSETS_DIR/dark.qss
INSTALLS += assets
# FIXME: move to Data and install to $$SHARE_INSTALL_DIR ?
macx:ICON = ../../package/osx/Fractorium.icns
macx:ICON = $$ASSETS_DIR/Fractorium.icns
LIBS += -L$$absolute_path($$DESTDIR) -lEmber
LIBS += -L$$absolute_path($$DESTDIR) -lEmberCL

9
Builds/QtCreator/defaults.pri
View File

@ -1,7 +1,7 @@
VERSION = 0.9.9.2
# When this file is included:
# - $$PWD is ./Builds/QtCreator/
# - $$(PWD) is ./Builds/QtCreator/
# - $(PWD) is the project folder, e.g. ./Builds/QtCreator/Ember/
LIB_INSTALL_DIR = /usr/lib
@ -29,11 +29,12 @@ macx {
LIBS += -L/usr/local/lib
INCLUDEPATH += /usr/local/include
INCLUDEPATH += $(PWD)/../Deps
INCLUDEPATH += $$(PWD)/../../../Deps
QMAKE_MAC_SDK = macosx10.9
QMAKE_MAC_SDK = macosx10.11
QMAKE_MACOSX_DEPLOYMENT_TARGET = 10.9
QMAKE_CXXFLAGS += -mmacosx-version-min=10.9 -arch x86_64
QMAKE_CXXFLAGS += -stdlib=libc++
} else {
CONFIG += precompile_header

30
Builds/package/osx/build_osx_package.sh
View File

@ -1,30 +0,0 @@
#!/bin/bash
DIR=$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )
FRACTORIUM_ROOT=$DIR/../../..
PACKAGE=$FRACTORIUM_ROOT/release/Fractorium.app
export QMAKE=~/Qt/5.4.2-static/qtbase/bin/qmake
# Uncomment to force rebuild of package every time
# Probably a good idea in future
rm -rf "$FRACTORIUM_ROOT/release"
$FRACTORIUM_ROOT/Builds/QtCreator/build_all.sh --rebuild
cp $FRACTORIUM_ROOT/Data/flam3-palettes.xml $PACKAGE/Contents/MacOS/
export DYLD_LIBRARY_PATH=/usr/lib:/usr/local/lib:$FRACTORIUM_ROOT/release
cp /usr/lib/libxml2* $PACKAGE/Contents/libs
install_name_tool -id @executable_path/../libs/libxml2.2.dylib $PACKAGE/Contents/libs/libxml2.2.dylib
install_name_tool -change /usr/lib/libxml2.2.dylib @executable_path/../libs/libxml2.2.dylib $PACKAGE/Contents/MacOS/Fractorium
dylibbundler -od -b -x $PACKAGE/Contents/MacOS/Fractorium -d $PACKAGE/Contents/libs
for i in EmberAnimate EmberGenome EmberRender
do
cp $FRACTORIUM_ROOT/release/$i $PACKAGE/Contents/MacOS/
dylibbundler -od -b -x $PACKAGE/Contents/MacOS/$i -d $PACKAGE/Contents/libs
install_name_tool -change /usr/lib/libxml2.2.dylib @executable_path/../libs/libxml2.2.dylib $PACKAGE/Contents/MacOS/$i
done

0
Builds/package/osx/Fractorium.icns → Data/Fractorium.icns
View File

8
Source/Ember/Isaac.h
View File

@ -202,7 +202,7 @@ public:
static inline floatType LockedFrand(floatType fMin, floatType fMax)
{
m_CS.Enter();
floatType t = GlobalRand->Frand<floatType>(fMin, fMax);
floatType t = GlobalRand->template Frand<floatType>(fMin, fMax);
m_CS.Leave();
return t;
}
@ -230,7 +230,7 @@ public:
static inline floatType LockedFrand01()
{
m_CS.Enter();
floatType t = GlobalRand->Frand01<floatType>();
floatType t = GlobalRand->template Frand01<floatType>();
m_CS.Leave();
return t;
}
@ -258,7 +258,7 @@ public:
static inline floatType LockedFrand11()
{
m_CS.Enter();
floatType t = GlobalRand->Frand11<floatType>();
floatType t = GlobalRand->template Frand11<floatType>();
m_CS.Leave();
return t;
}
@ -281,7 +281,7 @@ public:
static inline floatType LockedGoldenBit()
{
m_CS.Enter();
floatType t = GlobalRand->GoldenBit<floatType>();
floatType t = GlobalRand->template GoldenBit<floatType>();
m_CS.Leave();
return t;
}