Rampoina
/
MegaGlest
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Merge branch 'develop' of https://github.com/MegaGlest/megaglest-source into develop

This commit is contained in:
SoftCoder 2017-01-30 11:21:06 -08:00
parent 6f350d6319 a3c930b2da
commit e261e5860e
2 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
mk/linux/mg_cppcheck.sh
View File

@ -4,12 +4,12 @@
# Written by Mark Vejvoda <mark_vejvoda@hotmail.com>
# Copyright (c) 2011 Mark Vejvoda under GNU GPL v3.0+
OUTFILE=./cppcheck.log
CPPCHECK=$(which cppcheck)
LOGFILE=/tmp/cppcheck.log
CPUS=`lscpu -p | grep -cv '^#'`
if [ "$CPUS" = '' ]; then CPUS=1; fi
#~/cppcheck-1.62/cppcheck ../../source/ -i ../../source/win32_deps -i ../../source/configurator -i ../../source/shared_lib/sources/libircclient -i ../../source/shared_lib/sources/platform/miniupnpc -j $CPUS --enable=all --force --verbose 2> $OUTFILE
cppcheck ../../source/ -i ../../source/win32_deps -i ../../source/configurator -i ../../source/shared_lib/sources/libircclient -i ../../source/shared_lib/sources/platform/miniupnpc -i ../../source/shared_lib/sources/streflop -j $CPUS --enable=all --force --verbose 2> $OUTFILE
$CPPCHECK ../../source/ -i ../../source/win32_deps -i ../../source/configurator -i ../../source/shared_lib/sources/libircclient -i ../../source/shared_lib/sources/platform/miniupnpc -i ../../source/shared_lib/sources/streflop -j $CPUS --enable=all --force --verbose 2> $LOGFILE
echo "Results from cppcheck were written to $OUTFILE"
echo "Results from cppcheck were written to $LOGFILE"

2
source/masterserver

@ -1 +1 @@
Subproject commit f6e36bb1821041254bf3d8d887e8ef6eb5391192
Subproject commit 2a2d48ac6a3ffe948ae1d9f3e0a859a1d58bc2ab