mirror-games/glest-source
1
0
Fork 0
mirror of https://github.com/glest/glest-source.git synced 2025-02-23 11:15:02 +01:00
Code Issues Projects Releases Wiki Activity

Whoopsie, now with better CPU detection and fallback

Browse Source
This commit is contained in:
Tom Reynolds 2013-05-15 05:30:51 +00:00
parent febbf5012c
commit 4bc007f239
5 changed files with 10 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
build-codeblocks-project.sh
View File

@ -11,7 +11,8 @@ cd codeblocks
if [ -f 'CMakeCache.txt' ]; then rm -f 'CMakeCache.txt'; fi
LANG=C
NUMCORES=`nproc`
NUMCORES=`lscpu -p | grep -cv '^#'`
if [ "$NUMCORES" = '' ]; then NUMCORES=1; fi
# This is for regular developers and used by our installer
cmake -G"CodeBlocks - Unix Makefiles" -DCMAKE_INSTALL_PREFIX= -DWANT_STATIC_LIBS=ON -DCMAKE_ECLIPSE_MAKE_ARGUMENTS=-j$NUMCORES ${CURRENTDIR}

3
build-eclipse-project.sh
View File

@ -11,7 +11,8 @@ cd eclipse
if [ -f 'CMakeCache.txt' ]; then rm -f 'CMakeCache.txt'; fi
LANG=C
NUMCORES=`nproc`
NUMCORES=`lscpu -p | grep -cv '^#'`
if [ "$NUMCORES" = '' ]; then NUMCORES=1; fi
# This is for regular developers and used by our installer
cmake -G"Eclipse CDT4 - Unix Makefiles" -DCMAKE_INSTALL_PREFIX= -DWANT_STATIC_LIBS=ON -DCMAKE_ECLIPSE_MAKE_ARGUMENTS=-j$NUMCORES ${CURRENTDIR}

3
build-mg-win32.sh
View File

@ -5,7 +5,8 @@
# Originally written by Mark Vejvoda <mark_vejvoda@hotmail.com>
# Copyright (c) 2012 Mark Vejvoda under GNU GPL v3.0
NUMCORES=`nproc`
NUMCORES=`lscpu -p | grep -cv '^#'`
if [ "$NUMCORES" = '' ]; then NUMCORES=1; fi
#PROJECT_SOURCE_DIR="$(dirname $(readlink -f $0))"
mkdir -p build-win32

3
build-mg.sh
View File

@ -5,7 +5,8 @@
# Copyright (c) 2011 Mark Vejvoda under GNU GPL v3.0+
LANG=C
NUMCORES=`nproc`
NUMCORES=`lscpu -p | grep -cv '^#'`
if [ "$NUMCORES" = '' ]; then NUMCORES=1; fi
mkdir -p build
cd build

3
mk/linux/mojosetup/megaglest-installer/make.sh
View File

@ -119,7 +119,8 @@ CXX=/usr/bin/g++
OSTYPE=`uname -s`
if [ "$OSTYPE" = "Linux" ]; then
NCPU=`nproc`
NCPU=`lscpu -p | grep -cv '^#'`
if [ "$NUMCORES" = '' ]; then NUMCORES=1; fi
elif [ "$OSTYPE" = "Darwin" ]; then
NCPU=`sysctl -n hw.ncpu`
elif [ "$OSTYPE" = "SunOS" ]; then