noury/mirror-chatterino2
1
0
Fork 0
mirror of https://github.com/Chatterino/chatterino2.git synced 2024-11-13 19:49:51 +01:00
Code Issues Packages Projects Releases Wiki Activity

fix MSVC (2015) libcommuni link errors, and use correct warn flag (#44)

Browse source 
* use fixed libcommuni submodule

* warn flag -W4 should be used for MSVS instead of -Wall, move libcommuni
define and include together

* define correct warning flags for MSVC and else
This commit is contained in:
hemirt 2017-05-27 23:35:58 +02:00 committed by fourtf
parent d113115822
commit e7b727fa64
3 changed files with 11 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
.gitmodules vendored
View file

@ -1,3 +1,3 @@
[submodule "lib/libcommuni"] [submodule "lib/libcommuni"]
path = lib/libcommuni path = lib/libcommuni
url = https://github.com/communi/libcommuni url = https://github.com/hemirt/libcommuni

14
chatterino.pro
View file

@ -9,6 +9,7 @@ CONFIG += communi
COMMUNI += core model util COMMUNI += core model util
CONFIG += c++14 CONFIG += c++14
DEFINES += IRC_NAMESPACE=Communi
include(lib/libcommuni/src/src.pri) include(lib/libcommuni/src/src.pri)
greaterThan(QT_MAJOR_VERSION, 4): QT += widgets greaterThan(QT_MAJOR_VERSION, 4): QT += widgets
@ -17,13 +18,16 @@ TARGET = chatterino
TEMPLATE = app TEMPLATE = app
DEFINES += QT_DEPRECATED_WARNINGS DEFINES += QT_DEPRECATED_WARNINGS
DEFINES += IRC_NAMESPACE=Communi
# Define warning flags for Chatterino # Define warning flags for Chatterino
QMAKE_CXXFLAGS_WARN_ON = -Wall win32-msvc* {
QMAKE_CXXFLAGS_WARN_ON += -Wno-unused-function QMAKE_CXXFLAGS_WARN_ON = -W4
QMAKE_CXXFLAGS_WARN_ON += -Wno-switch } else {
QMAKE_CXXFLAGS_WARN_ON += -Wno-deprecated-declarations QMAKE_CXXFLAGS_WARN_ON = -Wall
QMAKE_CXXFLAGS_WARN_ON += -Wno-unused-function
QMAKE_CXXFLAGS_WARN_ON += -Wno-switch
QMAKE_CXXFLAGS_WARN_ON += -Wno-deprecated-declarations
}
# do not use windows min/max macros # do not use windows min/max macros
win32 { win32 {

2
lib/libcommuni

@ -1 +1 @@
Subproject commit 1c7ebef19662ba5b09a78e01fc77dd901e302947 Subproject commit a31ffb037eadac65dba73ad2b2da6dafe31e3bf7