2 changed files with 8 additions and 3 deletions
Unified View
Diff Options
-
+1 -1data/windows/build-deps.sh
-
+7 -2data/windows/build-win.sh
+ 1
- 1
data/windows/build-deps.sh
View File
| @@ -21,7 +21,7 @@ source common.env | |||||
| cleanup_prefix() | cleanup_prefix() | ||||
| { | { | ||||
| rm -rf $TARGETDIR/carla-w32/ $TARGETDIR/carla-w64/ | |||||
| rm -rf ${TARGETDIR}/carla-w32nosse ${TARGETDIR}/carla-w32/ ${TARGETDIR}/carla-w64/ | |||||
| } | } | ||||
+ 7
- 2
data/windows/build-win.sh
View File
| @@ -4,12 +4,17 @@ | |||||
| # check input | # check input | ||||
| ARCH="${1}" | 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" | echo "usage: $0 32|64" | ||||
| exit 1 | exit 1 | ||||
| fi | fi | ||||
| if [ x"${ARCH}" = x"32nosse" ]; then | |||||
| ARCH="32" | |||||
| fi | |||||
| # --------------------------------------------------------------------------------------------------------------------- | # --------------------------------------------------------------------------------------------------------------------- | ||||
| # stop on error | # stop on error | ||||
| @@ -38,7 +43,7 @@ fi | |||||
| MINGW_PREFIX="${CPUARCH}-w64-mingw32" | 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 PATH=/opt/mingw${ARCH}/bin:${PREFIX}/bin/usr/sbin:/usr/bin:/sbin:/bin | ||||
| export PKG_CONFIG_PATH=${PREFIX}/lib/pkgconfig | export PKG_CONFIG_PATH=${PREFIX}/lib/pkgconfig | ||||