diff --git a/Makefile b/Makefile index cda0a17166..1de8d8341a 100644 --- a/Makefile +++ b/Makefile @@ -78,6 +78,9 @@ INSTALL_DATA = $(INSTALL) -m644 # Toolchain MSBUILD = msbuild -verbosity:m -nologo +# Enable 32 bit builds while generating the windows installer +WIN32 = false + # program targets VERSION = $(shell git name-rev --name-only --tags --no-undefined HEAD 2>/dev/null || echo git-`git rev-parse --short HEAD`) @@ -146,7 +149,11 @@ all: dependencies core core: @command -v $(MSBUILD) >/dev/null || (echo "OpenRA requires the '$(MSBUILD)' tool provided by Mono >= 5.4."; exit 1) +ifeq ($(WIN32), $(filter $(WIN32),true yes y on 1)) + @$(MSBUILD) -t:build -p:Configuration="Release-x86" +else @$(MSBUILD) -t:build -p:Configuration=Release +endif clean: @ $(MSBUILD) -t:clean @@ -169,7 +176,11 @@ linux-native-dependencies: @./thirdparty/configure-native-deps.sh windows-dependencies: cli-dependencies geoip-dependencies - @./thirdparty/fetch-thirdparty-deps-windows.sh +ifeq ($(WIN32), $(filter $(WIN32),true yes y on 1)) + @./thirdparty/fetch-thirdparty-deps-windows.sh x86 +else + @./thirdparty/fetch-thirdparty-deps-windows.sh x64 +endif osx-dependencies: cli-dependencies geoip-dependencies @./thirdparty/fetch-thirdparty-deps-osx.sh diff --git a/OpenRA.Game/OpenRA.Game.csproj b/OpenRA.Game/OpenRA.Game.csproj index 17fafc4302..69014adf1d 100644 --- a/OpenRA.Game/OpenRA.Game.csproj +++ b/OpenRA.Game/OpenRA.Game.csproj @@ -12,12 +12,11 @@ OpenRA .. false - x86 - x86 + AnyCPU false false ..\OpenRA.ruleset - Release;Debug + Release;Debug;Release-x86 @@ -27,6 +26,9 @@ DEBUG;TRACE false + + true + Project Game.Mod=ra diff --git a/OpenRA.Mods.Cnc/OpenRA.Mods.Cnc.csproj b/OpenRA.Mods.Cnc/OpenRA.Mods.Cnc.csproj index 286f08fb40..aa49699645 100644 --- a/OpenRA.Mods.Cnc/OpenRA.Mods.Cnc.csproj +++ b/OpenRA.Mods.Cnc/OpenRA.Mods.Cnc.csproj @@ -8,8 +8,7 @@ true ../mods/common false - x86 - x86 + AnyCPU false ..\OpenRA.ruleset diff --git a/OpenRA.Mods.Common/OpenRA.Mods.Common.csproj b/OpenRA.Mods.Common/OpenRA.Mods.Common.csproj index dde3fcee98..3016763d67 100644 --- a/OpenRA.Mods.Common/OpenRA.Mods.Common.csproj +++ b/OpenRA.Mods.Common/OpenRA.Mods.Common.csproj @@ -8,8 +8,7 @@ true ../mods/common false - x86 - x86 + AnyCPU false ..\OpenRA.ruleset diff --git a/OpenRA.Mods.D2k/OpenRA.Mods.D2k.csproj b/OpenRA.Mods.D2k/OpenRA.Mods.D2k.csproj index 6aeaaa5e9c..10786ecd37 100644 --- a/OpenRA.Mods.D2k/OpenRA.Mods.D2k.csproj +++ b/OpenRA.Mods.D2k/OpenRA.Mods.D2k.csproj @@ -8,8 +8,7 @@ true ../mods/d2k false - x86 - x86 + AnyCPU false ..\OpenRA.ruleset diff --git a/OpenRA.Platforms.Default/OpenRA.Platforms.Default.csproj b/OpenRA.Platforms.Default/OpenRA.Platforms.Default.csproj index fffabda7c7..bb6aa439f4 100644 --- a/OpenRA.Platforms.Default/OpenRA.Platforms.Default.csproj +++ b/OpenRA.Platforms.Default/OpenRA.Platforms.Default.csproj @@ -8,8 +8,7 @@ true .. false - x86 - x86 + AnyCPU false ..\OpenRA.ruleset diff --git a/OpenRA.PostProcess/OpenRA.PostProcess.csproj b/OpenRA.PostProcess/OpenRA.PostProcess.csproj index eb6ba7381f..0351fbe0d8 100644 --- a/OpenRA.PostProcess/OpenRA.PostProcess.csproj +++ b/OpenRA.PostProcess/OpenRA.PostProcess.csproj @@ -10,11 +10,11 @@ 5 true true - x86 - x86 + AnyCPU false false ..\OpenRA.ruleset + Debug;Release;Release-x86 @@ -24,6 +24,9 @@ DEBUG;TRACE false + + true + diff --git a/OpenRA.Server/OpenRA.Server.csproj b/OpenRA.Server/OpenRA.Server.csproj index 5b391471d9..14a305bbf2 100644 --- a/OpenRA.Server/OpenRA.Server.csproj +++ b/OpenRA.Server/OpenRA.Server.csproj @@ -10,11 +10,11 @@ 5 true true - x86 - x86 + AnyCPU false false ..\OpenRA.ruleset + Release;Debug;Release-x86 @@ -24,6 +24,9 @@ DEBUG;TRACE false + + true + diff --git a/OpenRA.Test/OpenRA.Test.csproj b/OpenRA.Test/OpenRA.Test.csproj index 670ec59912..7a8f545dc3 100644 --- a/OpenRA.Test/OpenRA.Test.csproj +++ b/OpenRA.Test/OpenRA.Test.csproj @@ -7,8 +7,7 @@ true .. false - x86 - x86 + AnyCPU false ..\OpenRA.ruleset diff --git a/OpenRA.Utility/OpenRA.Utility.csproj b/OpenRA.Utility/OpenRA.Utility.csproj index 5b391471d9..14a305bbf2 100644 --- a/OpenRA.Utility/OpenRA.Utility.csproj +++ b/OpenRA.Utility/OpenRA.Utility.csproj @@ -10,11 +10,11 @@ 5 true true - x86 - x86 + AnyCPU false false ..\OpenRA.ruleset + Release;Debug;Release-x86 @@ -24,6 +24,9 @@ DEBUG;TRACE false + + true + diff --git a/OpenRA.sln b/OpenRA.sln index 54aa441a44..fde7d02055 100644 --- a/OpenRA.sln +++ b/OpenRA.sln @@ -180,46 +180,66 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "OpenRA.PostProcess", "OpenR EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution - Debug|x86 = Debug|x86 - Release|x86 = Release|x86 + Debug|Any CPU = Debug|Any CPU + Release|Any CPU = Release|Any CPU + Release-x86|Any CPU = Release-x86|Any CPU EndGlobalSection GlobalSection(ProjectConfigurationPlatforms) = postSolution - {0DFB103F-2962-400F-8C6D-E2C28CCBA633}.Debug|x86.ActiveCfg = Debug|x86 - {0DFB103F-2962-400F-8C6D-E2C28CCBA633}.Debug|x86.Build.0 = Debug|x86 - {0DFB103F-2962-400F-8C6D-E2C28CCBA633}.Release|x86.ActiveCfg = Release|x86 - {0DFB103F-2962-400F-8C6D-E2C28CCBA633}.Release|x86.Build.0 = Release|x86 - {2881135D-4D62-493E-8F83-5EEE92CCC6BE}.Debug|x86.ActiveCfg = Debug|x86 - {2881135D-4D62-493E-8F83-5EEE92CCC6BE}.Debug|x86.Build.0 = Debug|x86 - {2881135D-4D62-493E-8F83-5EEE92CCC6BE}.Release|x86.ActiveCfg = Release|x86 - {2881135D-4D62-493E-8F83-5EEE92CCC6BE}.Release|x86.Build.0 = Release|x86 - {F33337BE-CB69-4B24-850F-07D23E408DDF}.Debug|x86.ActiveCfg = Debug|x86 - {F33337BE-CB69-4B24-850F-07D23E408DDF}.Debug|x86.Build.0 = Debug|x86 - {F33337BE-CB69-4B24-850F-07D23E408DDF}.Release|x86.ActiveCfg = Release|x86 - {F33337BE-CB69-4B24-850F-07D23E408DDF}.Release|x86.Build.0 = Release|x86 - {76F621A1-3D8E-4A99-9F7E-B071EB657817}.Debug|x86.ActiveCfg = Debug|x86 - {76F621A1-3D8E-4A99-9F7E-B071EB657817}.Debug|x86.Build.0 = Debug|x86 - {76F621A1-3D8E-4A99-9F7E-B071EB657817}.Release|x86.ActiveCfg = Release|x86 - {76F621A1-3D8E-4A99-9F7E-B071EB657817}.Release|x86.Build.0 = Release|x86 - {C0B0465C-6BE2-409C-8770-3A9BF64C4344}.Debug|x86.ActiveCfg = Debug|x86 - {C0B0465C-6BE2-409C-8770-3A9BF64C4344}.Debug|x86.Build.0 = Debug|x86 - {C0B0465C-6BE2-409C-8770-3A9BF64C4344}.Release|x86.ActiveCfg = Release|x86 - {C0B0465C-6BE2-409C-8770-3A9BF64C4344}.Release|x86.Build.0 = Release|x86 - {33D03738-C154-4028-8EA8-63A3C488A651}.Debug|x86.ActiveCfg = Debug|x86 - {33D03738-C154-4028-8EA8-63A3C488A651}.Debug|x86.Build.0 = Debug|x86 - {33D03738-C154-4028-8EA8-63A3C488A651}.Release|x86.ActiveCfg = Release|x86 - {33D03738-C154-4028-8EA8-63A3C488A651}.Release|x86.Build.0 = Release|x86 - {FE6C8CC0-2F07-442A-B29F-17617B3B7FC6}.Debug|x86.ActiveCfg = Debug|x86 - {FE6C8CC0-2F07-442A-B29F-17617B3B7FC6}.Debug|x86.Build.0 = Debug|x86 - {FE6C8CC0-2F07-442A-B29F-17617B3B7FC6}.Release|x86.ActiveCfg = Release|x86 - {FE6C8CC0-2F07-442A-B29F-17617B3B7FC6}.Release|x86.Build.0 = Release|x86 - {6CB8E1B7-6B36-4D93-8633-7C573E194AC4}.Debug|x86.ActiveCfg = Debug|x86 - {6CB8E1B7-6B36-4D93-8633-7C573E194AC4}.Debug|x86.Build.0 = Debug|x86 - {6CB8E1B7-6B36-4D93-8633-7C573E194AC4}.Release|x86.ActiveCfg = Release|x86 - {6CB8E1B7-6B36-4D93-8633-7C573E194AC4}.Release|x86.Build.0 = Release|x86 - {EE63AF7E-92EA-48FB-81E2-53D7D92F8050}.Debug|x86.ActiveCfg = Debug|x86 - {EE63AF7E-92EA-48FB-81E2-53D7D92F8050}.Debug|x86.Build.0 = Debug|x86 - {EE63AF7E-92EA-48FB-81E2-53D7D92F8050}.Release|x86.ActiveCfg = Release|x86 - {EE63AF7E-92EA-48FB-81E2-53D7D92F8050}.Release|x86.Build.0 = Release|x86 + {0DFB103F-2962-400F-8C6D-E2C28CCBA633}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {0DFB103F-2962-400F-8C6D-E2C28CCBA633}.Debug|Any CPU.Build.0 = Debug|Any CPU + {0DFB103F-2962-400F-8C6D-E2C28CCBA633}.Release|Any CPU.ActiveCfg = Release|Any CPU + {0DFB103F-2962-400F-8C6D-E2C28CCBA633}.Release|Any CPU.Build.0 = Release|Any CPU + {0DFB103F-2962-400F-8C6D-E2C28CCBA633}.Release-x86|Any CPU.ActiveCfg = Release-x86|Any CPU + {0DFB103F-2962-400F-8C6D-E2C28CCBA633}.Release-x86|Any CPU.Build.0 = Release-x86|Any CPU + {2881135D-4D62-493E-8F83-5EEE92CCC6BE}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {2881135D-4D62-493E-8F83-5EEE92CCC6BE}.Debug|Any CPU.Build.0 = Debug|Any CPU + {2881135D-4D62-493E-8F83-5EEE92CCC6BE}.Release|Any CPU.ActiveCfg = Release|Any CPU + {2881135D-4D62-493E-8F83-5EEE92CCC6BE}.Release|Any CPU.Build.0 = Release|Any CPU + {2881135D-4D62-493E-8F83-5EEE92CCC6BE}.Release-x86|Any CPU.ActiveCfg = Release|Any CPU + {2881135D-4D62-493E-8F83-5EEE92CCC6BE}.Release-x86|Any CPU.Build.0 = Release|Any CPU + {F33337BE-CB69-4B24-850F-07D23E408DDF}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {F33337BE-CB69-4B24-850F-07D23E408DDF}.Debug|Any CPU.Build.0 = Debug|Any CPU + {F33337BE-CB69-4B24-850F-07D23E408DDF}.Release|Any CPU.ActiveCfg = Release|Any CPU + {F33337BE-CB69-4B24-850F-07D23E408DDF}.Release|Any CPU.Build.0 = Release|Any CPU + {F33337BE-CB69-4B24-850F-07D23E408DDF}.Debug|Any CPU.Build.0 = Debug|Any CPU + {F33337BE-CB69-4B24-850F-07D23E408DDF}.Release-x86|Any CPU.ActiveCfg = Release-x86|Any CPU + {F33337BE-CB69-4B24-850F-07D23E408DDF}.Release-x86|Any CPU.Build.0 = Release-x86|Any CPU + {76F621A1-3D8E-4A99-9F7E-B071EB657817}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {76F621A1-3D8E-4A99-9F7E-B071EB657817}.Debug|Any CPU.Build.0 = Debug|Any CPU + {76F621A1-3D8E-4A99-9F7E-B071EB657817}.Release|Any CPU.ActiveCfg = Release|Any CPU + {76F621A1-3D8E-4A99-9F7E-B071EB657817}.Release|Any CPU.Build.0 = Release|Any CPU + {76F621A1-3D8E-4A99-9F7E-B071EB657817}.Release-x86|Any CPU.ActiveCfg = Release-x86|Any CPU + {76F621A1-3D8E-4A99-9F7E-B071EB657817}.Release-x86|Any CPU.Build.0 = Release-x86|Any CPU + {C0B0465C-6BE2-409C-8770-3A9BF64C4344}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {C0B0465C-6BE2-409C-8770-3A9BF64C4344}.Debug|Any CPU.Build.0 = Debug|Any CPU + {C0B0465C-6BE2-409C-8770-3A9BF64C4344}.Release|Any CPU.ActiveCfg = Release|Any CPU + {C0B0465C-6BE2-409C-8770-3A9BF64C4344}.Release|Any CPU.Build.0 = Release|Any CPU + {C0B0465C-6BE2-409C-8770-3A9BF64C4344}.Release-x86|Any CPU.ActiveCfg = Release|Any CPU + {C0B0465C-6BE2-409C-8770-3A9BF64C4344}.Release-x86|Any CPU.Build.0 = Release|Any CPU + {33D03738-C154-4028-8EA8-63A3C488A651}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {33D03738-C154-4028-8EA8-63A3C488A651}.Debug|Any CPU.Build.0 = Debug|Any CPU + {33D03738-C154-4028-8EA8-63A3C488A651}.Release|Any CPU.ActiveCfg = Release|Any CPU + {33D03738-C154-4028-8EA8-63A3C488A651}.Release|Any CPU.Build.0 = Release|Any CPU + {33D03738-C154-4028-8EA8-63A3C488A651}.Release-x86|Any CPU.ActiveCfg = Release|Any CPU + {33D03738-C154-4028-8EA8-63A3C488A651}.Release-x86|Any CPU.Build.0 = Release|Any CPU + {FE6C8CC0-2F07-442A-B29F-17617B3B7FC6}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {FE6C8CC0-2F07-442A-B29F-17617B3B7FC6}.Debug|Any CPU.Build.0 = Debug|Any CPU + {FE6C8CC0-2F07-442A-B29F-17617B3B7FC6}.Release|Any CPU.ActiveCfg = Release|Any CPU + {FE6C8CC0-2F07-442A-B29F-17617B3B7FC6}.Release|Any CPU.Build.0 = Release|Any CPU + {FE6C8CC0-2F07-442A-B29F-17617B3B7FC6}.Release-x86|Any CPU.ActiveCfg = Release|Any CPU + {FE6C8CC0-2F07-442A-B29F-17617B3B7FC6}.Release-x86|Any CPU.Build.0 = Release|Any CPU + {6CB8E1B7-6B36-4D93-8633-7C573E194AC4}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {6CB8E1B7-6B36-4D93-8633-7C573E194AC4}.Debug|Any CPU.Build.0 = Debug|Any CPU + {6CB8E1B7-6B36-4D93-8633-7C573E194AC4}.Release|Any CPU.ActiveCfg = Release|Any CPU + {6CB8E1B7-6B36-4D93-8633-7C573E194AC4}.Release|Any CPU.Build.0 = Release|Any CPU + {6CB8E1B7-6B36-4D93-8633-7C573E194AC4}.Release-x86|Any CPU.ActiveCfg = Release|Any CPU + {6CB8E1B7-6B36-4D93-8633-7C573E194AC4}.Release-x86|Any CPU.Build.0 = Release|Any CPU + {EE63AF7E-92EA-48FB-81E2-53D7D92F8050}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {EE63AF7E-92EA-48FB-81E2-53D7D92F8050}.Debug|Any CPU.Build.0 = Debug|Any CPU + {EE63AF7E-92EA-48FB-81E2-53D7D92F8050}.Release|Any CPU.ActiveCfg = Release|Any CPU + {EE63AF7E-92EA-48FB-81E2-53D7D92F8050}.Release|Any CPU.Build.0 = Release|Any CPU + {EE63AF7E-92EA-48FB-81E2-53D7D92F8050}.Release-x86|Any CPU.ActiveCfg = Release-x86|Any CPU + {EE63AF7E-92EA-48FB-81E2-53D7D92F8050}.Release-x86|Any CPU.Build.0 = Release-x86|Any CPU EndGlobalSection GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE diff --git a/packaging/windows/buildpackage.sh b/packaging/windows/buildpackage.sh index 18a440d79a..4f11dea910 100755 --- a/packaging/windows/buildpackage.sh +++ b/packaging/windows/buildpackage.sh @@ -39,7 +39,7 @@ echo "Building core files" pushd "${SRCDIR}" > /dev/null || exit 1 make clean -make windows-dependencies +make windows-dependencies WIN32=true make core make version VERSION="${TAG}" make install-core gameinstalldir="" DESTDIR="${BUILTDIR}" diff --git a/thirdparty/fetch-thirdparty-deps-windows.sh b/thirdparty/fetch-thirdparty-deps-windows.sh index 28f0ff3691..61e5669a60 100755 --- a/thirdparty/fetch-thirdparty-deps-windows.sh +++ b/thirdparty/fetch-thirdparty-deps-windows.sh @@ -3,6 +3,16 @@ # Die on any error for Travis CI to automatically retry: set -e +if [ $# -ne "1" ]; then + echo "Usage: $(basename "$0") (32|64)" + exit 1 +fi + +if [ "$1" != "x86" ] && [ "$1" != "x64" ]; then + echo "Usage: $(basename "$0") (32|64)" + exit 1 +fi + download_dir="${0%/*}/download/windows" mkdir -p "${download_dir}" @@ -10,28 +20,46 @@ cd "${download_dir}" || exit 1 if [ ! -f SDL2.dll ]; then echo "Fetching SDL2 from libsdl.org" - curl -LOs https://www.libsdl.org/release/SDL2-2.0.5-win32-x86.zip - unzip SDL2-2.0.5-win32-x86.zip SDL2.dll - rm SDL2-2.0.5-win32-x86.zip + if [ "$1" = "x86" ]; then + curl -LOs https://www.libsdl.org/release/SDL2-2.0.5-win32-x86.zip + unzip SDL2-2.0.5-win32-x86.zip SDL2.dll + rm SDL2-2.0.5-win32-x86.zip + else + curl -LOs https://www.libsdl.org/release/SDL2-2.0.5-win32-x64.zip + unzip SDL2-2.0.5-win32-x64.zip SDL2.dll + rm SDL2-2.0.5-win32-x64.zip + fi fi if [ ! -f freetype6.dll ]; then echo "Fetching FreeType2 from NuGet" ../../noget.sh SharpFont.Dependencies 2.6.0 - cp ./SharpFont.Dependencies/bin/msvc9/x86/freetype6.dll . + if [ "$1" = "x86" ]; then + cp ./SharpFont.Dependencies/bin/msvc9/x86/freetype6.dll . + else + cp ./SharpFont.Dependencies/bin/msvc9/x64/freetype6.dll . + fi rm -rf SharpFont.Dependencies fi if [ ! -f lua51.dll ]; then echo "Fetching Lua 5.1 from NuGet" ../../noget.sh lua.binaries 5.1.5 - cp ./lua.binaries/bin/win32/dll8/lua5.1.dll ./lua51.dll + if [ "$1" = "x86" ]; then + cp ./lua.binaries/bin/win32/dll8/lua5.1.dll ./lua51.dll + else + cp ./lua.binaries/bin/win64/dll8/lua5.1.dll ./lua51.dll + fi rm -rf lua.binaries fi if [ ! -f soft_oal.dll ]; then echo "Fetching OpenAL Soft from NuGet" ../../noget.sh OpenAL-Soft 1.16.0 - cp ./OpenAL-Soft/bin/Win32/soft_oal.dll ./soft_oal.dll + if [ "$1" = "x86" ]; then + cp ./OpenAL-Soft/bin/Win32/soft_oal.dll ./soft_oal.dll + else + cp ./OpenAL-Soft/bin/Win64/soft_oal.dll ./soft_oal.dll + fi rm -rf OpenAL-Soft fi diff --git a/thirdparty/fetch-thirdparty-deps.ps1 b/thirdparty/fetch-thirdparty-deps.ps1 index 1773a13960..92119d9d5f 100644 --- a/thirdparty/fetch-thirdparty-deps.ps1 +++ b/thirdparty/fetch-thirdparty-deps.ps1 @@ -40,7 +40,7 @@ if (!(Test-Path "windows/SDL2.dll")) echo "Fetching SDL2 from libsdl.org" # Download zip: - $zipFileName = "SDL2-2.0.5-win32-x86.zip" + $zipFileName = "SDL2-2.0.5-win32-x64.zip" $target = Join-Path $pwd.ToString() $zipFileName (New-Object System.Net.WebClient).DownloadFile("https://www.libsdl.org/release/" + $zipFileName, $target) @@ -52,7 +52,7 @@ if (!(Test-Path "windows/SDL2.dll")) $destination.Copyhere($zipFile.items()) # Remove junk files: - rm SDL2-2.0.5-win32-x86.zip + rm "$zipFileName" rm -path "$currentPath\windows\README-SDL.txt" } @@ -68,7 +68,7 @@ if (!(Test-Path "windows/lua51.dll")) { echo "Fetching Lua 5.1 from NuGet." ./nuget.exe install lua.binaries -Version 5.1.5 -ExcludeVersion -Verbosity quiet -Source nuget.org - cp lua.binaries/bin/win32/dll8/lua5.1.dll ./windows/lua51.dll + cp lua.binaries/bin/win64/dll8/lua5.1.dll ./windows/lua51.dll rmdir lua.binaries -Recurse } @@ -76,7 +76,7 @@ if (!(Test-Path "windows/freetype6.dll")) { echo "Fetching FreeType2 from NuGet." ./nuget.exe install SharpFont.Dependencies -Version 2.6.0 -ExcludeVersion -Verbosity quiet -Source nuget.org - cp SharpFont.Dependencies/bin/msvc9/x86/freetype6.dll ./windows/freetype6.dll + cp SharpFont.Dependencies/bin/msvc9/x64/freetype6.dll ./windows/freetype6.dll rmdir SharpFont.Dependencies -Recurse } @@ -84,7 +84,7 @@ if (!(Test-Path "windows/soft_oal.dll")) { echo "Fetching OpenAL Soft from NuGet." ./nuget.exe install OpenAL-Soft -Version 1.16.0 -ExcludeVersion -Verbosity quiet -Source nuget.org - cp OpenAL-Soft/bin/Win32/soft_oal.dll windows/soft_oal.dll + cp OpenAL-Soft/bin/Win64/soft_oal.dll windows/soft_oal.dll rmdir OpenAL-Soft -Recurse }