Mahtan/wagic
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'master' into wp8

Browse Source
This commit is contained in:
xawotihs
2013-11-28 22:22:42 +01:00
parent d6c7dc22df 89206b3a6b
commit 9a493e4af4
2 changed files with 11 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
projects/mtg/wagic-qt.pro
+4 -4
View File
@@ -31,11 +31,11 @@ TEMPLATE = app
#!macx:CONFIG += precompile_header #!macx:CONFIG += precompile_header
unix|macx:QMAKE_CXXFLAGS += -Wno-unused-parameter unix|macx:QMAKE_CXXFLAGS += -Wno-unused-parameter
unix|macx:QMAKE_CXXFLAGS += -Wno-unused-but-set-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-variable
unix|macx:QMAKE_CXXFLAGS += -Wno-unused-value unix|macx:QMAKE_CXXFLAGS += -Wno-unused-value
unix|macx:QMAKE_CXXFLAGS += -Wno-unused-local-typedefs unix:!macx:QMAKE_CXXFLAGS += -Wno-unused-local-typedefs
unix|macx:!maemo5:!symbian:QMAKE_CXXFLAGS += -Werror unix:!macx:!maemo5:!symbian:QMAKE_CXXFLAGS += -Werror
windows:DEFINES += _CRT_SECURE_NO_WARNINGS windows:DEFINES += _CRT_SECURE_NO_WARNINGS
unix|macx:DEFINES += LINUX unix|macx:DEFINES += LINUX
travis-script.sh
+7
View File
@@ -15,6 +15,13 @@ $ANDROID list targets
$ANDROID update project -t 1 -p projects/mtg/Android $ANDROID update project -t 1 -p projects/mtg/Android
ant debug -f projects/mtg/Android/build.xml 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 # let's try an Intel linux binary
qmake projects/mtg/wagic-qt.pro CONFIG+=console CONFIG+=debug DEFINES+=CAPTURE_STDERR qmake projects/mtg/wagic-qt.pro CONFIG+=console CONFIG+=debug DEFINES+=CAPTURE_STDERR
make -j 8 make -j 8