ShuriZma
/
pcsx2
mirror of https://github.com/PCSX2/pcsx2.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

build: Remove i386_flag, as it is no longer used. (#5897) 

* build: Remove i386_flag, as it is no longer used.

build: Put back in ncpu.

* build: Move ncpu to set_make.
This commit is contained in:
arcum42 2022-04-28 13:35:15 -07:00 committed by GitHub
parent f5787f9ba0
commit dc08858e0f
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 1 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
build.sh
View File

@ -18,16 +18,6 @@
set -u set -u
# Function declarations # Function declarations
set_ncpu_toolfile()
{
ncpu=$(getconf NPROCESSORS_ONLN 2>/dev/null || getconf _NPROCESSORS_ONLN)
if [ "$(uname -s)" = 'Darwin' ]; then
i386_flag="-DCMAKE_OSX_ARCHITECTURES=i386"
elif [ "$(uname -s)" != 'FreeBSD' ]; then
i386_flag="-DCMAKE_TOOLCHAIN_FILE=cmake/linux-compiler-i386-multilib.cmake"
fi
}
find_freetype() find_freetype()
{ {
if [ "$(uname -m)" = "x86_64" ] && [ -e "/usr/include/x86_64-linux-gnu/freetype2/ft2build.h" ]; then if [ "$(uname -m)" = "x86_64" ] && [ -e "/usr/include/x86_64-linux-gnu/freetype2/ft2build.h" ]; then
@ -37,6 +27,7 @@ find_freetype()
set_make() set_make()
{ {
ncpu=$(getconf NPROCESSORS_ONLN 2>/dev/null || getconf _NPROCESSORS_ONLN)
if command -v ninja >/dev/null ; then if command -v ninja >/dev/null ; then
flags="$flags -GNinja" flags="$flags -GNinja"
make=ninja make=ninja
@ -152,7 +143,6 @@ build="$root/build"
coverity_dir="cov-int" coverity_dir="cov-int"
coverity_result=pcsx2-coverity.xz coverity_result=pcsx2-coverity.xz
set_ncpu_toolfile
set_make set_make
for ARG in "$@"; do for ARG in "$@"; do