Update ci.yml

NREL · May 15, 2024 · 7f99bd9 · 7f99bd9
1 parent 6d9a00b
commit 7f99bd9
Showing 1 changed file with 9 additions and 10 deletions.
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -66,17 +66,17 @@ jobs:
     - name: Download wxWidgets
       shell: bash
       run: |
-        curl -L https://github.com/wxWidgets/wxWidgets/releases/download/v3.2.3/wxMSW-3.2.3_vc14x_Dev.7z -o wxMSW-3.2.3_vc14x_Dev.7z
-        mkdir wxMSW-3.2.3_vc14x_Dev
-        7z x wxMSW-3.2.3_vc14x_Dev.7z -o$GITHUB_WORKSPACE/wxMSW-3.2.3_vc14x_Dev
-        curl -L https://github.com/wxWidgets/wxWidgets/releases/download/v3.2.3/wxMSW-3.2.3_vc14x_ReleaseDLL.7z -o wxMSW-3.2.3_vc14x_ReleaseDLL.7z
-        7z x wxMSW-3.2.3_vc14x_ReleaseDLL.7z -o$GITHUB_WORKSPACE/wxMSW-3.2.3_vc14x_ReleaseDLL
-        cp wxMSW-3.2.3_vc14x_ReleaseDLL/lib/vc14x_dll/* wxMSW-3.2.3_vc14x_Dev/lib/vc14x_dll
+        curl -L https://github.com/wxWidgets/wxWidgets/releases/download/v3.2.3/wxMSW-3.2.3_vc14x_x64_Dev.7z -o wxMSW-3.2.3_vc14x_x64_Dev.7z
+        mkdir wxMSW-3.2.3_vc14x_x64_Dev
+        7z x wxMSW-3.2.3_vc14x_x64_Dev.7z -o$GITHUB_WORKSPACE/wxMSW-3.2.3_vc14x_x64_Dev
+        curl -L https://github.com/wxWidgets/wxWidgets/releases/download/v3.2.3/wxMSW-3.2.3_vc14x_x64_ReleaseDLL.7z -o wxMSW-3.2.3_vc14x_x64_ReleaseDLL.7z
+        7z x wxMSW-3.2.3_vc14x_x64_ReleaseDLL.7z -o$GITHUB_WORKSPACE/wxMSW-3.2.3_vc14x_x64_ReleaseDLL
+        cp wxMSW-3.2.3_vc14x_x64_ReleaseDLL/lib/vc14x_x64_dll/* wxMSW-3.2.3_vc14x_x64_Dev/lib/vc14x_x64_dll
         curl -L https://github.com/wxWidgets/wxWidgets/releases/download/v3.2.3/wxWidgets-3.2.3-headers.7z -o wxWidgets-3.2.3-headers.7z
-        7z x wxWidgets-3.2.3-headers.7z -o$GITHUB_WORKSPACE/wxMSW-3.2.3_vc14x_Dev
-        WXMSW3=$GITHUB_WORKSPACE\\wxMSW-3.2.3_vc14x_Dev
+        7z x wxWidgets-3.2.3-headers.7z -o$GITHUB_WORKSPACE/wxMSW-3.2.3_vc14x_x64_Dev
+        WXMSW3=$GITHUB_WORKSPACE\\wxMSW-3.2.3_vc14x_x64_Dev
         echo "WXMSW3=$WXMSW3" >> $GITHUB_ENV
-        WXWIN=$GITHUB_WORKSPACE\\wxMSW-3.2.3_vc14x_Dev
+        WXWIN=$GITHUB_WORKSPACE\\wxMSW-3.2.3_vc14x_x64_Dev
         echo "WXWIN=$WXWIN" >> $GITHUB_ENV
 
     - name: Setup cmake
@@ -93,7 +93,6 @@ jobs:
       run: |
         mkdir build
         cd build
-        Rename-Item "$env:WXMSW3\lib\vc14x_dll" vc14x_x64_dll
         dir $env:WXMSW3\lib
         cmake -G "Visual Studio 17 2022" -DCMAKE_CONFIGURATION_TYPES="Release" -DCMAKE_SYSTEM_VERSION=10.0 ..
         MSBuild.exe .\lk.sln /t:Build /p:Configuration=Release