переход на warcraftxl 1.1

build-warcraftxl.ps1

@@ -88,7 +88,6 @@ if (-not (Test-Path -LiteralPath $cmake)) {
 if ($LASTEXITCODE -ne 0) { throw 'Failed to initialize WarcraftXL submodules.' }
 
 $win32BuildDir = Join-Path $repoRoot 'build\warcraftxl-win32'
-$hostBuildDir = Join-Path $repoRoot 'build\warcraftxl-host-x64'
 $stockExe = Join-Path $repoRoot 'Wow_Original.exe'
 
 if ($Deploy -or -not [string]::IsNullOrWhiteSpace($PackagePath)) {
@@ -104,22 +103,29 @@ if ($Deploy -or -not [string]::IsNullOrWhiteSpace($PackagePath)) {
 
 & $cmake -S $repoRoot -B $win32BuildDir -A Win32 '-DCLIENT_PATH='
 if ($LASTEXITCODE -ne 0) { throw 'WarcraftXL Win32 configure failed.' }
-& $cmake --build $win32BuildDir --config $Configuration --target WarcraftXL d3d9 MoonWellLoader
+& $cmake --build $win32BuildDir --config $Configuration --parallel 4
 if ($LASTEXITCODE -ne 0) { throw 'WarcraftXL Win32 build failed.' }
 
-& $cmake -S $repoRoot -B $hostBuildDir -A x64 '-DWXL_BUILD_HOST=ON' '-DCLIENT_PATH='
-if ($LASTEXITCODE -ne 0) { throw 'WarcraftXL Host configure failed.' }
-& $cmake --build $hostBuildDir --config $Configuration --target WarcraftXLHost
-if ($LASTEXITCODE -ne 0) { throw 'WarcraftXL Host build failed.' }
-
 $win32ArtifactDir = Join-Path $win32BuildDir "vendor\warcraftxl\$Configuration"
-$hostArtifactDir = Join-Path $hostBuildDir "vendor\warcraftxl\$Configuration"
 $warcraftXL = Join-Path $win32ArtifactDir 'WarcraftXL.dll'
-$modernProxy = Join-Path $win32ArtifactDir 'd3d9.dll'
-$nativeProxy = Join-Path $win32BuildDir "artifacts\$Configuration\d3d9-native.dll"
-$hostExe = Join-Path $hostArtifactDir 'WarcraftXLHost.exe'
-$selectedProxy = if ($NativeRenderer) { $nativeProxy } else { $modernProxy }
-$adtResources = Join-Path $repoRoot 'vendor\modules\wxl-modern-adt\_resources'
+$selectedProxy = Join-Path $win32ArtifactDir 'd3d9.dll'
+$recoveryProxy = Join-Path $win32BuildDir "artifacts\$Configuration\d3d9-native.dll"
+$extensionNames = @(
+    'MoonWell',
+    'wxl-db2',
+    'wxl-fdid-moonwell',
+    'wxl-grasswind',
+    'wxl-modern-adt',
+    'wxl-modern-blp',
+    'wxl-modern-m2',
+    'wxl-modern-wmo',
+    'wxl-moonwell-storage-fallback',
+    'wxl-unit-outline'
+)
+
+if ($NativeRenderer) {
+    Write-Warning '-NativeRenderer is no longer needed: WarcraftXL 1.1 uses native D3D9 by default.'
+}
 
 function Install-WarcraftXLArtifacts {
     param(
@@ -128,14 +134,18 @@ function Install-WarcraftXLArtifacts {
     )
 
     $utils = Join-Path $Destination 'Utils'
-    $loosePatch = Join-Path $Destination 'Data\Patch-WXL.MPQ'
-
     New-Item `
         -ItemType Directory `
-        -Path $Destination, $utils, $loosePatch `
+        -Path $Destination, $utils `
         -Force |
         Out-Null
 
+    $legacyHost = Join-Path $utils 'WarcraftXLHost.exe'
+    if (Test-Path -LiteralPath $legacyHost -PathType Leaf) {
+        Remove-Item -LiteralPath $legacyHost -Force
+        Write-Host "Removed obsolete WarcraftXL 1.0 host: $legacyHost"
+    }
+
     $destinationExe = Join-Path $Destination 'Wow.exe'
 
     Copy-Item `
@@ -156,20 +166,17 @@ function Install-WarcraftXLArtifacts {
         -Force
 
     Copy-Item `
-        -LiteralPath $nativeProxy `
+        -LiteralPath $recoveryProxy `
         -Destination (Join-Path $utils 'd3d9-native.dll') `
         -Force
 
-    Copy-Item `
-        -LiteralPath $hostExe `
-        -Destination (Join-Path $utils 'WarcraftXLHost.exe') `
-        -Force
-
-    Get-ChildItem -LiteralPath $adtResources | ForEach-Object {
+    foreach ($extensionName in $extensionNames) {
+        $extensionSource = Join-Path $win32BuildDir "$Configuration\$extensionName.dll"
+        $extensionDestination = Join-Path $Destination "Extensions\$extensionName"
+        New-Item -ItemType Directory -Path $extensionDestination -Force | Out-Null
         Copy-Item `
-            -LiteralPath $_.FullName `
-            -Destination $loosePatch `
-            -Recurse `
+            -LiteralPath $extensionSource `
+            -Destination (Join-Path $extensionDestination "$extensionName.dll") `
             -Force
     }
 }
@@ -196,7 +203,7 @@ if ($Deploy) {
     }
 
     Install-WarcraftXLArtifacts -Destination $ClientPath
-    Write-Host "Installed WarcraftXL runtime, host and modules in $ClientPath"
+    Write-Host "Installed WarcraftXL 1.1 runtime and extensions in $ClientPath"
 }
 
 if (-not [string]::IsNullOrWhiteSpace($PackagePath)) {
@@ -205,5 +212,4 @@ if (-not [string]::IsNullOrWhiteSpace($PackagePath)) {
     Write-Host "Packaged stock Wow.exe and WarcraftXL artifacts in $PackagePath"
 }
 
-$renderer = if ($NativeRenderer) { 'native D3D9 recovery proxy' } else { 'WarcraftXL D3D9On12 proxy' }
-Write-Host "WarcraftXL build complete ($renderer): $win32ArtifactDir"
+Write-Host "WarcraftXL 1.1 build complete (native D3D9 proxy): $win32ArtifactDir"