From a43854420d8dbc367be083dedb4a151303de51ba Mon Sep 17 00:00:00 2001 From: xawotihs Date: Wed, 27 Nov 2013 20:33:59 +0100 Subject: [PATCH 1/3] Fixed compilation issue on Windows --- projects/mtg/src/DeckStats.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/projects/mtg/src/DeckStats.cpp b/projects/mtg/src/DeckStats.cpp index 5cb4c4dff..9f50b2a7c 100644 --- a/projects/mtg/src/DeckStats.cpp +++ b/projects/mtg/src/DeckStats.cpp @@ -287,8 +287,8 @@ void StatsWrapper::initValues() countCreatures = countSpells = countInstants = countEnchantments = countSorceries = countArtifacts = 0; //this works only with 0.0f on floats - memset(noLandsProbInTurn, 0.0f, sizeof(float) * Constants::STATS_FOR_TURNS); - memset(noCreaturesProbInTurn, 0.0f, sizeof(float) * Constants::STATS_FOR_TURNS); + memset(noLandsProbInTurn, (int)0.0f, sizeof(float) * Constants::STATS_FOR_TURNS); + memset(noCreaturesProbInTurn, (int)0.0f, sizeof(float) * Constants::STATS_FOR_TURNS); memset(countCardsPerCost, 0, sizeof(int) * (Constants::STATS_MAX_MANA_COST + 1)); memset(countCreaturesPerCost, 0, sizeof(int) * (Constants::STATS_MAX_MANA_COST + 1)); From dc118c64b85dfada923de59767ff004f0cb24b08 Mon Sep 17 00:00:00 2001 From: xawotihs Date: Wed, 27 Nov 2013 23:04:46 +0100 Subject: [PATCH 2/3] Fixed compilation on Mac --- projects/mtg/wagic-qt.pro | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/projects/mtg/wagic-qt.pro b/projects/mtg/wagic-qt.pro index d9b1171fe..70f98804e 100644 --- a/projects/mtg/wagic-qt.pro +++ b/projects/mtg/wagic-qt.pro @@ -31,11 +31,11 @@ TEMPLATE = app #!macx:CONFIG += precompile_header unix|macx:QMAKE_CXXFLAGS += -Wno-unused-parameter -unix|macx:QMAKE_CXXFLAGS += -Wno-unused-but-set-parameter -unix|macx:QMAKE_CXXFLAGS += -Wno-unused-but-set-variable +unix:!macx:QMAKE_CXXFLAGS += -Wno-unused-but-set-parameter +unix:!macx:QMAKE_CXXFLAGS += -Wno-unused-but-set-variable unix|macx:QMAKE_CXXFLAGS += -Wno-unused-value -unix|macx:QMAKE_CXXFLAGS += -Wno-unused-local-typedefs -unix|macx:!maemo5:!symbian:QMAKE_CXXFLAGS += -Werror +unix:!macx:QMAKE_CXXFLAGS += -Wno-unused-local-typedefs +unix:!macx:!maemo5:!symbian:QMAKE_CXXFLAGS += -Werror windows:DEFINES += _CRT_SECURE_NO_WARNINGS unix|macx:DEFINES += LINUX From 89206b3a6b6f0cf4e5c9827f140054f12951680b Mon Sep 17 00:00:00 2001 From: Dmitry Panin Date: Thu, 28 Nov 2013 16:43:03 +0400 Subject: [PATCH 3/3] Added testing that QT GUI build is successfull --- travis-script.sh | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/travis-script.sh b/travis-script.sh index 6927f0dc8..4dbe2fbc1 100755 --- a/travis-script.sh +++ b/travis-script.sh @@ -15,6 +15,13 @@ $ANDROID list targets $ANDROID update project -t 1 -p projects/mtg/Android ant debug -f projects/mtg/Android/build.xml +# we're building a Qt version with GUI here +mkdir qt-gui-build +cd qt-gui-build +qmake ../projects/mtg/wagic-qt.pro CONFIG+=debug CONFIG+=graphics +make -j 8 +cd .. + # let's try an Intel linux binary qmake projects/mtg/wagic-qt.pro CONFIG+=console CONFIG+=debug DEFINES+=CAPTURE_STDERR make -j 8