diff --git a/Source/Fractorium/GLWidget.cpp b/Source/Fractorium/GLWidget.cpp index 07a9b21..eb546f4 100644 --- a/Source/Fractorium/GLWidget.cpp +++ b/Source/Fractorium/GLWidget.cpp @@ -683,7 +683,11 @@ void GLEmberController::Wheel(QWheelEvent* e) { 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); +#endif m_GL->update(); } else diff --git a/archive/build.sh b/archive/build.sh index a037960..7543119 100644 --- a/archive/build.sh +++ b/archive/build.sh @@ -2,8 +2,8 @@ OSX_BUILD_PATH=$PWD 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 @@ -39,14 +39,12 @@ cp ./emberrender.app/Contents/MacOS/emberrender $FRACTORIUM_FINAL_ROOT cd $OSX_BUILD_PATH -#python macdeployqtfix.py $FRACTORIUM_FINAL_ROOT/fractorium /Users/mastriani/Qt/5.4/ - cd ../Data cp dark.qss $FRACTORIUM_FINAL_ROOT cp flam3-palettes.xml $FRACTORIUM_FINAL_ROOT +cp *.gradient $FRACTORIUM_FINAL_ROOT cp Info.plist $FRACTORIUM_FINAL_ROOT/../ -#cp fractoriumcaller $FRACTORIUM_FINAL_ROOT cd $FRACTORIUM_RELEASE_ROOT diff --git a/archive/build_osx_package.sh b/archive/build_osx_package.sh deleted file mode 100755 index 751b4e2..0000000 --- a/archive/build_osx_package.sh +++ /dev/null @@ -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 -