mirror of
https://bitbucket.org/mfeemster/fractorium.git
synced 2025-01-21 21:20:07 -05:00
1dfbd4eff2
-Add new preset dimensions to the right click menu of the width and height fields in the editor. -Change QSS stylesheets to properly handle tabs. -Make tabs rectangular by default. For some reason, they had always been triangular. --Bug fixes -Incremental rendering times in the editor were wrong. --Code changes -Migrate to Qt6. There is probably more work to be done here. -Migrate to VS2022. -Migrate to Wix 4 installer. -Change installer to install to program files for all users. -Fix many VS2022 code analysis warnings. -No longer use byte typedef, because std::byte is now a type. Revert all back to unsigned char. -Upgrade OpenCL headers to version 3.0 and keep locally now rather than trying to look for system files. -No longer link to Nvidia or AMD specific OpenCL libraries. Use the generic installer located at OCL_ROOT too. -Add the ability to change OpenCL grid dimensions. This was attempted for investigating possible performance improvments, but made no difference. This has not been verified on Linux or Mac yet.
67 lines
3.0 KiB
Bash
Executable File
67 lines
3.0 KiB
Bash
Executable File
#!/bin/bash
|
|
|
|
OSX_BUILD_PATH=$PWD
|
|
FRACTORIUM_RELEASE_ROOT=$PWD/../Bin/release
|
|
# replace 5.12.8 by your QT version, and ensure the installation path is the same
|
|
QT_MACDEPLOY=~/Qt/5.12.8/clang_64/bin/macdeployqt
|
|
|
|
cd $FRACTORIUM_RELEASE_ROOT
|
|
|
|
EMBERANIMATE_FINAL_ROOT=$PWD/emberanimate.app/Contents/MacOS
|
|
EMBERGENOME_FINAL_ROOT=$PWD/embergenome.app/Contents/MacOS
|
|
EMBERRENDER_FINAL_ROOT=$PWD/emberrender.app/Contents/MacOS
|
|
FRACTORIUM_FINAL_ROOT=$PWD/fractorium.app/Contents/MacOS
|
|
FRACTORIUM_FINAL_FRAMEWORKS=$PWD/fractorium.app/Contents/Frameworks
|
|
|
|
install_name_tool -id $PWD/libember.dylib libember.dylib
|
|
install_name_tool -id $PWD/libembercl.dylib libembercl.dylib
|
|
install_name_tool -change libember.dylib $PWD/libember.dylib libembercl.dylib
|
|
|
|
install_name_tool -change libember.dylib $PWD/libember.dylib $EMBERANIMATE_FINAL_ROOT/emberanimate
|
|
install_name_tool -change libembercl.dylib $PWD/libembercl.dylib $EMBERANIMATE_FINAL_ROOT/emberanimate
|
|
|
|
install_name_tool -change libember.dylib $PWD/libember.dylib $EMBERGENOME_FINAL_ROOT/embergenome
|
|
install_name_tool -change libembercl.dylib $PWD/libembercl.dylib $EMBERGENOME_FINAL_ROOT/embergenome
|
|
|
|
install_name_tool -change libember.dylib $PWD/libember.dylib $EMBERRENDER_FINAL_ROOT/emberrender
|
|
install_name_tool -change libembercl.dylib $PWD/libembercl.dylib $EMBERRENDER_FINAL_ROOT/emberrender
|
|
|
|
install_name_tool -change libember.dylib $PWD/libember.dylib $FRACTORIUM_FINAL_ROOT/fractorium
|
|
install_name_tool -change libembercl.dylib $PWD/libembercl.dylib $FRACTORIUM_FINAL_ROOT/fractorium
|
|
|
|
$QT_MACDEPLOY emberanimate.app
|
|
$QT_MACDEPLOY embergenome.app
|
|
$QT_MACDEPLOY emberrender.app
|
|
$QT_MACDEPLOY fractorium.app
|
|
|
|
cp ./emberanimate.app/Contents/MacOS/emberanimate $FRACTORIUM_FINAL_ROOT
|
|
cp ./embergenome.app/Contents/MacOS/embergenome $FRACTORIUM_FINAL_ROOT
|
|
cp ./emberrender.app/Contents/MacOS/emberrender $FRACTORIUM_FINAL_ROOT
|
|
|
|
#solving macdeployqt bug
|
|
cd $FRACTORIUM_FINAL_FRAMEWORKS
|
|
install_name_tool -change /usr/local/Cellar/ilmbase/2.3.0/lib/libIex-2_3.24.dylib @executable_path/../Frameworks/libIex-2_3.24.dylib libIexMath-2_3.24.dylib
|
|
install_name_tool -change /usr/local/Cellar/ilmbase/2.3.0/lib/libIex-2_3.24.dylib @executable_path/../Frameworks/libIex-2_3.24.dylib libIlmThread-2_3.24.dylib
|
|
install_name_tool -change /usr/local/Cellar/ilmbase/2.3.0/lib/libIex-2_3.24.dylib @executable_path/../Frameworks/libIex-2_3.24.dylib libImath-2_3.24.dylib
|
|
|
|
cd $OSX_BUILD_PATH
|
|
|
|
cd ../Data
|
|
|
|
cp dark_mac.qss $FRACTORIUM_FINAL_ROOT
|
|
cp lightdark.qss $FRACTORIUM_FINAL_ROOT
|
|
cp uranium.qss $FRACTORIUM_FINAL_ROOT
|
|
cp flam3-palettes.xml $FRACTORIUM_FINAL_ROOT
|
|
cp *.gradient $FRACTORIUM_FINAL_ROOT
|
|
cp *.ugr $FRACTORIUM_FINAL_ROOT
|
|
cp fractorium-sh $FRACTORIUM_FINAL_ROOT
|
|
cp Info.plist $FRACTORIUM_FINAL_ROOT/../
|
|
cp -r Bench $FRACTORIUM_FINAL_ROOT
|
|
cp -r examples $FRACTORIUM_FINAL_ROOT
|
|
|
|
cd $FRACTORIUM_RELEASE_ROOT
|
|
|
|
mv fractorium.app Fractorium.app
|
|
|
|
hdiutil create -format UDBZ -quiet -srcfolder Fractorium.app Fractorium.dmg
|