From b0e97b229eab3ba106fcceba17621267c999ba08 Mon Sep 17 00:00:00 2001
From: Nadia Holmquist Pedersen <nadia@nhp.sh>
Date: Sun, 2 May 2021 14:34:44 +0200
Subject: Fix minimum Darwin version for targeting 10.15

---
 src/frontend/qt_sdl/CMakeLists.txt | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'src')

diff --git a/src/frontend/qt_sdl/CMakeLists.txt b/src/frontend/qt_sdl/CMakeLists.txt
index c2e53c4..66c2f4d 100644
--- a/src/frontend/qt_sdl/CMakeLists.txt
+++ b/src/frontend/qt_sdl/CMakeLists.txt
@@ -136,7 +136,7 @@ if (APPLE)
     set_source_files_properties("${CMAKE_SOURCE_DIR}/melon.icns" PROPERTIES MACOSX_PACKAGE_LOCATION Resources)
 
     # Qt 6 requires macOS 10.15 if building on 10.15 or greater
-    if(CMAKE_SYSTEM_VERSION VERSION_GREATER 18.5.0)
+	if(CMAKE_SYSTEM_VERSION VERSION_GREATER_EQUAL 19.0.0)
         if (USE_QT6)
 	    set(CMAKE_OSX_DEPLOYMENT_TARGET "10.15" CACHE STRING "Minimum OS X deployment version" FORCE)
         endif()
-- 
cgit v1.2.3


From d6036f92254b53b67c0b32c9b02f9d6575f1953f Mon Sep 17 00:00:00 2001
From: Nadia Holmquist Pedersen <nadia@nhp.sh>
Date: Sun, 2 May 2021 16:29:48 +0200
Subject: macOS-related CMake cleanups

* Remove useless explicitly specified link/include directories
* Don't pass -s or -pie to the linker as they aren't needed
---
 CMakeLists.txt     | 6 ++++--
 src/CMakeLists.txt | 5 -----
 2 files changed, 4 insertions(+), 7 deletions(-)

(limited to 'src')

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 0c18164..66d0461 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -87,7 +87,9 @@ endif()
 
 if (CMAKE_BUILD_TYPE STREQUAL Release)
 	add_compile_options(-O3)
-	add_link_options(-s)
+	if (NOT APPLE)
+		add_link_options(-s)
+	endif()
 endif()
 
 if (WIN32)
@@ -99,7 +101,7 @@ if (BUILD_STATIC AND WIN32)
 endif()
 
 if (ENABLE_LTO)
-	if (WIN32)
+	if (WIN32 OR APPLE)
 		add_compile_options(-flto)
 		add_link_options(-flto)
 	else()
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index dc32b2a..c899745 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -100,11 +100,6 @@ if (ENABLE_JIT)
 	endif()
 endif()
 
-if (APPLE)
-        target_include_directories(core PUBLIC /usr/local/include /opt/homebrew/include)
-        target_link_directories(core PUBLIC /usr/local/lib /opt/homebrew/lib)
-endif()
-
 if (ENABLE_OGLRENDERER)
     find_package(PkgConfig REQUIRED)
     pkg_check_modules(EPOXY REQUIRED epoxy)
-- 
cgit v1.2.3


From 464897ea87f5242f4769bef36120c88ec4dbcd6c Mon Sep 17 00:00:00 2001
From: Nadia Holmquist Pedersen <nadia@nhp.sh>
Date: Sun, 2 May 2021 16:39:02 +0200
Subject: Explicitly include ${SDL2_PREFIX}/include

this only accidentally worked before
---
 src/frontend/qt_sdl/CMakeLists.txt | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'src')

diff --git a/src/frontend/qt_sdl/CMakeLists.txt b/src/frontend/qt_sdl/CMakeLists.txt
index 66c2f4d..05dce4a 100644
--- a/src/frontend/qt_sdl/CMakeLists.txt
+++ b/src/frontend/qt_sdl/CMakeLists.txt
@@ -82,7 +82,7 @@ endif()
 
 target_link_libraries(melonDS ${CMAKE_THREAD_LIBS_INIT})
 
-target_include_directories(melonDS PRIVATE ${SDL2_INCLUDE_DIRS} ${SLIRP_INCLUDE_DIRS} ${LIBARCHIVE_INCLUDE_DIRS})
+target_include_directories(melonDS PRIVATE ${SDL2_INCLUDE_DIRS} ${SDL2_PREFIX}/include ${SLIRP_INCLUDE_DIRS} ${LIBARCHIVE_INCLUDE_DIRS})
 target_link_directories(melonDS PRIVATE ${SDL2_LIBRARY_DIRS} ${SLIRP_LIBRARY_DIRS})
 target_link_directories(melonDS PRIVATE ${LIBARCHIVE_LIBRARY_DIRS})
 
-- 
cgit v1.2.3