mirror of
https://bitbucket.org/mfeemster/fractorium.git
synced 2025-02-23 13:31:31 -05:00
6ba16888e3
-Add new variations: crackle, dc_perlin. -Make default palette interp mode be linear instead of step. -Make summary tab the selected one in the Info tab. -Allow for highlight power of up to 10. It was previously limited to 2. --Bug fixes -Direct color calculations were wrong. -Flattening was not applied to final xform. -Fix "pure virtual function call" error on shutdown. --Code changes -Allow for array precalc params in variations by adding a size member to the ParamWithName class. -In IterOpenCLKernelCreator, memcpy precalc params instead of a direct assign since they can now be of variable length. -Add new file VarFuncs to consolidate some functions that are common to multiple variations. This also contains texture data for crackle and dc_perlin. -Place OpenCL versions of these functions in the FunctionMapper class in the EmberCL project. -Add new Singleton class that uses CRTP, is thread safe, and deletes after the last reference goes away. This fixes the usual "delete after main()" problem with singletons that use the static local function variable pattern. -Began saving files with AStyle autoformatter turned on. This will eventually touch all files as they are worked on. -Add missing backslash to CUDA include and library paths for builds on Nvidia systems. -Add missing gl.h include for Windows. -Remove glew include paths from Fractorium, it's not used. -Remove any Nvidia specific #defines and build targets, they are no longer needed with OpenCL 1.2. -Fix bad paths on linux build. -General cleanup.
110 lines
2.6 KiB
Plaintext
110 lines
2.6 KiB
Plaintext
VERSION = 0.9.9.2
|
|
|
|
# When this file is included:
|
|
# - $$(PWD) is ./Builds/QtCreator/
|
|
# - $(PWD) is the project folder, e.g. ./Builds/QtCreator/Ember/
|
|
|
|
# TODO: win32 install dirs?
|
|
|
|
unix|macx {
|
|
LIB_INSTALL_DIR = /usr/lib
|
|
BIN_INSTALL_DIR = /usr/bin
|
|
SHARE_INSTALL_DIR = /usr/share/fractorium
|
|
}
|
|
|
|
EMBER_ROOT = ./../../../
|
|
SRC_DIR = $$EMBER_ROOT/Source
|
|
SRC_COMMON_DIR = $$EMBER_ROOT/Source/EmberCommon
|
|
ASSETS_DIR = $$EMBER_ROOT/Data
|
|
|
|
CONFIG(release, debug|release) {
|
|
CONFIG += warn_off
|
|
DESTDIR = $$EMBER_ROOT/Bin/release
|
|
}
|
|
|
|
CONFIG(debug, debug|release) {
|
|
DESTDIR = $$EMBER_ROOT/Bin/debug
|
|
}
|
|
|
|
macx {
|
|
LIBS += -framework OpenGL
|
|
LIBS += -framework OpenCL
|
|
|
|
# homebrew installs into /usr/local
|
|
LIBS += -L/usr/local/lib
|
|
|
|
INCLUDEPATH += /usr/local/include
|
|
INCLUDEPATH += $$(PWD)/../../../Deps
|
|
|
|
QMAKE_MAC_SDK = macosx10.11
|
|
QMAKE_MACOSX_DEPLOYMENT_TARGET = 10.9
|
|
|
|
QMAKE_CXXFLAGS += -mmacosx-version-min=10.9 -arch x86_64
|
|
QMAKE_CXXFLAGS += -stdlib=libc++
|
|
} else {
|
|
CONFIG += precompile_header
|
|
LIBS += -L/usr/lib -lGL
|
|
LIBS += -L/usr/lib -lOpenCL
|
|
|
|
QMAKE_LFLAGS_RELEASE += -s
|
|
}
|
|
|
|
native {
|
|
QMAKE_CXXFLAGS += -march=native
|
|
} else {
|
|
QMAKE_CXXFLAGS += -march=k8
|
|
}
|
|
|
|
OBJECTS_DIR = $$PWD/.obj
|
|
MOC_DIR = $$PWD/.moc
|
|
RCC_DIR = $$PWD/.qrc
|
|
UI_DIR = $$PWD/.ui
|
|
|
|
LIBS += -L/usr/lib -ljpeg
|
|
LIBS += -L/usr/lib -lpng
|
|
LIBS += -L/usr/lib -ltbb
|
|
LIBS += -L/usr/lib -lpthread
|
|
LIBS += -L/usr/lib/x86_64-linux-gnu -lxml2
|
|
|
|
CMAKE_CXXFLAGS += -DCL_USE_DEPRECATED_OPENCL_1_1_APIS
|
|
|
|
INCLUDEPATH += /usr/include/CL
|
|
INCLUDEPATH += /usr/include/GL
|
|
INCLUDEPATH += /usr/include/glm
|
|
INCLUDEPATH += /usr/include/tbb
|
|
INCLUDEPATH += /usr/include/libxml2
|
|
INCLUDEPATH += $$SRC_DIR/Ember
|
|
INCLUDEPATH += $$SRC_DIR/EmberCL
|
|
INCLUDEPATH += $$SRC_DIR/EmberCommon
|
|
|
|
QMAKE_CXXFLAGS_RELEASE += -O2
|
|
QMAKE_CXXFLAGS_RELEASE += -DNDEBUG
|
|
QMAKE_CXXFLAGS_RELEASE += -fomit-frame-pointer
|
|
|
|
QMAKE_CXXFLAGS += -fPIC
|
|
QMAKE_CXXFLAGS += -fpermissive
|
|
QMAKE_CXXFLAGS += -pedantic
|
|
QMAKE_CXXFLAGS += -std=c++11
|
|
QMAKE_CXXFLAGS += -Wnon-virtual-dtor
|
|
QMAKE_CXXFLAGS += -Wshadow
|
|
QMAKE_CXXFLAGS += -Winit-self
|
|
QMAKE_CXXFLAGS += -Wredundant-decls
|
|
QMAKE_CXXFLAGS += -Wcast-align
|
|
QMAKE_CXXFLAGS += -Winline
|
|
QMAKE_CXXFLAGS += -Wunreachable-code
|
|
QMAKE_CXXFLAGS += -Wmissing-include-dirs
|
|
QMAKE_CXXFLAGS += -Wswitch-enum
|
|
QMAKE_CXXFLAGS += -Wswitch-default
|
|
QMAKE_CXXFLAGS += -Wmain
|
|
QMAKE_CXXFLAGS += -Wzero-as-null-pointer-constant
|
|
QMAKE_CXXFLAGS += -Wfatal-errors
|
|
QMAKE_CXXFLAGS += -Wall -fpermissive
|
|
QMAKE_CXXFLAGS += -Wold-style-cast
|
|
QMAKE_CXXFLAGS += -Wno-unused-parameter
|
|
QMAKE_CXXFLAGS += -Wno-unused-function
|
|
QMAKE_CXXFLAGS += -Wold-style-cast
|
|
QMAKE_CXXFLAGS += -D_M_X64
|
|
QMAKE_CXXFLAGS += -D_CONSOLE
|
|
QMAKE_CXXFLAGS += -D_USRDLL
|
|
|