Commit ee7857ac authored by Christoph Wick's avatar Christoph Wick

Support for snap build

parent 5ee4890d
......@@ -436,7 +436,7 @@ contains(EPT_CONFIG, install) {
application.path = $$EPT_INSTALL_DATA_DIR/applications
application.files += $$EPT_APPSTORE_DIR/installer/scripts/entropypianotuner.desktop
!contains(EPT_THIRDPARTY_CONFIG, system_qwt):!contains(EPT_CONFIG, static_qwt) {
!contains(EPT_THIRDPARTY_CONFIG, system_qwt):!contains(EPT_THIRDPARTY_CONFIG, static_qwt) {
# install target for qwt
qwtinstall.path = $$EPT_INSTALL_LIB_DIR/entropypianotuner
......
......@@ -2,7 +2,7 @@
Name=Entropy Piano Tuner
Comment=Tune your piano
Exec=entropypianotuner %f
Icon=entropypianotuner.png
Icon=entropypianotuner
Terminal=false
Type=Application
MimeType=application/ept;
......
......@@ -67,9 +67,9 @@ win|linux:!android {
error(QtMidi not found)
}
packagesExist(qwt): EPT_THIRDPARTY_CONFIG+=system_qwt
packagesExist(fftw3): EPT_THIRDPARTY_CONFIG+=system_fftw3
packagesExist(libuv): EPT_THIRDPARTY_CONFIG+=system_libuv
packagesExist(qwt): EPT_THIRDPARTY_CONFIG+=system_qwt
packagesExist(fftw3): EPT_THIRDPARTY_CONFIG+=system_fftw3
packagesExist(libuv): EPT_THIRDPARTY_CONFIG+=system_libuv
}
include($$PWD/entropypianotuner_static_config.pri)
......@@ -183,30 +183,28 @@ 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 {
# use framework on mac
LIBS += -F$$EPT_ROOT_OUT_DIR/thirdparty/qwt-lib -framework qwt
contains(EPT_THIRDPARTY_CONFIG, static_qwt):LIBS += -L$$EPT_ROOT_OUT_DIR/thirdparty/qwt-lib -lqwt
else:LIBS += -F$$EPT_ROOT_OUT_DIR/thirdparty/qwt-lib -framework qwt
} else:android {
LIBS += -lqwt
ANDROID_EXTRA_LIBS += \
$$[QT_INSTALL_LIBS]/libQt5OpenGL.so \
$$EPT_ROOT_OUT_DIR/thirdparty/qwt-lib/libqwt.so
ANDROID_EXTRA_LIBS += $$[QT_INSTALL_LIBS]/libQt5OpenGL.so
!contains(EPT_THIRDPARTY_CONFIG, static_qwt):ANDROID_EXTRA_LIBS += $$EPT_ROOT_OUT_DIR/thirdparty/qwt-lib/libqwt.so
} else:!contains(EPT_THIRDPARTY_CONFIG, system_qwt) {
LIBS += -lqwt
DLLS += "$$EPT_ROOT_OUT_DIR/thirdparty/qwt-lib/libqwt.so*"
!contains(EPT_THIRDPARTY_CONFIG, static_qwt):DLLS += "$$EPT_ROOT_OUT_DIR/thirdparty/qwt-lib/libqwt.so*"
} else {
LIBS += -lqwt-qt5
}
DEFINES += QWT_DLL
!contains(EPT_THIRDPARTY_LIBS, static_qwt):DEFINES += QWT_DLL
export(INCLUDEPATH)
export(LIBS)
......@@ -247,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)
......
......@@ -5,12 +5,21 @@ else:return()
#------------------------------------------------
# Global config
# check if it is a snap build (check if any variable is defined)
EPT_SNAP_BUILD = $$(SNAP)$$(SNAPCRAFT_PART_INSTALL)
!isEmpty(EPT_SNAP_BUILD):EPT_CONFIG += snap_build static static_deps static_core
# 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 += no_shared_algorithms static_algorithms static_core no_shared_core
else: EPT_CONFIG += shared_algorithms no_static_algorithms shared_core no_static_core
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 {
EPT_CONFIG += shared_algorithms no_static_algorithms shared_core no_static_core
}
# add install rules
winrt|winphone: EPT_CONFIG += no_install
......@@ -42,7 +51,7 @@ win32:contains(EPT_CONFIG, shared_core) {
}
# qwt
ios: EPT_CONFIG += static_qwt
contains(EPT_CONFIG, static_deps):EPT_THIRDPARTY_CONFIG += static_qwt
#--------------------------------------------------
# global settings
......@@ -58,7 +67,7 @@ contains(EPT_CONFIG, no_shared_algorithms):DEFINES+="EPT_NO_SHARED_ALGORITHMS=1"
contains(EPT_CONFIG, shared_algorithms):DEFINES+="EPT_SHARED_ALGORITHMS=1"
# set QWT_CONFIG for static/dynamic build
contains(EPT_CONFIG, static_qwt):QWT_CONFIG += QwtStatic
contains(EPT_THIRDPARTY_CONFIG, static_qwt):QWT_CONFIG += QwtStatic
else:QWT_CONFIG += QwtDll
contains(EPT_CONFIG, static_core):DEFINES += EPT_STATIC_CORE
......
Subproject commit a3e9c67ac46344cefd1667a918ccdf6539f61146
Subproject commit c778d34abbfe7e2d28f4b493f61ef9b8ec17cb84
Subproject commit e0c19a5218a5e45a7a0a5237392d3abf626b17cb
Subproject commit d0310d65a66c268c511abf6e30466a4328c03fbd
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