mirror of
https://bitbucket.org/mfeemster/fractorium.git
synced 2025-07-01 05:46:06 -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:
@ -7,25 +7,58 @@ TARGET = emberanimate
|
||||
|
||||
include(../defaults.pri)
|
||||
|
||||
PRJ_DIR = $$SRC_DIR/EmberAnimate
|
||||
#Point to visual studio resource file to embed file information and icon.
|
||||
win32 {
|
||||
RC = $$RCPATH/EmberAnimate.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/EmberAnimate)
|
||||
#message(PRJ_SRC_DIR: $$PRJ_SRC_DIR)
|
||||
|
||||
target.path = $$BIN_INSTALL_DIR
|
||||
#message(TARGET INSTALL: $$target.path)
|
||||
INSTALLS += target
|
||||
|
||||
LIBS += -L$$absolute_path($$DESTDIR) -lEmber
|
||||
LIBS += -L$$absolute_path($$DESTDIR) -lEmberCL
|
||||
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_DIR/EmberAnimate.cpp \
|
||||
$$PRJ_SRC_DIR/EmberAnimate.cpp \
|
||||
$$SRC_COMMON_DIR/EmberCommonPch.cpp
|
||||
|
||||
include(deployment.pri)
|
||||
qtcAddDeployment()
|
||||
|
||||
HEADERS += \
|
||||
$$PRJ_DIR/EmberAnimate.h \
|
||||
$$PRJ_SRC_DIR/EmberAnimate.h \
|
||||
$$SRC_COMMON_DIR/EmberCommon.h \
|
||||
$$SRC_COMMON_DIR/EmberCommonPch.h \
|
||||
$$SRC_COMMON_DIR/EmberOptions.h \
|
||||
|
Reference in New Issue
Block a user