From aa98e6e6d0d4751641495bde9bd13133131334b3 Mon Sep 17 00:00:00 2001
From: Yousef Khadadeh <erroratline0@gmail.com>
Date: Mon, 24 Nov 2025 02:00:06 -0800
Subject: [PATCH] macOS can now build in debug mode, and can be built outside
 of a bundle

---
 CMakeLists.txt                                | 42 ++++++++++---------
 .../conan-skia/recipes/skia/all/conanfile.py  |  2 +-
 src/SwitchCWD.cpp                             |  2 +
 3 files changed, 26 insertions(+), 20 deletions(-)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 0ab05f9..1d4ee21 100755
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -24,6 +24,7 @@ option(USE_MEMORYSAN "Enable Memory Sanitizer" OFF)
 option(NO_CONAN_BUILD "Not using conan to get packages" OFF)
 option(EMSCRIPTEN_SINGLE_HTML_FILE "Building with emscripten generates a single HTML file" OFF)
 option(CONFIG_NEXT_TO_EXECUTABLE "Place configuration folder next to executable (portable executable)" OFF)
+option(MACOS_MAKE_BUNDLE "Package the application as a bundle" ON)
 
 # Setting sources
 set(sources "src/main.cpp"
@@ -181,25 +182,28 @@ add_executable(infinipaint ${sources})
 if(WIN32)
     set_target_properties(infinipaint PROPERTIES WIN32_EXECUTABLE TRUE)
 elseif(APPLE)
-    set_target_properties(infinipaint PROPERTIES MACOSX_BUNDLE TRUE)
-    set_target_properties(infinipaint PROPERTIES
-        BUNDLE True
-        MACOSX_BUNDLE_GUI_IDENTIFIER com.erroratline0.infinipaint
-        MACOSX_BUNDLE_BUNDLE_NAME infinipaint
-        MACOSX_BUNDLE_BUNDLE_VERSION "0.3.0"
-        MACOSX_BUNDLE_SHORT_VERSION_STRING "0.3.0"
-        MACOSX_BUNDLE_INFO_PLIST ${CMAKE_SOURCE_DIR}/macosinstall/Info.plist
-    )
-    add_custom_command(TARGET infinipaint POST_BUILD
-      COMMAND ${CMAKE_COMMAND} -E copy_directory
-        "${CMAKE_SOURCE_DIR}/data"
-        "$<TARGET_FILE_DIR:infinipaint>/../Resources/data"
-    )
-    add_custom_command(TARGET infinipaint POST_BUILD
-      COMMAND ${CMAKE_COMMAND} -E copy
-        "${CMAKE_SOURCE_DIR}/macosinstall/appicon.icns"
-        "$<TARGET_FILE_DIR:infinipaint>/../Resources/appicon.icns"
-    )
+    if(MACOS_MAKE_BUNDLE)
+        target_compile_definitions(infinipaint PRIVATE MACOS_MAKE_BUNDLE)
+        set_target_properties(infinipaint PROPERTIES MACOSX_BUNDLE TRUE)
+        set_target_properties(infinipaint PROPERTIES
+            BUNDLE True
+            MACOSX_BUNDLE_GUI_IDENTIFIER com.erroratline0.infinipaint
+            MACOSX_BUNDLE_BUNDLE_NAME infinipaint
+            MACOSX_BUNDLE_BUNDLE_VERSION "0.3.0"
+            MACOSX_BUNDLE_SHORT_VERSION_STRING "0.3.0"
+            MACOSX_BUNDLE_INFO_PLIST ${CMAKE_SOURCE_DIR}/macosinstall/Info.plist
+        )
+        add_custom_command(TARGET infinipaint POST_BUILD
+          COMMAND ${CMAKE_COMMAND} -E copy_directory
+            "${CMAKE_SOURCE_DIR}/data"
+            "$<TARGET_FILE_DIR:infinipaint>/../Resources/data"
+        )
+        add_custom_command(TARGET infinipaint POST_BUILD
+          COMMAND ${CMAKE_COMMAND} -E copy
+            "${CMAKE_SOURCE_DIR}/macosinstall/appicon.icns"
+            "$<TARGET_FILE_DIR:infinipaint>/../Resources/appicon.icns"
+        )
+    endif()
 endif()
 
 if(EMSCRIPTEN)
diff --git a/conan/conan-skia/recipes/skia/all/conanfile.py b/conan/conan-skia/recipes/skia/all/conanfile.py
index 928a0a5..40a51bf 100644
--- a/conan/conan-skia/recipes/skia/all/conanfile.py
+++ b/conan/conan-skia/recipes/skia/all/conanfile.py
@@ -419,7 +419,7 @@ class ConanSkia(ConanFile):
         self.tool_requires("ninja/[>=1.11.0]")
 
         if self.options.use_harfbuzz and self.options.use_system_harfbuzz and self.options.use_conan_harfbuzz:
-            self.requires("harfbuzz/10.4.0", options = {"with_subset":True, "with_glib":False})
+            self.requires("harfbuzz/11.4.1", options = {"with_subset":True, "with_glib":False})
 
         if self.options.use_freetype and self.options.use_system_freetype and self.options.use_conan_freetype:
             self.requires("freetype/2.13.2")
diff --git a/src/SwitchCWD.cpp b/src/SwitchCWD.cpp
index 707aa36..ffef00b 100755
--- a/src/SwitchCWD.cpp
+++ b/src/SwitchCWD.cpp
@@ -21,7 +21,9 @@ void switch_cwd() {
     CFStringGetCString(str, path, 4096, kCFStringEncodingUTF8);
     CFRelease(str);
     std::string newCWD(path);
+#ifdef MACOS_MAKE_BUNDLE
     newCWD += "/Contents/Resources";
+#endif
 
     std::filesystem::current_path(std::filesystem::path(newCWD));
 #elif _WIN32