mirror of
https://bitbucket.org/mfeemster/fractorium.git
synced 2025-07-01 22:06:10 -04:00
--Bug fixes
-Really fix locking of affine scale. --Code changes -Remove dependency projects from the solution. Move to a project design where they are built once via command line and stored in a /Deps folder. --Because of this, libpng is built as a static lib instead of a dll because that's what its command line makefile supports. --Remove libpng16.dll from Wix installer. -Remove all configs except for debug and release. -Remove all platforms except for x64. -Add #define __TBB_NO_IMPLICIT_LINKAGE 1 to prevent tbb from locking for tbb_debug.lib by default on debug builds. -Put Ember.rc in a filter folder in the project. -Place pragma warning disable statements in PCH files rather than in projects. This makes it easier when using Qt Creator. -Move all resource files to the MSVC folder. -Set all targets in QtCreator project to their lowercase names to be more *nix friendly. Set -l link statements to use these new lowercase names for ember and embercl. -Rework projects to favor shadow builds. -Remove the symlinks.sh file and all references to it. It was never needed. Instead, just specify multiple include and link paths in the .pro files. -Change WIN32 to _WIN32. -Fix a few code warnings.
This commit is contained in:
@ -4,46 +4,61 @@ CONFIG += shared
|
||||
CONFIG -= app_bundle
|
||||
CONFIG -= qt
|
||||
|
||||
TARGET = embercl
|
||||
|
||||
include(../defaults.pri)
|
||||
|
||||
PRJ_DIR = $$SRC_DIR/EmberCL
|
||||
#Point to visual studio resource file to embed file information.
|
||||
win32 {
|
||||
RC = $$RCPATH/EmberCL.rc
|
||||
win32:RC_FILE = $$RC
|
||||
#message(RC_FILE: $$RC)
|
||||
}
|
||||
|
||||
target.path = $$LIB_INSTALL_DIR
|
||||
INSTALLS += target
|
||||
#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/EmberCL)
|
||||
#message(PRJ_SRC_DIR: $$PRJ_SRC_DIR)
|
||||
|
||||
LIBS += -L$$absolute_path($$DESTDIR) -lEmber
|
||||
|
||||
!macx:PRECOMPILED_HEADER = $$PRJ_DIR/EmberCLPch.h
|
||||
|
||||
QMAKE_CXXFLAGS += -D_USRDLL
|
||||
QMAKE_CXXFLAGS += -D_CONSOLE
|
||||
#Project specific compiler flags.
|
||||
QMAKE_CXXFLAGS += -BUILDING_EMBERCL
|
||||
win32: DEFINES += BUILDING_EMBERCL
|
||||
|
||||
win32 {
|
||||
DEFINES += BUILDING_EMBERCL
|
||||
}
|
||||
|
||||
!win32 {
|
||||
target.path = $$LIB_INSTALL_DIR
|
||||
INSTALLS += target
|
||||
}
|
||||
|
||||
!macx:PRECOMPILED_HEADER = $$PRJ_SRC_DIR/EmberCLPch.h
|
||||
|
||||
LIBS += -L$$absolute_path($$DESTDIR) -lember
|
||||
|
||||
SOURCES += \
|
||||
$$PRJ_DIR/DEOpenCLKernelCreator.cpp \
|
||||
$$PRJ_DIR/DllMain.cpp \
|
||||
$$PRJ_DIR/FinalAccumOpenCLKernelCreator.cpp \
|
||||
$$PRJ_DIR/FunctionMapper.cpp \
|
||||
$$PRJ_DIR/IterOpenCLKernelCreator.cpp \
|
||||
$$PRJ_DIR/OpenCLInfo.cpp \
|
||||
$$PRJ_DIR/OpenCLWrapper.cpp \
|
||||
$$PRJ_DIR/RendererCL.cpp \
|
||||
$$PRJ_DIR/RendererClDevice.cpp
|
||||
$$PRJ_SRC_DIR/DEOpenCLKernelCreator.cpp \
|
||||
$$PRJ_SRC_DIR/DllMain.cpp \
|
||||
$$PRJ_SRC_DIR/FinalAccumOpenCLKernelCreator.cpp \
|
||||
$$PRJ_SRC_DIR/FunctionMapper.cpp \
|
||||
$$PRJ_SRC_DIR/IterOpenCLKernelCreator.cpp \
|
||||
$$PRJ_SRC_DIR/OpenCLInfo.cpp \
|
||||
$$PRJ_SRC_DIR/OpenCLWrapper.cpp \
|
||||
$$PRJ_SRC_DIR/RendererCL.cpp \
|
||||
$$PRJ_SRC_DIR/RendererClDevice.cpp
|
||||
|
||||
include(deployment.pri)
|
||||
qtcAddDeployment()
|
||||
|
||||
HEADERS += \
|
||||
$$PRJ_DIR/DEOpenCLKernelCreator.h \
|
||||
$$PRJ_DIR/EmberCLFunctions.h \
|
||||
$$PRJ_DIR/EmberCLPch.h \
|
||||
$$PRJ_DIR/EmberCLStructs.h \
|
||||
$$PRJ_DIR/FinalAccumOpenCLKernelCreator.h \
|
||||
$$PRJ_DIR/FunctionMapper.h \
|
||||
$$PRJ_DIR/IterOpenCLKernelCreator.h \
|
||||
$$PRJ_DIR/OpenCLInfo.h \
|
||||
$$PRJ_DIR/OpenCLWrapper.h \
|
||||
$$PRJ_DIR/RendererClDevice.h \
|
||||
$$PRJ_DIR/RendererCL.h
|
||||
$$PRJ_SRC_DIR/DEOpenCLKernelCreator.h \
|
||||
$$PRJ_SRC_DIR/EmberCLFunctions.h \
|
||||
$$PRJ_SRC_DIR/EmberCLPch.h \
|
||||
$$PRJ_SRC_DIR/EmberCLStructs.h \
|
||||
$$PRJ_SRC_DIR/FinalAccumOpenCLKernelCreator.h \
|
||||
$$PRJ_SRC_DIR/FunctionMapper.h \
|
||||
$$PRJ_SRC_DIR/IterOpenCLKernelCreator.h \
|
||||
$$PRJ_SRC_DIR/OpenCLInfo.h \
|
||||
$$PRJ_SRC_DIR/OpenCLWrapper.h \
|
||||
$$PRJ_SRC_DIR/RendererClDevice.h \
|
||||
$$PRJ_SRC_DIR/RendererCL.h
|
||||
|
||||
|
Reference in New Issue
Block a user