Merge pull request aldelaro5#90 from cristian64/cmake_gha_windows

Switch to CMake in the GitHub Action for the Windows build.
cristian64 · Nov 5, 2023 · 65b5015 · 65b5015
2 parents 191f761 + d1cd564
commit 65b5015
Show file tree

Hide file tree

Showing 4 changed files with 23 additions and 5 deletions.
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
@@ -28,7 +28,8 @@ jobs:
 
       - name: Build
         run: |
-          msbuild Source\Dolphin-memory-engine.sln /p:Configuration=${{ matrix.configuration }} /p:Platform=x64 /p:Verbosity=normal
+          cmake Source -B .\Source\bin -A x64 "-DCMAKE_PREFIX_PATH=..\Externals\Qt\Qt6.5.1\x64"
+          cmake --build .\Source\bin --config ${{ matrix.configuration }} --parallel
         shell: powershell
 
       - name: Copy LICENSE, README

diff --git a/Source/CMakeLists.txt b/Source/CMakeLists.txt
@@ -79,5 +79,18 @@ if(WIN32)
 		COMMAND ${CMAKE_COMMAND} -E copy_if_different
 			$<TARGET_FILE:Qt6::Gui>
 			$<TARGET_FILE_DIR:Dolphin-memory-engine>
+        TARGET Dolphin-memory-engine POST_BUILD
+        COMMAND ${CMAKE_COMMAND} -E make_directory
+            $<TARGET_FILE_DIR:Dolphin-memory-engine>/platforms
+        TARGET Dolphin-memory-engine POST_BUILD
+        COMMAND ${CMAKE_COMMAND} -E copy_if_different
+            $<TARGET_FILE:Qt6::QWindowsIntegrationPlugin>
+            $<TARGET_FILE_DIR:Dolphin-memory-engine>/platforms
+        COMMAND ${CMAKE_COMMAND} -E make_directory
+            $<TARGET_FILE_DIR:Dolphin-memory-engine>/styles
+        TARGET Dolphin-memory-engine POST_BUILD
+        COMMAND ${CMAKE_COMMAND} -E copy_if_different
+            $<TARGET_FILE:Qt6::QWindowsVistaStylePlugin>
+            $<TARGET_FILE_DIR:Dolphin-memory-engine>/styles
 	)
 endif(WIN32)
diff --git a/Source/DolphinProcess/IDolphinProcess.h b/Source/DolphinProcess/IDolphinProcess.h
@@ -44,7 +44,7 @@ class IDolphinProcess
   {
     return m_MEM2AddressStart;
   };
-  u32 getMEM1ToMEM2Distance() const
+  u64 getMEM1ToMEM2Distance() const
   {
     if (!m_MEM2Present)
       return 0;

diff --git a/Source/DolphinProcess/Windows/WindowsDolphinProcess.cpp b/Source/DolphinProcess/Windows/WindowsDolphinProcess.cpp
@@ -22,9 +22,13 @@ bool WindowsDolphinProcess::findPID()
   {
     do
     {
-      if (std::string(entry.szExeFile) == "Dolphin.exe" ||
-          std::string(entry.szExeFile) == "DolphinQt2.exe" ||
-          std::string(entry.szExeFile) == "DolphinWx.exe")
+#ifdef UNICODE
+      const std::wstring exeFile{entry.szExeFile};
+      if (exeFile == L"Dolphin.exe" || exeFile == L"DolphinQt2.exe" || exeFile == L"DolphinWx.exe")
+#else
+      const std::string exeFile{entry.szExeFile};
+      if (exeFile == "Dolphin.exe" || exeFile == "DolphinQt2.exe" || exeFile == "DolphinWx.exe")
+#endif
       {
         m_PID = entry.th32ProcessID;
         break;