From 3fd459279d13c9c3aa149ca8750528600b06d20b Mon Sep 17 00:00:00 2001
From: Avently <7953703+avently@users.noreply.github.com>
Date: Thu, 3 Aug 2023 23:33:20 +0700
Subject: [PATCH] desktop: Windows build

---
 .../src/commonMain/cpp/desktop/CMakeLists.txt       | 13 +++++++++----
 apps/multiplatform/desktop/build.gradle.kts         |  7 +++++--
 2 files changed, 14 insertions(+), 6 deletions(-)

diff --git a/apps/multiplatform/common/src/commonMain/cpp/desktop/CMakeLists.txt b/apps/multiplatform/common/src/commonMain/cpp/desktop/CMakeLists.txt
index 849a6c98a7..7b486e43a6 100644
--- a/apps/multiplatform/common/src/commonMain/cpp/desktop/CMakeLists.txt
+++ b/apps/multiplatform/common/src/commonMain/cpp/desktop/CMakeLists.txt
@@ -31,9 +31,9 @@ else()
     set(CMAKE_BUILD_RPATH "@loader_path")
 endif()
 
-if(${CMAKE_SYSTEM_PROCESSOR} MATCHES "amd64")
+if(${CMAKE_SYSTEM_PROCESSOR} MATCHES "amd64" OR ${CMAKE_SYSTEM_PROCESSOR} MATCHES "AMD64")
     set(OS_LIB_ARCH "x86_64")
-elseif(${CMAKE_SYSTEM_PROCESSOR} MATCHES "arm64")
+elseif(${CMAKE_SYSTEM_PROCESSOR} MATCHES "arm64" OR ${CMAKE_SYSTEM_PROCESSOR} MATCHES "ARM64")
     set(OS_LIB_ARCH "aarch64")
 else()
     set(OS_LIB_ARCH "${CMAKE_SYSTEM_PROCESSOR}")
@@ -55,8 +55,13 @@ add_library( # Sets the name of the library.
 
 add_library( simplex SHARED IMPORTED )
 # Lib has different name because of version, find it
-FILE(GLOB SIMPLEXLIB ${CMAKE_SOURCE_DIR}/libs/${OS_LIB_PATH}-${OS_LIB_ARCH}/libHSsimplex-chat-*.${OS_LIB_EXT})
-set_target_properties( simplex PROPERTIES IMPORTED_LOCATION ${SIMPLEXLIB})
+FILE(GLOB SIMPLEXLIB ${CMAKE_SOURCE_DIR}/libs/${OS_LIB_PATH}-${OS_LIB_ARCH}/lib*simplex*.${OS_LIB_EXT})
+
+if(WIN32)
+    set_target_properties( simplex PROPERTIES IMPORTED_IMPLIB ${SIMPLEXLIB})
+else()
+    set_target_properties( simplex PROPERTIES IMPORTED_LOCATION ${SIMPLEXLIB})
+endif()
 
 
 # Specifies libraries CMake should link to your target library. You
diff --git a/apps/multiplatform/desktop/build.gradle.kts b/apps/multiplatform/desktop/build.gradle.kts
index c3c18b1321..2493cc6ff2 100644
--- a/apps/multiplatform/desktop/build.gradle.kts
+++ b/apps/multiplatform/desktop/build.gradle.kts
@@ -88,9 +88,9 @@ cmake {
     /*machines.customMachines.register("linux-aarch64") {
       toolchainFile.set(project.file("$cppPath/toolchains/aarch64-linux-gnu-gcc.cmake"))
     }*/
-    machines.customMachines.register("win-amd64") {
+    /*machines.customMachines.register("win-amd64") {
       toolchainFile.set(project.file("$cppPath/toolchains/x86_64-windows-mingw32-gcc.cmake"))
-    }
+    }*/
     if (machines.host.name == "mac-amd64") {
       machines.customMachines.register("mac-amd64") {
         toolchainFile.set(project.file("$cppPath/toolchains/x86_64-mac-apple-darwin-gcc.cmake"))
@@ -108,6 +108,9 @@ cmake {
     val main by creating {
       cmakeLists.set(file("$cppPath/desktop/CMakeLists.txt"))
       targetMachines.addAll(compileMachineTargets.toSet())
+      if (machines.host.name.contains("win")) {
+        cmakeArgs.add("-G MinGW Makefiles")
+      }
     }
   }
 }