From cf0d335f58b5ead32cc1b8709d63da4249d1a068 Mon Sep 17 00:00:00 2001 From: falkTX Date: Mon, 26 Feb 2018 20:14:36 +0100 Subject: [PATCH] Custom prefix for windows 32bit non-sse builds --- data/windows/build-deps.sh | 2 +- data/windows/build-win.sh | 9 +++++++-- 2 files changed, 8 insertions(+), 3 deletions(-) diff --git a/data/windows/build-deps.sh b/data/windows/build-deps.sh index b4b12afea..9f6f6c915 100755 --- a/data/windows/build-deps.sh +++ b/data/windows/build-deps.sh @@ -21,7 +21,7 @@ source common.env cleanup_prefix() { -rm -rf $TARGETDIR/carla-w32/ $TARGETDIR/carla-w64/ +rm -rf ${TARGETDIR}/carla-w32nosse ${TARGETDIR}/carla-w32/ ${TARGETDIR}/carla-w64/ } diff --git a/data/windows/build-win.sh b/data/windows/build-win.sh index 1421d8f29..e7cf2b7fa 100755 --- a/data/windows/build-win.sh +++ b/data/windows/build-win.sh @@ -4,12 +4,17 @@ # check input ARCH="${1}" +ARCH_PREFIX="${1}" -if [ x"${ARCH}" != x"32" ] && [ x"${ARCH}" != x"64" ]; then +if [ x"${ARCH}" != x"32" ] && [ x"${ARCH}" != x"32nosse" ] && [ x"${ARCH}" != x"64" ]; then echo "usage: $0 32|64" exit 1 fi +if [ x"${ARCH}" = x"32nosse" ]; then + ARCH="32" +fi + # --------------------------------------------------------------------------------------------------------------------- # stop on error @@ -38,7 +43,7 @@ fi MINGW_PREFIX="${CPUARCH}-w64-mingw32" -export PREFIX=${TARGETDIR}/carla-w${ARCH} +export PREFIX=${TARGETDIR}/carla-w${ARCH_PREFIX} export PATH=/opt/mingw${ARCH}/bin:${PREFIX}/bin/usr/sbin:/usr/bin:/sbin:/bin export PKG_CONFIG_PATH=${PREFIX}/lib/pkgconfig