Valve/Proton
1
0
Fork 0
mirror of https://github.com/ValveSoftware/Proton.git synced 2024-12-27 23:25:50 +03:00
Code Issues Packages Projects Releases Wiki Activity

build-mingw-w64.sh: Adjust mingw-w64 configure to closer match Arch Linux

Browse Source
This commit is contained in:
Andrew Eikum 2019-11-25 13:04:55 -06:00
parent 68162a8fc1
commit 354428c2c5
1 changed files with 5 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
build-mingw-w64.sh
View File

@ -109,7 +109,6 @@ function build_arch {
--host=$WIN32_TARGET_ARCH \ --host=$WIN32_TARGET_ARCH \
--enable-sdk=all \ --enable-sdk=all \
--enable-secure-api \ --enable-secure-api \
--enable-idl \
$MINGW_W64_HEADERS_EXTRA_CONFIGURE $MINGW_W64_HEADERS_EXTRA_CONFIGURE
fi fi
PATH=$NEWPATH:$PATH make $JOBS install PATH=$NEWPATH:$PATH make $JOBS install
@ -151,6 +150,7 @@ function build_arch {
PATH=$NEWPATH ../../$MINGW_W64_SRCDIR/mingw-w64-crt/configure \ PATH=$NEWPATH ../../$MINGW_W64_SRCDIR/mingw-w64-crt/configure \
--prefix=$DST_DIR/$WIN32_TARGET_ARCH/ \ --prefix=$DST_DIR/$WIN32_TARGET_ARCH/ \
--host=$WIN32_TARGET_ARCH \ --host=$WIN32_TARGET_ARCH \
--enable-wildcard \
$MINGW_W64_CRT_EXTRA_CONFIGURE $MINGW_W64_CRT_EXTRA_CONFIGURE
fi fi
PATH=$NEWPATH make $JOBS PATH=$NEWPATH make $JOBS
@ -163,6 +163,8 @@ function build_arch {
PATH=$NEWPATH ../../$MINGW_W64_SRCDIR/mingw-w64-libraries/winpthreads/configure \ PATH=$NEWPATH ../../$MINGW_W64_SRCDIR/mingw-w64-libraries/winpthreads/configure \
--prefix=$DST_DIR/$WIN32_TARGET_ARCH/ \ --prefix=$DST_DIR/$WIN32_TARGET_ARCH/ \
--host=$WIN32_TARGET_ARCH \ --host=$WIN32_TARGET_ARCH \
--enable-static \
--enable-shared \
$MINGW_W64_WINPTHREADS_EXTRA_CONFIGURE $MINGW_W64_WINPTHREADS_EXTRA_CONFIGURE
fi fi
PATH=$NEWPATH make $JOBS PATH=$NEWPATH make $JOBS
@ -194,8 +196,8 @@ setup_src
mkdir -p $DST_DIR mkdir -p $DST_DIR
build_arch i686-linux-gnu i686-w64-mingw32 MINGW_W64_CRT_EXTRA_CONFIGURE="--disable-lib64 --enable-lib32" build_arch i686-linux-gnu i686-w64-mingw32
build_arch x86_64-linux-gnu x86_64-w64-mingw32 MINGW_W64_CRT_EXTRA_CONFIGURE="--disable-lib32 --enable-lib64" build_arch x86_64-linux-gnu x86_64-w64-mingw32
echo "Done!" echo "Done!"