Try to fix build by looking in different output directories.

scoder · scoder · commit 6a3313702083 · 2025-02-12T09:41:01.000+01:00
diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
@@ -38,9 +38,6 @@ jobs:
     - name: build
       shell: pwsh
       run: |
-        cd libiconv
-        git apply ..\libiconv.patch
-        cd ..
         Set-PSRepository -Name "PSGallery" -InstallationPolicy Trusted
         install-module pscx -scope CurrentUser -AllowClobber
         $x64param = if ('${{ matrix.architecture }}' -eq 'x64') { $true } else { $false }
diff --git a/build.ps1 b/build.ps1
@@ -56,7 +56,7 @@ if($vs2008) {
 } else {
     Set-Location .\libiconv\MSVC16
     msbuild libiconv_static\libiconv_static.vcxproj /p:Configuration=Release
-    $iconvLib = Join-Path (pwd) $platDir\lib
+    $iconvLib = Join-Path (pwd) $platDir\Release\lib
 }
 
 $iconvInc = Join-Path $PSScriptRoot libiconv\source\include

Original file line number	Diff line number	Diff line change
`@@ -56,7 +56,7 @@ if($vs2008) {`
`56`	`56`	`} else {`
`57`	`57`	`Set-Location .\libiconv\MSVC16`
`58`	`58`	`msbuild libiconv_static\libiconv_static.vcxproj /p:Configuration=Release`
`59`		`- $iconvLib = Join-Path (pwd) $platDir\lib`
	`59`	`+ $iconvLib = Join-Path (pwd) $platDir\Release\lib`
`60`	`60`	`}`
`61`	`61`
`62`	`62`	`$iconvInc = Join-Path $PSScriptRoot libiconv\source\include`