Update CI for x64

Author: zao

.github/workflows/main.yml

@@ -5,50 +5,66 @@ jobs:
     strategy:
       matrix:
         include:
-          - platform: win32
+          - platform: x64
             os: windows-latest
-            triplet: x86-windows
-          # - platform: x64
-          #   os: windows-latest
-          #   triplet: x64-windows
+            triplet: x64-windows
     runs-on: ${{ matrix.os }}
     env:
       VCPKG_DEFAULT_TRIPLET: ${{ matrix.triplet }}
       VCPKG_INSTALLED_DIR: ${{ github.workspace }}/vcpkg_installed/
       DEPS_DIR: ${{ github.workspace }}/vcpkg_installed/${{ matrix.triplet }}
+      INST_DIR: ${{ github.workspace }}/install-prefix
     steps:
       - name: Checkout
         uses: actions/checkout@v2
         with:
           submodules: "recursive"
+
       - name: run-vcpkg
         uses: lukka/run-vcpkg@v10
         with:
           vcpkgJsonGlob: "./vcpkg.json"
           runVcpkgInstall: true
+
       - name: Setup MSBuild
         uses: microsoft/setup-msbuild@v1
-      - name: Check dependencies
-        run: "ls ${{ env.DEPS_DIR }}"
+
+      - name: Obtain and run CMake
+        uses: threeal/cmake-action@v1.3.0
+        with:
+          source-dir: "."
+          build-dir: "build"
+          generator: "Visual Studio 17 2022"
+          options: CMAKE_TOOLCHAIN_FILE=vcpkg/scripts/buildsystems/vcpkg.cmake CMAKE_INSTALL_PREFIX="${{ env.INST_DIR }}"
+
       - name: Build DLL
-        run: "msbuild SimpleGraphic.vcxproj /p:configuration=release /p:platform=${{ matrix.platform }}"
+        run: "cmake --build build --config Release -t INSTALL"
+        
       - name: Archive DLL
         uses: actions/upload-artifact@v3
         with:
           name: SimpleGraphic-${{ matrix.triplet }}.dll
-          path: "${{ github.workspace }}/Release/SimpleGraphic.dll"
+          path: "${{ env.INST_DIR }}/SimpleGraphic.dll"
+
       - name: Archive DLL symbols
         uses: actions/upload-artifact@v3
         with:
           name: SimpleGraphic-${{ matrix.triplet }}.pdb
-          path: "${{ github.workspace }}/Release/SimpleGraphic.pdb"
+          path: "${{ github.workspace }}/build/Release/SimpleGraphic.pdb"
+
       - name: Archive dependency DLLs
         uses: actions/upload-artifact@v3
         with:
           name: SimpleGraphic-${{ matrix.triplet }}-deps.dll
-          path: "${{ env.DEPS_DIR }}/bin/*.dll"
+          path: |
+            ${{ env.INST_DIR }}/*.dll
+            !${{ env.INST_DIR }}/SimpleGraphic.dll
+
       - name: Archive dependency DLL symbols
         uses: actions/upload-artifact@v3
         with:
           name: SimpleGraphic-${{ matrix.triplet }}-deps.pdb
-          path: "${{ env.DEPS_DIR }}/bin/*.pdb"
+          path: |
+            ${{ env.DEPS_DIR }}/bin/*.pdb
+            ${{ github.workspace }}/build/Release/lzip.pdb
+            ${{ github.workspace }}/build/Release/lcurl.pdb

CMakeLists.txt

@@ -1,12 +1,17 @@
-project(SimpleGraphic C CXX)
 cmake_minimum_required(VERSION 3.15)
+project(SimpleGraphic C CXX)
 set(CMAKE_CXX_STANDARD_REQUIRED ON)
 set(CMAKE_CXX_STANDARD 17)
 
 if (APPLE)
     enable_language(OBJCXX)
 endif ()
 
+if (MSVC)
+	add_compile_options("/Zi")
+	add_link_options("/DEBUG")
+endif ()
+
 list(APPEND CMAKE_MODULE_PATH "${PROJECT_SOURCE_DIR}/cmake")
 
 include(${PROJECT_SOURCE_DIR}/vcpkg/scripts/buildsystems/vcpkg.cmake)
@@ -75,7 +80,6 @@ add_library(SimpleGraphic SHARED
     ${SIMPLEGRAPHIC_SOURCES}
     ${SIMPLEGRAPHIC_PLATFORM_SOURCES}
 )
-
 target_compile_definitions(SimpleGraphic
     PRIVATE
     "UNICODE"
@@ -186,8 +190,11 @@ install(FILES $<TARGET_RUNTIME_DLLS:SimpleGraphic> DESTINATION ".")
 install(TARGETS SimpleGraphic RUNTIME DESTINATION ".")
 
 if (WIN32)
-    find_file(LUAJIT_DLL NAMES "lua51.dll" PATHS "${CMAKE_BINARY_DIR}" REQUIRED)
-    find_file(ZLIB_DLL NAMES "zlib1.dll" PATHS "${CMAKE_BINARY_DIR}" REQUIRED)
+	if (DEFINED ENV{DEPS_DIR})
+		set(DEPS_BIN_DIR ${DEPS_DIR}/bin)
+	endif ()
+    find_file(LUAJIT_DLL NAMES "lua51.dll" PATHS "${CMAKE_BINARY_DIR}" ${DEPS_BIN_DIR} REQUIRED)
+    find_file(ZLIB_DLL NAMES "zlib1.dll" PATHS "${CMAKE_BINARY_DIR}" ${DEPS_BIN_DIR} REQUIRED)
     install(FILES ${LUAJIT_DLL} ${ZLIB_DLL} DESTINATION ".")
 endif ()