mirror of
https://bitbucket.org/mfeemster/fractorium.git
synced 2025-01-22 13:40:06 -05:00
b690bf8071
-Remove the option --intpalette to format the palette in the xml as ints. If they are not hex formatted, then they should always be float. This option was pointless. -Cleanup some options text for the command line programs. -Allow for dragging around flames in the library tab. This is useful for setting up the order of an animation. -Make the opening of large files in Fractorium much more efficient when not-appending. -Make the opening of large files in all EmberRender and EmberAnimate more efficient. -Better error reporting when opening files. --Bug fixes -Get rid of leftover artifacts that would appear on preview thumbnails when either switching SP/DP or re-rendering previews. -Filename extension was not being appended on Linux when saving as Xml, thus making it impossible to drag that file back in becase drop is filtered on extension. --Code changes -Move GCC compiler spec to C++14. Building with 5.3 now on linux. -Use inline member data initializers. -Make a #define for static for use in Utils.h to make things a little cleaner. -Make various functions able to take arbitrary collections as their parameters rather than just vectors. -Make library collection a list rather than vector. This alleviates the need to re-sync pointers whenever the collection changes. -Subclass QTreeWidget for the library tree. Two new files added for this. -Remove all usage of #ifdef ROW_ONLY_DE in DEOpenCLKernelCreator, it was never used. -Add move constructor and assignment operator to EmberFile. -Add the ability to use a pointer to outside memory in the renderer for the vector of Ember<T>. -Make a lot more functions const where they should be.
169 lines
5.4 KiB
Prolog
169 lines
5.4 KiB
Prolog
TEMPLATE = app
|
|
QT += core gui widgets opengl concurrent
|
|
|
|
TARGET = fractorium
|
|
|
|
include(../defaults.pri)
|
|
|
|
#Point to visual studio resource file to embed file information and icon.
|
|
win32 {
|
|
RC = $$RCPATH/Fractorium.rc
|
|
win32:RC_FILE = $$RC
|
|
#message(RC_FILE: $$RC)
|
|
}
|
|
|
|
#message(QTDIR: $$(QTDIR))
|
|
|
|
#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/Fractorium)
|
|
#message(PRJ_SRC_DIR: $$PRJ_SRC_DIR)
|
|
|
|
#Qt will be installed on a system wide level on *nix. It should be the same for Windows, but copy it local just to be safe.
|
|
win32 {
|
|
CONFIG(release, debug|release) {
|
|
qtfiles.path = $$BIN_INSTALL_DIR
|
|
qtfiles.files = $$(QTDIR)\bin\Qt5Core.dll $$(QTDIR)\bin\Qt5Gui.dll $$(QTDIR)\bin\Qt5Widgets.dll
|
|
INSTALLS += qtfiles
|
|
|
|
qtplatforms.path = $$BIN_INSTALL_DIR\platforms
|
|
qtplatforms.files = $$(QTDIR)\plugins\platforms\qwindows.dll
|
|
INSTALLS += qtplatforms
|
|
}
|
|
|
|
CONFIG(debug, debug|release) {
|
|
qtfiles.path = $$BIN_INSTALL_DIR
|
|
qtfiles.files = $$(QTDIR)\bin\Qt5Cored.dll $$(QTDIR)\bin\Qt5Guid.dll $$(QTDIR)\bin\Qt5Widgetsd.dll
|
|
INSTALLS += qtfiles
|
|
|
|
qtplatforms.path = $$BIN_INSTALL_DIR\platforms
|
|
qtplatforms.files = $$(QTDIR)\plugins\platforms\qwindowsd.dll
|
|
INSTALLS += qtplatforms
|
|
}
|
|
}
|
|
|
|
#For some reason, a Qt project needs to be told to look at itself.
|
|
INCLUDEPATH += $$PRJ_SRC_DIR
|
|
|
|
# TODO: Figure out how to build the app bundle correctly.
|
|
# This will build a binary instead of an app bundle.
|
|
macx:CONFIG -= app_bundle
|
|
|
|
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 = $$PRJ_SRC_DIR/FractoriumPch.h
|
|
|
|
LIBS += -L$$absolute_path($$DESTDIR) -lember
|
|
LIBS += -L$$absolute_path($$DESTDIR) -lembercl
|
|
|
|
SOURCES += \
|
|
$$PRJ_SRC_DIR/AboutDialog.cpp \
|
|
$$PRJ_SRC_DIR/csshighlighter.cpp \
|
|
$$PRJ_SRC_DIR/CurvesGraphicsView.cpp \
|
|
$$PRJ_SRC_DIR/DoubleSpinBox.cpp \
|
|
$$PRJ_SRC_DIR/FinalRenderDialog.cpp \
|
|
$$PRJ_SRC_DIR/FinalRenderEmberController.cpp \
|
|
$$PRJ_SRC_DIR/Fractorium.cpp \
|
|
$$PRJ_SRC_DIR/FractoriumEmberController.cpp \
|
|
$$PRJ_SRC_DIR/FractoriumInfo.cpp \
|
|
$$PRJ_SRC_DIR/FractoriumLibrary.cpp \
|
|
$$PRJ_SRC_DIR/FractoriumMenus.cpp \
|
|
$$PRJ_SRC_DIR/FractoriumPalette.cpp \
|
|
$$PRJ_SRC_DIR/FractoriumParams.cpp \
|
|
$$PRJ_SRC_DIR/FractoriumPch.cpp \
|
|
$$PRJ_SRC_DIR/FractoriumRender.cpp \
|
|
$$PRJ_SRC_DIR/FractoriumSettings.cpp \
|
|
$$PRJ_SRC_DIR/FractoriumToolbar.cpp \
|
|
$$PRJ_SRC_DIR/FractoriumXaos.cpp \
|
|
$$PRJ_SRC_DIR/FractoriumXformsAffine.cpp \
|
|
$$PRJ_SRC_DIR/FractoriumXformsColor.cpp \
|
|
$$PRJ_SRC_DIR/FractoriumXforms.cpp \
|
|
$$PRJ_SRC_DIR/FractoriumXformsSelect.cpp \
|
|
$$PRJ_SRC_DIR/FractoriumXformsVariations.cpp \
|
|
$$PRJ_SRC_DIR/GLEmberController.cpp \
|
|
$$PRJ_SRC_DIR/GLWidget.cpp \
|
|
$$PRJ_SRC_DIR/Main.cpp \
|
|
$$PRJ_SRC_DIR/OptionsDialog.cpp \
|
|
$$PRJ_SRC_DIR/qcssparser.cpp \
|
|
$$PRJ_SRC_DIR/qcssscanner.cpp \
|
|
$$PRJ_SRC_DIR/QssDialog.cpp \
|
|
$$PRJ_SRC_DIR/QssTextEdit.cpp \
|
|
$$PRJ_SRC_DIR/SpinBox.cpp \
|
|
$$PRJ_SRC_DIR/VariationsDialog.cpp \
|
|
$$PRJ_SRC_DIR/LibraryTreeWidget.cpp
|
|
|
|
HEADERS += \
|
|
$$SRC_COMMON_DIR/EmberCommon.h \
|
|
$$SRC_COMMON_DIR/EmberCommonPch.h \
|
|
$$SRC_COMMON_DIR/JpegUtils.h \
|
|
$$PRJ_SRC_DIR/AboutDialog.h \
|
|
$$PRJ_SRC_DIR/csshighlighter.h \
|
|
$$PRJ_SRC_DIR/CurvesGraphicsView.h \
|
|
$$PRJ_SRC_DIR/DoubleSpinBox.h \
|
|
$$PRJ_SRC_DIR/DoubleSpinBoxTableItemDelegate.h \
|
|
$$PRJ_SRC_DIR/EmberFile.h \
|
|
$$PRJ_SRC_DIR/EmberTreeWidgetItem.h \
|
|
$$PRJ_SRC_DIR/FinalRenderDialog.h \
|
|
$$PRJ_SRC_DIR/FinalRenderEmberController.h \
|
|
$$PRJ_SRC_DIR/FractoriumCommon.h \
|
|
$$PRJ_SRC_DIR/FractoriumEmberController.h \
|
|
$$PRJ_SRC_DIR/Fractorium.h \
|
|
$$PRJ_SRC_DIR/FractoriumPch.h \
|
|
$$PRJ_SRC_DIR/FractoriumSettings.h \
|
|
$$PRJ_SRC_DIR/GLEmberController.h \
|
|
$$PRJ_SRC_DIR/GLWidget.h \
|
|
$$PRJ_SRC_DIR/OptionsDialog.h \
|
|
$$PRJ_SRC_DIR/PaletteTableWidgetItem.h \
|
|
$$PRJ_SRC_DIR/qcssparser.h \
|
|
$$PRJ_SRC_DIR/qcssscanner.h \
|
|
$$PRJ_SRC_DIR/qfunctions.h \
|
|
$$PRJ_SRC_DIR/QssDialog.h \
|
|
$$PRJ_SRC_DIR/QssTextEdit.h \
|
|
$$PRJ_SRC_DIR/resource.h \
|
|
$$PRJ_SRC_DIR/SpinBox.h \
|
|
$$PRJ_SRC_DIR/StealthComboBox.h \
|
|
$$PRJ_SRC_DIR/TableWidget.h \
|
|
$$PRJ_SRC_DIR/TwoButtonComboWidget.h \
|
|
$$PRJ_SRC_DIR/VariationsDialog.h \
|
|
$$PRJ_SRC_DIR/VariationTreeWidgetItem.h \
|
|
$$PRJ_SRC_DIR/LibraryTreeWidget.h
|
|
|
|
FORMS += \
|
|
$$PRJ_SRC_DIR/AboutDialog.ui \
|
|
$$PRJ_SRC_DIR/FinalRenderDialog.ui \
|
|
$$PRJ_SRC_DIR/Fractorium.ui \
|
|
$$PRJ_SRC_DIR/OptionsDialog.ui \
|
|
$$PRJ_SRC_DIR/QssDialog.ui \
|
|
$$PRJ_SRC_DIR/VariationsDialog.ui
|
|
|
|
OTHER_FILES += \
|
|
$$PRJ_SRC_DIR/Fractorium.aps \
|
|
$$PRJ_SRC_DIR/Fractorium.rc
|
|
|
|
RESOURCES += \
|
|
$$PRJ_SRC_DIR/Fractorium.qrc
|