windows: Update build flags
This commit is contained in:
parent
0f65846688
commit
f44d75ae17
@ -17,10 +17,15 @@ INCLUDEPATH += $$top_srcdir/libnymea-app \
|
|||||||
|
|
||||||
linux:!android: LIBS += -L$$top_builddir/libnymea-app/ -lnymea-app -L$$top_builddir/experiences/airconditioning -lnymea-app-airconditioning
|
linux:!android: LIBS += -L$$top_builddir/libnymea-app/ -lnymea-app -L$$top_builddir/experiences/airconditioning -lnymea-app-airconditioning
|
||||||
|
|
||||||
win32:Debug:LIBS += -L$$top_builddir/libnymea-app/debug \
|
win32:Debug:LIBS += -L$$top_builddir/libnymea-app/debug -lnymea-app \
|
||||||
-L$$top_builddir/experiences/airconditioning/debug
|
-L$$top_builddir/experiences/airconditioning/debug -lnymea-app-airconditioning
|
||||||
win32:Release:LIBS += -L$$top_builddir/libnymea-app/release \
|
win32:Release:LIBS += -L$$top_builddir/libnymea-app/release -lnymea-app \
|
||||||
-L$$top_builddir/experiences/airconditioning/release
|
-L$$top_builddir/experiences/airconditioning/release -lnymea-app-airconditioning
|
||||||
|
|
||||||
|
win32:Debug:PRE_TARGETDEPS += $$top_builddir/libnymea-app/debug/nymea-app.lib \
|
||||||
|
$$top_builddir/experiences/airconditioning/debug/nymea-app-airconditioning.lib
|
||||||
|
win32:Release:PRE_TARGETDEPS += $$top_builddir/libnymea-app/release/nymea-app.lib \
|
||||||
|
$$top_builddir/experiences/airconditioning/release/nymea-app-airconditioning.lib
|
||||||
win32:CXX_FLAGS += /w
|
win32:CXX_FLAGS += /w
|
||||||
|
|
||||||
linux:!android:!nozeroconf:LIBS += -lavahi-client -lavahi-common
|
linux:!android:!nozeroconf:LIBS += -lavahi-client -lavahi-common
|
||||||
|
|||||||
@ -1 +1 @@
|
|||||||
Subproject commit c8997b5260d665f7b3fe988d42bdf5d4ce434f4c
|
Subproject commit b57d178bf33ca647798b4ff02d63869b2b15fa4d
|
||||||
13
shared.pri
13
shared.pri
@ -11,7 +11,16 @@ greaterThan(QT_MAJOR_VERSION, 5) {
|
|||||||
DEFINES += QT_DISABLE_DEPRECATED_UP_TO=0x050F00
|
DEFINES += QT_DISABLE_DEPRECATED_UP_TO=0x050F00
|
||||||
}
|
}
|
||||||
|
|
||||||
QMAKE_CXXFLAGS *= -Werror -g -Wno-deprecated-declarations
|
win32-msvc {
|
||||||
|
QMAKE_CXXFLAGS += /WX
|
||||||
|
QMAKE_CXXFLAGS += /wd4996
|
||||||
|
} else {
|
||||||
|
QMAKE_CXXFLAGS += -Werror
|
||||||
|
QMAKE_CXXFLAGS += -Wno-deprecated-declarations
|
||||||
|
QMAKE_CXXFLAGS += -Wno-deprecated-copy
|
||||||
|
}
|
||||||
|
|
||||||
|
QMAKE_CXXFLAGS += -g
|
||||||
|
|
||||||
top_srcdir=$$PWD
|
top_srcdir=$$PWD
|
||||||
top_builddir=$$shadowed($$PWD)
|
top_builddir=$$shadowed($$PWD)
|
||||||
@ -37,8 +46,6 @@ INCLUDEPATH += $${top_builddir}
|
|||||||
# On Windows, -Wall goes mental, so not using it there
|
# On Windows, -Wall goes mental, so not using it there
|
||||||
!win32:QMAKE_CXXFLAGS += -Wall
|
!win32:QMAKE_CXXFLAGS += -Wall
|
||||||
|
|
||||||
QMAKE_CXXFLAGS += -Wno-deprecated-declarations -Wno-deprecated-copy
|
|
||||||
|
|
||||||
android: {
|
android: {
|
||||||
QMAKE_CXXFLAGS += -Wno-deprecated-declarations
|
QMAKE_CXXFLAGS += -Wno-deprecated-declarations
|
||||||
QMAKE_LFLAGS *= "-Wl,-z,max-page-size=16384"
|
QMAKE_LFLAGS *= "-Wl,-z,max-page-size=16384"
|
||||||
|
|||||||
Reference in New Issue
Block a user