mirror of
https://bitbucket.org/mfeemster/fractorium.git
synced 2025-01-22 05:30:06 -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.
72 lines
1.9 KiB
Prolog
72 lines
1.9 KiB
Prolog
TEMPLATE = app
|
|
CONFIG += console
|
|
|
|
# Uncomment this if you only want to build a binary instead of an app bundle.
|
|
#macx:CONFIG -= app_bundle
|
|
|
|
CONFIG -= qt
|
|
|
|
TARGET = emberrender
|
|
|
|
include(../defaults.pri)
|
|
|
|
#Point to visual studio resource file to embed file information and icon.
|
|
win32 {
|
|
RC = $$RCPATH/EmberRender.rc
|
|
win32:RC_FILE = $$RC
|
|
#message(RC_FILE: $$RC)
|
|
}
|
|
|
|
#Go up one folder because the paths defined in defaults were relative to it, which is up one folder.
|
|
PRJ_SRC_DIR = $$absolute_path($$EMBER_ROOT/../Source/EmberRender)
|
|
#message(PRJ_SRC_DIR: $$PRJ_SRC_DIR)
|
|
|
|
target.path = $$BIN_INSTALL_DIR
|
|
#message(TARGET INSTALL: $$target.path)
|
|
INSTALLS += target
|
|
|
|
palettes.path = $$SHARE_INSTALL_DIR
|
|
palettes.files = $$ASSETS_DIR/flam3-palettes.xml
|
|
#message(PALETTE INSTALL SOURCE: $$palettes.files)
|
|
INSTALLS += palettes
|
|
|
|
themes.path = $$SHARE_INSTALL_DIR
|
|
themes.files = $$ASSETS_DIR/dark.qss
|
|
#message(THEMES INSTALL SOURCE: $$themes.files)
|
|
INSTALLS += themes
|
|
|
|
!win32 {
|
|
icon.path = $$SHARE_INSTALL_DIR
|
|
icon.files = $$absolute_path($$PRJ_SRC_DIR/Icons/Fractorium.png)
|
|
#message(ICON INSTALL SOURCE: $$icon.files)
|
|
INSTALLS += icon
|
|
|
|
launcher.path = $$LAUNCHER_INSTALL_DIR
|
|
launcher.files = $$ASSETS_DIR/Fractorium.desktop
|
|
#message(LAUNCHER INSTALL SOURCE: $$launcher.files)
|
|
INSTALLS += launcher
|
|
}
|
|
|
|
macx:ICON = $$ASSETS_DIR/Fractorium.icns
|
|
!macx:PRECOMPILED_HEADER = $$SRC_COMMON_DIR/EmberCommonPch.h
|
|
|
|
LIBS += -L$$absolute_path($$DESTDIR) -lember
|
|
LIBS += -L$$absolute_path($$DESTDIR) -lembercl
|
|
|
|
SOURCES += \
|
|
$$PRJ_SRC_DIR/EmberRender.cpp \
|
|
$$SRC_COMMON_DIR/EmberCommonPch.cpp
|
|
|
|
include(deployment.pri)
|
|
qtcAddDeployment()
|
|
|
|
HEADERS += \
|
|
$$PRJ_SRC_DIR/EmberRender.h \
|
|
$$SRC_COMMON_DIR/EmberCommon.h \
|
|
$$SRC_COMMON_DIR/EmberCommonPch.h \
|
|
$$SRC_COMMON_DIR/EmberOptions.h \
|
|
$$SRC_COMMON_DIR/JpegUtils.h \
|
|
$$SRC_COMMON_DIR/SimpleGlob.h \
|
|
$$SRC_COMMON_DIR/SimpleOpt.h
|
|
|