Merge pull request #798 from dpogue/x64-ci

Win64 CI for NuGet caching
H-uru · Jan 29, 2021 · c8ba46c · c8ba46c
2 parents c292a8a + d451c6c
commit c8ba46c
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 2 deletions.
diff --git a/.github/workflows/windows-ci.yml b/.github/workflows/windows-ci.yml
@@ -4,10 +4,12 @@ on: [push, pull_request]
 jobs:
   build:
     runs-on: windows-latest
+    name: ${{ matrix.platform.str }}-${{ matrix.cfg.str }}
     strategy:
       matrix:
         platform:
           - { generator: Visual Studio 16 2019, arch: Win32, qt-arch: win32_msvc2019, qt-version: 5.15.2,  str: windows-x86 }
+          - { generator: Visual Studio 16 2019, arch: x64, qt-arch: win64_msvc2019_64, qt-version: 5.15.2,  str: windows-x64 }
         cfg:
           - { external: OFF, type: RelWithDebInfo, str: internal-release }
           - { external: OFF, type: Debug, str: internal-debug }
@@ -52,6 +54,7 @@ jobs:
 
       - name: Upload Artifacts
         uses: actions/upload-artifact@v2
+        if: ${{ matrix.arch == 'Win32' }}
         with:
           name: plasma-${{ matrix.platform.str }}-${{ matrix.cfg.str }}
           path: build/install

diff --git a/Sources/Plasma/PubUtilLib/plNetGameLib/Private/plNglAuth.h b/Sources/Plasma/PubUtilLib/plNetGameLib/Private/plNglAuth.h
@@ -350,7 +350,7 @@ void NetCliAuthAgeRequest (
 //============================================================================
 void NetCliAuthGetEncryptionKey (
     uint32_t      key[],
-    unsigned    size
+    size_t        size
 );
 
 //============================================================================

diff --git a/cmake/FindVLD.cmake b/cmake/FindVLD.cmake
@@ -13,7 +13,7 @@ if(MSVC)
 
     if(${CMAKE_SIZEOF_VOID_P} EQUAL 4)
         set(_VLD_LIB "Win32")
-    elseif(${CMAKE_SIZEOF_VOIDP} EQUAL 8)
+    elseif(${CMAKE_SIZEOF_VOID_P} EQUAL 8)
         set(_VLD_LIB "Win64")
     endif()