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

--Bug fixes

Browse Source 
-Update Mac build script build.sh.
 -Remove legacy build_osx_package.sh script.
 -Fix affine zooming bug on Mac.
This commit is contained in:
Person 2017-02-27 16:11:51 -08:00
parent 29c084a058
commit 9b810d529f
3 changed files with 7 additions and 35 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
Source/Fractorium/GLWidget.cpp
View File

@ -683,7 +683,11 @@ void GLEmberController<T>::Wheel(QWheelEvent* e)
{ {
if ((e->modifiers() & Qt::AltModifier) && m_Fractorium->DrawXforms()) if ((e->modifiers() & Qt::AltModifier) && m_Fractorium->DrawXforms())
{ {
#ifdef __APPLE__
m_FractoriumEmberController->ChangeLockedScale(e->angleDelta().y() >= 0 ? 1.0981 : 0.9);
#else
m_FractoriumEmberController->ChangeLockedScale(e->angleDelta().x() >= 0 ? 1.0981 : 0.9); m_FractoriumEmberController->ChangeLockedScale(e->angleDelta().x() >= 0 ? 1.0981 : 0.9);
#endif
m_GL->update(); m_GL->update();
} }
else else

8
archive/build.sh
View File

@ -2,8 +2,8 @@
OSX_BUILD_PATH=$PWD OSX_BUILD_PATH=$PWD
FRACTORIUM_RELEASE_ROOT=$PWD/../Bin/release FRACTORIUM_RELEASE_ROOT=$PWD/../Bin/release
QT_MACDEPLOY=/Users/mastriani/Qt/5.4/clang_64/bin/macdeployqt # replace 5.4 by your QT version, and check if the instation path is the same
QT_MACDEPLOY=~/Qt/5.4/clang_64/bin/macdeployqt
cd $FRACTORIUM_RELEASE_ROOT cd $FRACTORIUM_RELEASE_ROOT
@ -39,14 +39,12 @@ cp ./emberrender.app/Contents/MacOS/emberrender $FRACTORIUM_FINAL_ROOT
cd $OSX_BUILD_PATH cd $OSX_BUILD_PATH
#python macdeployqtfix.py $FRACTORIUM_FINAL_ROOT/fractorium /Users/mastriani/Qt/5.4/
cd ../Data cd ../Data
cp dark.qss $FRACTORIUM_FINAL_ROOT cp dark.qss $FRACTORIUM_FINAL_ROOT
cp flam3-palettes.xml $FRACTORIUM_FINAL_ROOT cp flam3-palettes.xml $FRACTORIUM_FINAL_ROOT
cp *.gradient $FRACTORIUM_FINAL_ROOT
cp Info.plist $FRACTORIUM_FINAL_ROOT/../ cp Info.plist $FRACTORIUM_FINAL_ROOT/../
#cp fractoriumcaller $FRACTORIUM_FINAL_ROOT
cd $FRACTORIUM_RELEASE_ROOT cd $FRACTORIUM_RELEASE_ROOT

30
archive/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