Whoopsie, now with better CPU detection and fallback
This commit is contained in:
parent
febbf5012c
commit
4bc007f239
|
@ -11,7 +11,8 @@ cd codeblocks
|
||||||
if [ -f 'CMakeCache.txt' ]; then rm -f 'CMakeCache.txt'; fi
|
if [ -f 'CMakeCache.txt' ]; then rm -f 'CMakeCache.txt'; fi
|
||||||
|
|
||||||
LANG=C
|
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
|
# 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}
|
cmake -G"CodeBlocks - Unix Makefiles" -DCMAKE_INSTALL_PREFIX= -DWANT_STATIC_LIBS=ON -DCMAKE_ECLIPSE_MAKE_ARGUMENTS=-j$NUMCORES ${CURRENTDIR}
|
||||||
|
|
|
@ -11,7 +11,8 @@ cd eclipse
|
||||||
if [ -f 'CMakeCache.txt' ]; then rm -f 'CMakeCache.txt'; fi
|
if [ -f 'CMakeCache.txt' ]; then rm -f 'CMakeCache.txt'; fi
|
||||||
|
|
||||||
LANG=C
|
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
|
# 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}
|
cmake -G"Eclipse CDT4 - Unix Makefiles" -DCMAKE_INSTALL_PREFIX= -DWANT_STATIC_LIBS=ON -DCMAKE_ECLIPSE_MAKE_ARGUMENTS=-j$NUMCORES ${CURRENTDIR}
|
||||||
|
|
|
@ -5,7 +5,8 @@
|
||||||
# Originally written by Mark Vejvoda <mark_vejvoda@hotmail.com>
|
# Originally written by Mark Vejvoda <mark_vejvoda@hotmail.com>
|
||||||
# Copyright (c) 2012 Mark Vejvoda under GNU GPL v3.0
|
# 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))"
|
#PROJECT_SOURCE_DIR="$(dirname $(readlink -f $0))"
|
||||||
mkdir -p build-win32
|
mkdir -p build-win32
|
||||||
|
|
|
@ -5,7 +5,8 @@
|
||||||
# Copyright (c) 2011 Mark Vejvoda under GNU GPL v3.0+
|
# Copyright (c) 2011 Mark Vejvoda under GNU GPL v3.0+
|
||||||
|
|
||||||
LANG=C
|
LANG=C
|
||||||
NUMCORES=`nproc`
|
NUMCORES=`lscpu -p | grep -cv '^#'`
|
||||||
|
if [ "$NUMCORES" = '' ]; then NUMCORES=1; fi
|
||||||
|
|
||||||
mkdir -p build
|
mkdir -p build
|
||||||
cd build
|
cd build
|
||||||
|
|
|
@ -119,7 +119,8 @@ CXX=/usr/bin/g++
|
||||||
|
|
||||||
OSTYPE=`uname -s`
|
OSTYPE=`uname -s`
|
||||||
if [ "$OSTYPE" = "Linux" ]; then
|
if [ "$OSTYPE" = "Linux" ]; then
|
||||||
NCPU=`nproc`
|
NCPU=`lscpu -p | grep -cv '^#'`
|
||||||
|
if [ "$NUMCORES" = '' ]; then NUMCORES=1; fi
|
||||||
elif [ "$OSTYPE" = "Darwin" ]; then
|
elif [ "$OSTYPE" = "Darwin" ]; then
|
||||||
NCPU=`sysctl -n hw.ncpu`
|
NCPU=`sysctl -n hw.ncpu`
|
||||||
elif [ "$OSTYPE" = "SunOS" ]; then
|
elif [ "$OSTYPE" = "SunOS" ]; then
|
||||||
|
|
Loading…
Reference in New Issue