chris/OSCAR-code
1
0
Fork 0
mirror of https://gitlab.com/pholy/OSCAR-code.git synced 2025-04-05 18:50:44 +00:00
Code Issues Packages Projects Releases Wiki Activity

Clean up 3rdparty bundling.. Mac & Windows use static qextserialport and quazip

Browse Source
This commit is contained in:
Mark Watkins 2013-11-04 12:45:33 +10:00
parent d5ccfb1d2a
commit 84dbbfe841
4 changed files with 8 additions and 46 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
SleepyHeadQT.pro
View File

@ -1,11 +1,8 @@
TEMPLATE = subdirs TEMPLATE = subdirs
win32:SUBDIRS = 3rdparty
SUBDIRS += sleepyhead SUBDIRS += sleepyhead
CONFIG += ordered CONFIG += ordered
win32:sleepyhead.depends = 3rdparty
TRANSLATIONS += \ TRANSLATIONS += \
Translations/Nederlands.nl_NL.ts \ Translations/Nederlands.nl_NL.ts \

5
sleepyhead/oximetry.cpp
View File

@ -9,12 +9,7 @@
#include <QCalendarWidget> #include <QCalendarWidget>
#include <QTextCharFormat> #include <QTextCharFormat>
#ifdef USE_BUNDLED_LIBS
#include "src/qextserialenumerator.h"
#else
#include <qextserialenumerator.h> #include <qextserialenumerator.h>
#endif
#include "oximetry.h" #include "oximetry.h"
#include "ui_oximetry.h" #include "ui_oximetry.h"

5
sleepyhead/oximetry.h
View File

@ -14,12 +14,7 @@
#include <QMessageBox> #include <QMessageBox>
#include <QMutex> #include <QMutex>
#ifdef USE_BUNDLED_LIBS
#include "src/qextserialport.h"
#else
#include <qextserialport.h> #include <qextserialport.h>
#endif
#include "SleepLib/profiles.h" #include "SleepLib/profiles.h"
#include "SleepLib/day.h" #include "SleepLib/day.h"

41
sleepyhead/sleepyhead.pro
View File

@ -14,10 +14,6 @@ greaterThan(QT_MAJOR_VERSION,4) {
CONFIG += rtti CONFIG += rtti
win32:CONFIG += use_bundled_libs
use_bundled_libs:DEFINES += USE_BUNDLED_LIBS
#static { #static {
# CONFIG += static # CONFIG += static
# QTPLUGIN += qsvg qgif qpng # QTPLUGIN += qsvg qgif qpng
@ -39,7 +35,7 @@ exists(../.git):{
GIT_BRANCH=$$system(git rev-parse --abbrev-ref HEAD) GIT_BRANCH=$$system(git rev-parse --abbrev-ref HEAD)
DEFINES += GIT_BRANCH=\\\"$$GIT_BRANCH\\\" DEFINES += GIT_BRANCH=\\\"$$GIT_BRANCH\\\"
DEFINES += GIT_REVISION=\\\"$$system(git rev-parse HEAD)\\\" DEFINES += GIT_REVISION=\\\"$$system(git rev-parse --short HEAD)\\\"
contains(GIT_BRANCH,"unstable"):DEFINES += UNSTABLE_BUILD contains(GIT_BRANCH,"unstable"):DEFINES += UNSTABLE_BUILD
@ -228,42 +224,21 @@ mac {
QMAKE_BUNDLE_DATA += TransFiles QMAKE_BUNDLE_DATA += TransFiles
} }
win32:CONFIG(release, debug|release): LIBS += -L$$OUT_PWD/../3rdparty/quazip/quazip/release/ -lquazip win32|mac {
else:win32:CONFIG(debug, debug|release): LIBS += -L$$OUT_PWD/../3rdparty/quazip/quazip/debug/ -lquazip
else:mac {
include(../3rdparty/quazip/quazip/quazip.pri) include(../3rdparty/quazip/quazip/quazip.pri)
INCLUDEPATH += $$PWD/../3rdparty/quazip INCLUDEPATH += $$PWD/../3rdparty/quazip
} else:unix {
use_bundled_libs:QMAKE_LFLAGS += -L$$OUT_PWD/../3rdparty/quazip/
else:QMAKE_LFLAGS += -L/usr/lib -L/usr/local/lib
LIBS += -lquazip
}
use_bundled_libs {
INCLUDEPATH += $$PWD/../3rdparty/quazip
DEPENDPATH += $$PWD/../3rdparty/quazip DEPENDPATH += $$PWD/../3rdparty/quazip
} else { } else:unix {
QMAKE_LFLAGS += -L/usr/lib -L/usr/local/lib
INCLUDEPATH += /usr/local/include INCLUDEPATH += /usr/local/include
INCLUDEPATH += /usr/include INCLUDEPATH += /usr/include
DEPENDPATH += /usr/local/include/quazip DEPENDPATH += /usr/local/include/quazip
DEPENDPATH += /usr/include/quazip DEPENDPATH += /usr/include/quazip
LIBS += -lquazip
} }
use_bundled_libs: { win32|mac{
greaterThan(QT_MAJOR_VERSION,4) { include(../3rdparty/qextserialport/src/qextserialport.pri)
win32:CONFIG(release, debug|release): LIBS += -L$$OUT_PWD/../3rdparty/qextserialport/release/ -lQt5ExtSerialPort1
else:win32:CONFIG(debug, debug|release): LIBS += -L$$OUT_PWD/../3rdparty/qextserialport/debug/ -lQt5ExtSerialPortd1
else:unix:CONFIG(release, debug|release): LIBS += -lQtExtSerialPort
else:unix:CONFIG(debug, debug|release): LIBS += -lQtExtSerialPortd
} else {
win32:CONFIG(release, debug|release): LIBS += -L$$OUT_PWD/../3rdparty/qextserialport/release/ -lqextserialport
else:win32:CONFIG(debug, debug|release): LIBS += -L$$OUT_PWD/../3rdparty/qextserialport/debug/ -lqextserialport
else:unix: LIBS += -lqextserialport
}
INCLUDEPATH += $$PWD/../3rdparty/qextserialport
DEPENDPATH += $$PWD/../3rdparty/qextserialport
} else { } else {
mac:include(../3rdparty/qextserialport/src/qextserialport.pri) CONFIG += extserialport
else:CONFIG += extserialport
} }