Skip to content

Commit

Permalink
Remove specific workaround for windows
Browse files Browse the repository at this point in the history
  • Loading branch information
fjtrujy committed Mar 31, 2024
1 parent d47e996 commit 2fded2f
Show file tree
Hide file tree
Showing 2 changed files with 0 additions and 28 deletions.
14 changes: 0 additions & 14 deletions scripts/002-gcc-stage1.sh
Original file line number Diff line number Diff line change
Expand Up @@ -33,20 +33,6 @@ fi
cd "$REPO_FOLDER"

TARGET="psp"
OSVER=$(uname)

# Workaround to build with newer mingw-w64 https://github.com/msys2/MINGW-packages/commit/4360ed1a7470728be1dba0687df764604f1992d9
if [ "${OSVER:0:10}" == MINGW64_NT ]; then
export lt_cv_sys_max_cmd_len=8000
export CC=x86_64-w64-mingw32-gcc
TARG_XTRA_OPTS="--host=x86_64-w64-mingw32"
export CPPFLAGS="-DWIN32_LEAN_AND_MEAN -DCOM_NO_WINDOWS_H"
elif [ "${OSVER:0:10}" == MINGW32_NT ]; then
export lt_cv_sys_max_cmd_len=8000
export CC=i686-w64-mingw32-gcc
TARG_XTRA_OPTS="--host=i686-w64-mingw32"
export CPPFLAGS="-DWIN32_LEAN_AND_MEAN -DCOM_NO_WINDOWS_H"
fi

## Determine the maximum number of processes that Make can work with.
PROC_NR=$(getconf _NPROCESSORS_ONLN)
Expand Down
14 changes: 0 additions & 14 deletions scripts/005-gcc-stage2.sh
Original file line number Diff line number Diff line change
Expand Up @@ -33,20 +33,6 @@ fi
cd "$REPO_FOLDER"

TARGET="psp"
OSVER=$(uname)

# Workaround to build with newer mingw-w64 https://github.com/msys2/MINGW-packages/commit/4360ed1a7470728be1dba0687df764604f1992d9
if [ "${OSVER:0:10}" == MINGW64_NT ]; then
export lt_cv_sys_max_cmd_len=8000
export CC=x86_64-w64-mingw32-gcc
TARG_XTRA_OPTS="--host=x86_64-w64-mingw32"
export CPPFLAGS="-DWIN32_LEAN_AND_MEAN -DCOM_NO_WINDOWS_H"
elif [ "${OSVER:0:10}" == MINGW32_NT ]; then
export lt_cv_sys_max_cmd_len=8000
export CC=i686-w64-mingw32-gcc
TARG_XTRA_OPTS="--host=i686-w64-mingw32"
export CPPFLAGS="-DWIN32_LEAN_AND_MEAN -DCOM_NO_WINDOWS_H"
fi

## Determine the maximum number of processes that Make can work with.
PROC_NR=$(getconf _NPROCESSORS_ONLN)
Expand Down

0 comments on commit 2fded2f

Please sign in to comment.