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

More library build stuff

Browse Source
This commit is contained in:
Mark Watkins 2013-10-10 10:36:03 +10:00
parent 5ae2b88105
commit 680256a7c2
6 changed files with 57 additions and 40 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
3rdparty/3rdparty.pro vendored
View File

@ -1,6 +1,6 @@
TEMPLATE = subdirs TEMPLATE = subdirs
SUBDIRS = quazip qextserialport SUBDIRS = quazip
SUBDIRS = qextserialport
CONFIG += ordered CONFIG += ordered

2
3rdparty/qextserialport/qextserialport.pro vendored
View File

@ -4,7 +4,7 @@
# CONFIG += qesp_static # CONFIG += qesp_static
# Uncomment following line if you want to build framework for mac # Uncomment following line if you want to build framework for mac
#macx:CONFIG += qesp_mac_framework macx:CONFIG += qesp_mac_framework
# Uncomment following line if you want to enable udev for linux # Uncomment following line if you want to enable udev for linux
# linux*:CONFIG += qesp_linux_udev # linux*:CONFIG += qesp_linux_udev

15
SleepyHeadQT.pro
View File

@ -1,20 +1,11 @@
TEMPLATE = subdirs TEMPLATE = subdirs
win32:SUBDIRS = 3rdparty
# Need them for windows..
win32:CONFIG += use_bundled_libs
else:CONFIG -= use_bundled_libs
use_bundled_libs {
SUBDIRS = 3rdparty
}
SUBDIRS += sleepyhead SUBDIRS += sleepyhead
use_bundled_libs { CONFIG += ordered
CONFIG += ordered win32:sleepyhead.depends = 3rdparty
sleepyhead.depends = 3rdparty
}
TRANSLATIONS += \ TRANSLATIONS += \
Translations/Nederlands.nl_NL.ts \ Translations/Nederlands.nl_NL.ts \

2
sleepyhead/oximetry.cpp
View File

@ -13,7 +13,7 @@
#ifdef USE_BUNDLED_LIBS #ifdef USE_BUNDLED_LIBS
#include "src/qextserialenumerator.h" #include "src/qextserialenumerator.h"
#else #else
#include <QtExtSerialPort/qextserialenumerator.h> #include <qextserialenumerator.h>
#endif #endif
#include "oximetry.h" #include "oximetry.h"

3
sleepyhead/oximetry.h
View File

@ -17,7 +17,8 @@
#ifdef USE_BUNDLED_LIBS #ifdef USE_BUNDLED_LIBS
#include "src/qextserialport.h" #include "src/qextserialport.h"
#else #else
#include <QtExtSerialPort/qextserialport.h>
#include <qextserialport.h>
#endif #endif
#include "SleepLib/profiles.h" #include "SleepLib/profiles.h"

71
sleepyhead/sleepyhead.pro
View File

@ -14,6 +14,11 @@ greaterThan(QT_MAJOR_VERSION,4) {
CONFIG += rtti CONFIG += rtti
win32:CONFIG += use_bundled_libs
else:!use_bundled_libs:CONFIG += extserialport
use_bundled_libs:DEFINES += USE_BUNDLED_LIBS
#static { #static {
# CONFIG += static # CONFIG += static
# QTPLUGIN += qsvg qgif qpng # QTPLUGIN += qsvg qgif qpng
@ -54,10 +59,6 @@ if (win32-msvc2008|win32-msvc2010|win32-msvc2012):!equals(TEMPLATE_PREFIX, "vc")
} }
win32:CONFIG += use_bundled_libs
use_bundled_libs:DEFINES += USE_BUNDLED_LIBS
#include(..3rdparty/qextserialport/src/qextserialport.pri) #include(..3rdparty/qextserialport/src/qextserialport.pri)
#include(3rdparty/quazip-0.5.1/quazip/quazip.pri) #include(3rdparty/quazip-0.5.1/quazip/quazip.pri)
@ -211,11 +212,12 @@ mac {
QMAKE_BUNDLE_DATA += TransFiles QMAKE_BUNDLE_DATA += TransFiles
} }
win32:CONFIG(release, debug|release): LIBS += -L$$OUT_PWD/../3rdparty/quazip/quazip/release/ -lquazip win32:CONFIG(release, debug|release): LIBS += -L$$OUT_PWD/../3rdparty/quazip/quazip/release/ -lquazip
else:win32:CONFIG(debug, debug|release): LIBS += -L$$OUT_PWD/../3rdparty/quazip/quazip/debug/ -lquazip else:win32:CONFIG(debug, debug|release): LIBS += -L$$OUT_PWD/../3rdparty/quazip/quazip/debug/ -lquazip
else:unix { else:unix {
use_bundled_libs:QMAKE_LFLAGS += -L$$OUT_PWD/../3rdparty/qextserialport/ use_bundled_libs:QMAKE_LFLAGS += -L$$OUT_PWD/../3rdparty/quazip/
else:QMAKE_LFLAGS += -L/usr/lib -L/usr/local/lib
LIBS += -lquazip LIBS += -lquazip
} }
@ -225,27 +227,50 @@ use_bundled_libs {
} else { } else {
INCLUDEPATH += /usr/include INCLUDEPATH += /usr/include
INCLUDEPATH += /usr/local/include INCLUDEPATH += /usr/local/include
DEPENDPATH += /usr/include/quazip
DEPENDPATH += /usr/local/include/quazip
} }
greaterThan(QT_MAJOR_VERSION,4) { #greaterThan(QT_MAJOR_VERSION,4) {
win32:CONFIG(release, debug|release): LIBS += -L$$OUT_PWD/../3rdparty/qextserialport/release/ -lQt5ExtSerialPort1 # 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:win32:CONFIG(debug, debug|release): LIBS += -L$$OUT_PWD/../3rdparty/qextserialport/debug/ -lQt5ExtSerialPortd1
else:unix{ # else:unix{
use_bundled_libs:QMAKE_LFLAGS += -L$$OUT_PWD/../3rdparty/qextserialport/ # use_bundled_libs:QMAKE_LFLAGS += -L$$OUT_PWD/../3rdparty/qextserialport/
LIBS += -lqextserialport # LIBS += -lqextserialport
# }
#} 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 {
# use_bundled_libs:QMAKE_LFLAGS += -L$$OUT_PWD/../3rdparty/qextserialport/
# LIBS += -lqextserialport
# }
#}
#use_bundled_libs {
#}
use_bundled_libs: {
greaterThan(QT_MAJOR_VERSION,4) {
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 += -lQt5ExtSerialPort1
else:unix:CONFIG(debug, debug|release): LIBS += -lQt5ExtSerialPortd1
} 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
} }
} 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 {
use_bundled_libs:QMAKE_LFLAGS += -L$$OUT_PWD/../3rdparty/qextserialport/
LIBS += -lqextserialport
}
}
use_bundled_libs {
INCLUDEPATH += $$PWD/../3rdparty/qextserialport INCLUDEPATH += $$PWD/../3rdparty/qextserialport
DEPENDPATH += $$PWD/../3rdparty/qextserialport DEPENDPATH += $$PWD/../3rdparty/qextserialport
} else {
mac: LIBS += -framework qextserialport
else:unix: LIBS += -lqextserialport
INCLUDEPATH += /usr/local/include
INCLUDEPATH += /usr/include
DEPENDPATH += /usr/local/include/QtExtSerialPort
DEPENDPATH += /usr/include/QtExtSerialPort
} }