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

More build fixes

Browse Source
This commit is contained in:
Mark Watkins 2013-10-10 03:54:06 +10:00
parent 758ebe8024
commit b34600c8e2
5 changed files with 18 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
SleepyHeadQT.pro
View File

@ -1,9 +1,9 @@
TEMPLATE = subdirs TEMPLATE = subdirs
CONFIG -= use_bundled_libs
# Need them for windows.. # Need them for windows..
win32:CONFIG += use_bundled_libs win32:CONFIG += use_bundled_libs
else:CONFIG -= use_bundled_libs
use_bundled_libs { use_bundled_libs {
SUBDIRS = 3rdparty SUBDIRS = 3rdparty

4
sleepyhead/UpdaterWindow.cpp
View File

@ -13,8 +13,8 @@
#include <QDesktopWidget> #include <QDesktopWidget>
#include "SleepLib/profiles.h" #include "SleepLib/profiles.h"
#include "quazip/quazip.h" #include <quazip/quazip.h>
#include "quazip/quazipfile.h" #include <quazip/quazipfile.h>
#include "UpdaterWindow.h" #include "UpdaterWindow.h"
#include "ui_UpdaterWindow.h" #include "ui_UpdaterWindow.h"
#include "version.h" #include "version.h"

5
sleepyhead/oximetry.cpp
View File

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

4
sleepyhead/oximetry.h
View File

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

9
sleepyhead/sleepyhead.pro
View File

@ -40,7 +40,6 @@ else:DEFINES += GIT_REVISION=\\\"UNKNOWN\\\"
unix:!macx:LIBS += -lX11 -lz -lGLU unix:!macx:LIBS += -lX11 -lz -lGLU
macx { macx {
SOURCES +=
LIBS += -lz LIBS += -lz
ICON = ../icons/iconfile.icns ICON = ../icons/iconfile.icns
} }
@ -55,6 +54,10 @@ 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)
@ -243,6 +246,6 @@ greaterThan(QT_MAJOR_VERSION,4) {
} }
use_bundled_libs { use_bundled_libs {
INCLUDEPATH += $$PWD/../3rdparty/qextserialport/src INCLUDEPATH += $$PWD/../3rdparty/qextserialport
DEPENDPATH += $$PWD/../3rdparty/qextserialport/src DEPENDPATH += $$PWD/../3rdparty/qextserialport
} }