MSVCPlatform -> VCXPlatform

s0600204 · Jan 15, 2022 · 7ac3f24 · 7ac3f24
1 parent d0748d2
commit 7ac3f24
Show file tree

Hide file tree

Showing 4 changed files with 12 additions and 12 deletions.
diff --git a/libraries/source/fcollada/build.ps1 b/libraries/source/fcollada/build.ps1
@@ -25,20 +25,20 @@ Write-Output "---------------------------------------"
 Write-Output ""
 Write-Output "Build (Debug)"
 Write-Output "---------------------------------------"
-& $env:msbuild $LIB_DIRECTORY\FCollada.vcxproj /v:q /t:Clean,Rebuild /p:PlatformToolset=v141_xp /p:Configuration="Debug DLL" /p:Platform=$env:MSVCPlatform
+& $env:msbuild $LIB_DIRECTORY\FCollada.vcxproj /v:q /t:Clean,Rebuild /p:PlatformToolset=v141_xp /p:Configuration="Debug DLL" /p:Platform=$env:VCXPlatform
 
 
 Write-Output ""
 Write-Output "Build (Release)"
 Write-Output "---------------------------------------"
-& $env:msbuild $LIB_DIRECTORY\FCollada.vcxproj /v:q /t:Clean,Rebuild /p:PlatformToolset=v141_xp /p:Configuration="Release DLL" /p:Platform=$env:MSVCPlatform
+& $env:msbuild $LIB_DIRECTORY\FCollada.vcxproj /v:q /t:Clean,Rebuild /p:PlatformToolset=v141_xp /p:Configuration="Release DLL" /p:Platform=$env:VCXPlatform
 
 
 Write-Output ""
 Write-Output "Export build artifacts"
 Write-Output "---------------------------------------"
-Merge-ChildItems -Path "$LIB_DIRECTORY\Output\Release DLL $env:MSVCPlatform\FCollada" -Include *.dll,*.pdb -Destination $env:BIN_DIR_RELEASE
-Merge-ChildItems -Path "$LIB_DIRECTORY\Output\Debug DLL $env:MSVCPlatform\FCollada"   -Include *.dll,*.pdb -Destination $env:BIN_DIR_DEBUG
+Merge-ChildItems -Path "$LIB_DIRECTORY\Output\Release DLL $env:VCXPlatform\FCollada" -Include *.dll,*.pdb -Destination $env:BIN_DIR_RELEASE
+Merge-ChildItems -Path "$LIB_DIRECTORY\Output\Debug DLL $env:VCXPlatform\FCollada"   -Include *.dll,*.pdb -Destination $env:BIN_DIR_DEBUG
 
 New-Item -Path $PSScriptRoot -Name 'lib' -ItemType Directory | Out-Null
 foreach ($Item in (Get-ChildItem -Path ".\$LIB_DIRECTORY\Output\*" -Include *.lib)) {

diff --git a/libraries/source/nvtt/build.ps1 b/libraries/source/nvtt/build.ps1
@@ -27,7 +27,7 @@ Write-Output "---------------------------------------"
 New-Item -Path . -Name 'build' -ItemType Directory | Out-Null
 Push-Location '.\build'
 cmake ..\src `
-  -A $env:MSVCPlatform `
+  -A $env:VCXPlatform `
   -DCMAKE_INSTALL_PREFIX="$PSScriptRoot" `
   -DPNG_PNG_INCLUDE_DIR="$VcpkgOutLocation\include" `
   -DPNG_LIBRARY="$VcpkgOutLocation\lib\libpng16.lib" `

diff --git a/libraries/windows/gloox/build.ps1 b/libraries/windows/gloox/build.ps1
@@ -44,13 +44,13 @@ Write-Output "---------------------------------------"
 Write-Output ""
 Write-Output "Build (Debug)"
 Write-Output "---------------------------------------"
-& $env:msbuild $LIB_DIRECTORY\gloox.vcxproj /v:q /p:PlatformToolset=v141_xp /p:Configuration=Debug /p:Platform=$env:MSVCPlatform
+& $env:msbuild $LIB_DIRECTORY\gloox.vcxproj /v:q /p:PlatformToolset=v141_xp /p:Configuration=Debug /p:Platform=$env:VCXPlatform
 
 
 Write-Output ""
 Write-Output "Build (Release)"
 Write-Output "---------------------------------------"
-& $env:msbuild $LIB_DIRECTORY\gloox.vcxproj /v:q /p:PlatformToolset=v141_xp /p:Configuration=Release /p:Platform=$env:MSVCPlatform
+& $env:msbuild $LIB_DIRECTORY\gloox.vcxproj /v:q /p:PlatformToolset=v141_xp /p:Configuration=Release /p:Platform=$env:VCXPlatform
 
 
 Write-Output ""

diff --git a/libraries/windows/scripts/common.ps1 b/libraries/windows/scripts/common.ps1
@@ -80,11 +80,11 @@ Support level in .vcxproj files:
 #>
 switch ($env:HostArchitecture)
 {
-  'x86'   { $env:MSVCPlatform = 'Win32' }
-  'x64'   { $env:MSVCPlatform = 'x64'   }
-# 'arm'   { $env:MSVCPlatform = 'ARM'   }
-# 'arm64' { $env:MSVCPlatform = 'ARM64' }
-  Default { $env:MSVCPlatform = 'Win32' }
+  'x86'   { $env:VCXPlatform = 'Win32' }
+  'x64'   { $env:VCXPlatform = 'x64'   }
+# 'arm'   { $env:VCXPlatform = 'ARM'   }
+# 'arm64' { $env:VCXPlatform = 'ARM64' }
+  Default { $env:VCXPlatform = 'Win32' }
 }
 
 <#