From 0d5f0b67dd90b4c735df10359368bcc57d437715 Mon Sep 17 00:00:00 2001
From: EinTim23 <eintim@protonmail.com>
Date: Sat, 2 Nov 2024 12:10:42 +0100
Subject: [PATCH] mac os fixes

---
 .gitignore       | 3 ++-
 .gitmodules      | 3 ---
 CMakeLists.txt   | 7 ++++++-
 vendor/wxWidgets | 1 -
 4 files changed, 8 insertions(+), 6 deletions(-)
 delete mode 160000 vendor/wxWidgets

diff --git a/.gitignore b/.gitignore
index 07ed706..df797ae 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1 +1,2 @@
-build/*
\ No newline at end of file
+build/*
+.DS_Store
\ No newline at end of file
diff --git a/.gitmodules b/.gitmodules
index c8c6969..2a85b6c 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -10,6 +10,3 @@
 [submodule "vendor/mbedtls"]
 	path = vendor/mbedtls
 	url = https://github.com/Mbed-TLS/mbedtls.git
-[submodule "vendor/wxWidgets"]
-	path = vendor/wxWidgets
-	url = https://github.com/wxWidgets/wxWidgets.git
diff --git a/CMakeLists.txt b/CMakeLists.txt
index bba9d5d..e13c472 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -1,5 +1,9 @@
 cmake_minimum_required (VERSION 3.8)
-project ("globalRPC")
+if(APPLE)
+    project ("globalRPC" LANGUAGES C CXX OBJCXX)
+else()
+    project ("globalRPC" LANGUAGES C CXX)
+endif()
 file(GLOB_RECURSE SOURCES "src/*.cpp")
 add_executable (rpc ${SOURCES})
 set_property(TARGET rpc PROPERTY CXX_STANDARD 20)
@@ -11,6 +15,7 @@ endif()
 file(GLOB wx_setup_dir
     "${CMAKE_BINARY_DIR}/vendor/wxWidgets/lib/*/mswu"
     "${CMAKE_BINARY_DIR}/vendor/wxWidgets/lib/*/gtk3u"
+    "${CMAKE_BINARY_DIR}/vendor/wxWidgets/lib/wx/include/*"
 )
 if(wx_setup_dir)
     message(STATUS "wxWidgets setup.h directory found: ${wx_setup_dir}")
diff --git a/vendor/wxWidgets b/vendor/wxWidgets
deleted file mode 160000
index 5ff2532..0000000
--- a/vendor/wxWidgets
+++ /dev/null
@@ -1 +0,0 @@
-Subproject commit 5ff25322553c1870cf20a2e1ba6f20ed50d9fe9a