Commit 283862ea authored by Christoph Wick's avatar Christoph Wick

Fix for WinRT:

added static_deps and static_config
parent c6eb395d
......@@ -183,11 +183,11 @@ defineReplace(depends_qwt) {
# if only Qwt depends on OpenGL the module will not get copied
CONFIG(debug, debug|release){
LIBS += -L$$EPT_ROOT_OUT_DIR/thirdparty/qwt-lib/debug -lqwtd
DLLS += $$EPT_ROOT_OUT_DIR/thirdparty/qwt-lib/debug/qwtd.dll
!contains(EPT_THIRDPARTY_CONFIG, static_qwt):DLLS += $$EPT_ROOT_OUT_DIR/thirdparty/qwt-lib/debug/qwtd.dll
DLLS += $$(QTDIR)/bin/Qt5OpenGLd.dll
} else {
LIBS += -L$$EPT_ROOT_OUT_DIR/thirdparty/qwt-lib/release -lqwt
DLLS += $$EPT_ROOT_OUT_DIR/thirdparty/qwt-lib/release/qwt.dll
!contains(EPT_THIRDPARTY_CONFIG, static_qwt):DLLS += $$EPT_ROOT_OUT_DIR/thirdparty/qwt-lib/release/qwt.dll
DLLS += $$(QTDIR)/bin/Qt5OpenGL.dll
}
} else:macx {
......@@ -204,7 +204,6 @@ defineReplace(depends_qwt) {
LIBS += -lqwt-qt5
}
!contains(EPT_THIRDPARTY_LIBS, static_qwt):DEFINES += QWT_DLL
export(INCLUDEPATH)
......@@ -246,10 +245,10 @@ defineReplace(depends_winrtbridge) {
defineReplace(depends_tp3log) {
INCLUDEPATH += $$EPT_THIRDPARTY_DIR/tp3log
LIBS += -L$$EPT_ROOT_OUT_DIR/thirdparty/tp3log/tp3log -ltp3log
LIBS += -L$$EPT_ROOT_OUT_DIR/thirdparty/tp3log/tp3log/lib -ltp3log
tp3LogDLL {
android:ANDROID_EXTRA_LIBS += $$EPT_ROOT_OUT_DIR/thirdparty/tp3log/tp3log/libtp3log.so
win32:DLLS += $$EPT_ROOT_OUT_DIR/thirdparty/tp3log/tp3log/tp3log.dll
android:ANDROID_EXTRA_LIBS += $$EPT_ROOT_OUT_DIR/thirdparty/tp3log/tp3log/lib/libtp3log.so
win32:DLLS += $$EPT_ROOT_OUT_DIR/thirdparty/tp3log/tp3log/lib/tp3log.dll
}
export(LIBS)
......
......@@ -12,8 +12,9 @@ EPT_SNAP_BUILD = $$(SNAP)$$(SNAPCRAFT_PART_INSTALL)
# include example algorithm by default in debug builds
# on mobile platforms and mac/ios use static algorithm build
android|ios|winrt|winphone|macx:EPT_CONFIG += static
contains(EPT_CONFIG, static) {
android|ios|winrt|winphone|macx:EPT_CONFIG += static static_core
android|ios|macx:EPT_CONFIG += static_deps
contains(EPT_CONFIG, static_core) {
EPT_CONFIG += no_shared_algorithms static_algorithms static_core no_shared_core
}
else {
......@@ -50,7 +51,7 @@ win32:contains(EPT_CONFIG, shared_core) {
}
# qwt
contains(EPT_CONFIG, static)|ios: EPT_THIRDPARTY_CONFIG += static_qwt
contains(EPT_CONFIG, static_deps):EPT_THIRDPARTY_CONFIG += static_qwt
#--------------------------------------------------
# global settings
......
Subproject commit a52bf6b3ff0071afc5ee62409f06d1579de101a7
Subproject commit 1b1a8080ee44e2f4811fa8d7b35f37bfecda36a2
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment