mirror of
https://bitbucket.org/mfeemster/fractorium.git
synced 2025-07-02 14:26:17 -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,65 +4,82 @@ CONFIG += shared
|
||||
CONFIG -= app_bundle
|
||||
CONFIG -= qt
|
||||
|
||||
TARGET = ember
|
||||
|
||||
include(../defaults.pri)
|
||||
|
||||
PRJ_DIR = $$SRC_DIR/Ember
|
||||
#Point to visual studio resource file to embed file information.
|
||||
win32 {
|
||||
RC = $$RCPATH/Ember.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/Ember)
|
||||
#message(PRJ_SRC_DIR: $$PRJ_SRC_DIR)
|
||||
|
||||
!macx:PRECOMPILED_HEADER = $$PRJ_DIR/EmberPch.h
|
||||
|
||||
QMAKE_CXXFLAGS += -D_USRDLL
|
||||
QMAKE_CXXFLAGS += -D_CONSOLE
|
||||
#Project specific compiler flags.
|
||||
QMAKE_CXXFLAGS += -BUILDING_EMBER
|
||||
win32: DEFINES += BUILDING_EMBER
|
||||
|
||||
win32 {
|
||||
DEFINES += BUILDING_EMBER
|
||||
}
|
||||
|
||||
!win32 {
|
||||
target.path = $$LIB_INSTALL_DIR
|
||||
INSTALLS += target
|
||||
}
|
||||
|
||||
!macx:PRECOMPILED_HEADER = $$PRJ_SRC_DIR/EmberPch.h
|
||||
|
||||
SOURCES += \
|
||||
$$PRJ_DIR/Affine2D.cpp \
|
||||
$$PRJ_DIR/DllMain.cpp \
|
||||
$$PRJ_DIR/Ember.cpp \
|
||||
$$PRJ_DIR/EmberPch.cpp \
|
||||
$$PRJ_DIR/RendererBase.cpp \
|
||||
$$PRJ_DIR/Renderer.cpp \
|
||||
$$PRJ_DIR/VariationList.cpp
|
||||
$$PRJ_SRC_DIR/Affine2D.cpp \
|
||||
$$PRJ_SRC_DIR/DllMain.cpp \
|
||||
$$PRJ_SRC_DIR/Ember.cpp \
|
||||
$$PRJ_SRC_DIR/EmberPch.cpp \
|
||||
$$PRJ_SRC_DIR/RendererBase.cpp \
|
||||
$$PRJ_SRC_DIR/Renderer.cpp \
|
||||
$$PRJ_SRC_DIR/VariationList.cpp
|
||||
|
||||
include(deployment.pri)
|
||||
qtcAddDeployment()
|
||||
|
||||
HEADERS += \
|
||||
$$PRJ_DIR/Affine2D.h \
|
||||
$$PRJ_DIR/CarToRas.h \
|
||||
$$PRJ_DIR/Curves.h \
|
||||
$$PRJ_DIR/DensityFilter.h \
|
||||
$$PRJ_DIR/EmberDefines.h \
|
||||
$$PRJ_DIR/Ember.h \
|
||||
$$PRJ_DIR/EmberMotion.h \
|
||||
$$PRJ_DIR/EmberPch.h \
|
||||
$$PRJ_DIR/EmberToXml.h \
|
||||
$$PRJ_DIR/Interpolate.h \
|
||||
$$PRJ_DIR/Isaac.h \
|
||||
$$PRJ_DIR/Iterator.h \
|
||||
$$PRJ_DIR/Palette.h \
|
||||
$$PRJ_DIR/PaletteList.h \
|
||||
$$PRJ_DIR/Point.h \
|
||||
$$PRJ_DIR/RendererBase.h \
|
||||
$$PRJ_DIR/Renderer.h \
|
||||
$$PRJ_DIR/SheepTools.h \
|
||||
$$PRJ_DIR/SpatialFilter.h \
|
||||
$$PRJ_DIR/TemporalFilter.h \
|
||||
$$PRJ_DIR/Timing.h \
|
||||
$$PRJ_DIR/Utils.h \
|
||||
$$PRJ_DIR/Variation.h \
|
||||
$$PRJ_DIR/VariationList.h \
|
||||
$$PRJ_DIR/Variations01.h \
|
||||
$$PRJ_DIR/Variations02.h \
|
||||
$$PRJ_DIR/Variations03.h \
|
||||
$$PRJ_DIR/Variations04.h \
|
||||
$$PRJ_DIR/Variations05.h \
|
||||
$$PRJ_DIR/Variations06.h \
|
||||
$$PRJ_DIR/Variations07.h \
|
||||
$$PRJ_DIR/VariationsDC.h \
|
||||
$$PRJ_DIR/VarFuncs.h \
|
||||
$$PRJ_DIR/Xform.h \
|
||||
$$PRJ_DIR/XmlToEmber.h
|
||||
$$PRJ_SRC_DIR/Affine2D.h \
|
||||
$$PRJ_SRC_DIR/CarToRas.h \
|
||||
$$PRJ_SRC_DIR/Curves.h \
|
||||
$$PRJ_SRC_DIR/DensityFilter.h \
|
||||
$$PRJ_SRC_DIR/EmberDefines.h \
|
||||
$$PRJ_SRC_DIR/Ember.h \
|
||||
$$PRJ_SRC_DIR/EmberMotion.h \
|
||||
$$PRJ_SRC_DIR/EmberPch.h \
|
||||
$$PRJ_SRC_DIR/EmberToXml.h \
|
||||
$$PRJ_SRC_DIR/Interpolate.h \
|
||||
$$PRJ_SRC_DIR/Isaac.h \
|
||||
$$PRJ_SRC_DIR/Iterator.h \
|
||||
$$PRJ_SRC_DIR/Palette.h \
|
||||
$$PRJ_SRC_DIR/PaletteList.h \
|
||||
$$PRJ_SRC_DIR/Point.h \
|
||||
$$PRJ_SRC_DIR/RendererBase.h \
|
||||
$$PRJ_SRC_DIR/Renderer.h \
|
||||
$$PRJ_SRC_DIR/SheepTools.h \
|
||||
$$PRJ_SRC_DIR/SpatialFilter.h \
|
||||
$$PRJ_SRC_DIR/TemporalFilter.h \
|
||||
$$PRJ_SRC_DIR/Timing.h \
|
||||
$$PRJ_SRC_DIR/Utils.h \
|
||||
$$PRJ_SRC_DIR/Variation.h \
|
||||
$$PRJ_SRC_DIR/VariationList.h \
|
||||
$$PRJ_SRC_DIR/Variations01.h \
|
||||
$$PRJ_SRC_DIR/Variations02.h \
|
||||
$$PRJ_SRC_DIR/Variations03.h \
|
||||
$$PRJ_SRC_DIR/Variations04.h \
|
||||
$$PRJ_SRC_DIR/Variations05.h \
|
||||
$$PRJ_SRC_DIR/Variations06.h \
|
||||
$$PRJ_SRC_DIR/Variations07.h \
|
||||
$$PRJ_SRC_DIR/VariationsDC.h \
|
||||
$$PRJ_SRC_DIR/VarFuncs.h \
|
||||
$$PRJ_SRC_DIR/Xform.h \
|
||||
$$PRJ_SRC_DIR/XmlToEmber.h
|
||||
|
||||
#message("")
|
||||
|
Reference in New Issue
Block a user