diff --git a/data/windows/create-wineprefixes.sh b/data/windows/create-wineprefixes.sh index 1f5c37f28..dcd25816e 100755 --- a/data/windows/create-wineprefixes.sh +++ b/data/windows/create-wineprefixes.sh @@ -1,11 +1,12 @@ #!/bin/bash rm -rf ~/.winepy3 +rm -rf ~/.winepy3_x32 rm -rf ~/.winepy3_x86 rm -rf ~/.winepy3_x64 export WINEARCH=win32 -export WINEPREFIX=~/.winepy3_x86 +export WINEPREFIX=~/.winepy3_x32 wineboot winetricks vcrun2010 winetricks corefonts diff --git a/data/windows/pack-win.sh b/data/windows/pack-win.sh index d964729b3..bbdf93b0d 100755 --- a/data/windows/pack-win.sh +++ b/data/windows/pack-win.sh @@ -131,12 +131,18 @@ chmod +x Carla.exe # Cleanup rm -f Carla.zip CarlaControl.zip +if [ x"${ARCH}" = x"32" ]; then + VCARCH="86" +else + VCARCH="${ARCH}" +fi + # Create release zip rm -rf ${PKG_FOLDER} mkdir ${PKG_FOLDER} mkdir ${PKG_FOLDER}/vcredist cp Carla.exe README.txt ${PKG_FOLDER} -cp ~/.cache/winetricks/vcrun2010/vcredist_x${ARCH}.exe ${PKG_FOLDER}/vcredist +cp ~/.cache/winetricks/vcrun2010/vcredist_x${VCARCH}.exe ${PKG_FOLDER}/vcredist zip -r -9 ${PKG_FOLDER}.zip ${PKG_FOLDER} cd ../..