frang75 · colugomusic · Oct 5, 2024 · Oct 10, 2024 · Oct 15, 2024 · Oct 15, 2024
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -16,7 +16,7 @@ project(NAppGUI)
 set(NAPPGUI_ROOT_PATH ${CMAKE_CURRENT_SOURCE_DIR})
 
 # Configurations
-set(CMAKE_CONFIGURATION_TYPES "Debug;Release;ReleaseWithAssert" CACHE INTERNAL "Configuration Types" FORCE)
+set(CMAKE_CONFIGURATION_TYPES "Debug;Release;ReleaseWithAssert;RelWithDebInfo" CACHE INTERNAL "Configuration Types" FORCE)
 set(CMAKE_CXX_FLAGS_RELEASEWITHASSERT ${CMAKE_CXX_FLAGS_RELEASE})
 set(CMAKE_C_FLAGS_RELEASEWITHASSERT ${CMAKE_C_FLAGS_RELEASE})
 set(CMAKE_EXE_LINKER_FLAGS_RELEASEWITHASSERT ${CMAKE_EXE_LINKER_FLAGS_RELEASE})

diff --git a/prj/NAppCompilers.cmake b/prj/NAppCompilers.cmake
@@ -164,23 +164,25 @@ elseif (${CMAKE_SYSTEM_NAME} STREQUAL "Darwin")
     nap_build_opt("DEPLOYMENT_TARGET_OSX" "${CMAKE_OSX_DEPLOYMENT_TARGET}")
     nap_build_opt("DEPLOYMENT_TARGET_OSX_NAME" "${deploySDKName}")
 
+	string(REPLACE "macosx" "" base_sdk ${CMAKE_BASE_OSX_SDK})
+
     # Invalid deployment target
-    if (CMAKE_OSX_DEPLOYMENT_TARGET VERSION_GREATER CMAKE_BASE_OSX_SDK)
+    if (CMAKE_OSX_DEPLOYMENT_TARGET VERSION_GREATER ${base_sdk})
         message(FATAL_ERROR "Deployment target '${CMAKE_OSX_DEPLOYMENT_TARGET}' greater than base SDK '${CMAKE_BASE_OSX_SDK}'")
     endif()
 
     # Host architecture
-    if (CMAKE_HOST_SYSTEM_PROCESSOR)
-        nap_osx_arch(${CMAKE_HOST_SYSTEM_PROCESSOR} CMAKE_HOST_ARCHITECTURE)
-    else()
-        message(FATAL_ERROR "- Unknown 'CMAKE_HOST_SYSTEM_PROCESSOR'")
-    endif()
+    #if (CMAKE_HOST_SYSTEM_PROCESSOR)
+    #    nap_osx_arch(${CMAKE_HOST_SYSTEM_PROCESSOR} CMAKE_HOST_ARCHITECTURE)
+    #else()
+    #    message(FATAL_ERROR "- Unknown 'CMAKE_HOST_SYSTEM_PROCESSOR'")
+    #endif()
 
     # Build architecture
-    if (NOT CMAKE_ARCHITECTURE)
-        set(CMAKE_ARCHITECTURE ${CMAKE_HOST_ARCHITECTURE})
-    endif()
-    nap_osx_build_arch(${CMAKE_ARCHITECTURE} CMAKE_OSX_ARCHITECTURES)
+    #if (NOT CMAKE_ARCHITECTURE)
+    #    set(CMAKE_ARCHITECTURE ${CMAKE_HOST_ARCHITECTURE})
+    #endif()
+    #nap_osx_build_arch(${CMAKE_ARCHITECTURE} CMAKE_OSX_ARCHITECTURES)
 
     if (${CMAKE_CXX_COMPILER_ID} STREQUAL "AppleClang")
         include(${NAPPGUI_ROOT_PATH}/prj/NAppAppleClang.cmake)

diff --git a/prj/NAppMacOS.cmake b/prj/NAppMacOS.cmake
@@ -42,24 +42,25 @@
 #------------------------------------------------------------------------------
 
 function(nap_macos_sdk_name sdkVersion _ret)
+	string(REPLACE "macosx" "" sdkVersion ${sdkVersion})
     # 14 = "Sonoma"
-    if (sdkVersion VERSION_GREATER "13.9999")
+    if (${sdkVersion} VERSION_GREATER "13.9999")
         set(${_ret} "Sonoma" PARENT_SCOPE)
 
     # 13 = "Ventura"
-    elseif (sdkVersion VERSION_GREATER "12.9999")
+    elseif (${sdkVersion} VERSION_GREATER "12.9999")
         set(${_ret} "Ventura" PARENT_SCOPE)
 
     # 12 = "Monterey"
-    elseif (sdkVersion VERSION_GREATER "11.9999")
+    elseif (${sdkVersion} VERSION_GREATER "11.9999")
         set(${_ret} "Monterey" PARENT_SCOPE)
 
     # 11 = "Big Sur"
-    elseif (sdkVersion VERSION_GREATER "10.9999")
+    elseif (${sdkVersion} VERSION_GREATER "10.9999")
         set(${_ret} "Big Sur" PARENT_SCOPE)
 
     # 10.15 = "Catalina"
-    elseif (sdkVersion VERSION_GREATER "10.14.9999")
+    elseif (${sdkVersion} VERSION_GREATER "10.14.9999")
         set(${_ret} "Catalina" PARENT_SCOPE)
 
     # 10.14 = "Mojave"

diff --git a/src/core/array.c b/src/core/array.c
@@ -12,7 +12,7 @@
 
 #include "heap.h"
 #include "stream.h"
-#include "strings.h"
+#include "string_utils.h"
 #include <sewer/blib.h>
 #include <sewer/bmem.h>
 #include <sewer/cassert.h>

diff --git a/src/core/coreall.h b/src/core/coreall.h
@@ -27,6 +27,6 @@
 #include "setpt.h"
 #include "setst.h"
 #include "stream.h"
-#include "strings.h"
+#include "string_utils.h"
 #include "tfilter.h"
 #include <osbs/osbsall.h>
diff --git a/src/core/date.c b/src/core/date.c
@@ -11,7 +11,7 @@
 /* Dates */
 
 #include "date.h"
-#include "strings.h"
+#include "string_utils.h"
 #include <osbs/btime.h>
 #include <sewer/blib.h>
 #include <sewer/cassert.h>

diff --git a/src/core/dbind.c b/src/core/dbind.c
@@ -19,7 +19,7 @@
 #include "buffer.h"
 #include "heap.h"
 #include "stream.h"
-#include "strings.h"
+#include "string_utils.h"
 #include <osbs/log.h>
 #include <sewer/bmath.h>
 #include <sewer/bmem.h>

diff --git a/src/core/event.cpp b/src/core/event.cpp
@@ -13,7 +13,7 @@
 #include "event.h"
 #include "event.inl"
 #include "heap.h"
-#include "strings.h"
+#include "string_utils.h"
 #include <sewer/cassert.h>
 
 struct _event_t

diff --git a/src/core/heap.c b/src/core/heap.c
@@ -12,7 +12,7 @@
 
 #include "heap.h"
 #include "heap.inl"
-#include "strings.h"
+#include "string_utils.h"
 #include <osbs/osbs.h>
 #include <osbs/bmutex.h>
 #include <osbs/bthread.h>

diff --git a/src/core/hfile.c b/src/core/hfile.c
@@ -17,7 +17,7 @@
 #include "date.h"
 #include "event.h"
 #include "stream.h"
-#include "strings.h"
+#include "string_utils.h"
 #include <osbs/bfile.h>
 #include <sewer/bstd.h>
 #include <sewer/cassert.h>

diff --git a/src/core/keybuf.c b/src/core/keybuf.c
@@ -12,7 +12,7 @@
 
 #include "keybuf.h"
 #include "heap.h"
-#include "strings.h"
+#include "string_utils.h"
 #include <osbs/log.h>
 #include <sewer/bmem.h>
 #include <sewer/cassert.h>

diff --git a/src/core/lex.c b/src/core/lex.c
@@ -14,7 +14,7 @@
 #include "stream.inl"
 #include "heap.h"
 #include "stream.h"
-#include "strings.h"
+#include "string_utils.h"
 #include <sewer/cassert.h>
 #include <sewer/ptr.h>
 #include <sewer/unicode.h>

diff --git a/src/core/respack.c b/src/core/respack.c
@@ -18,7 +18,7 @@
 #include "heap.h"
 #include "hfile.h"
 #include "stream.h"
-#include "strings.h"
+#include "string_utils.h"
 #include <osbs/bfile.h>
 #include <sewer/cassert.h>
 #include <sewer/ptr.h>

diff --git a/src/core/stream.c b/src/core/stream.c
@@ -14,7 +14,7 @@
 #include "stream.inl"
 #include "lex.inl"
 #include "heap.h"
-#include "strings.h"
+#include "string_utils.h"
 #include <osbs/osbs.h>
 #include <osbs/bfile.h>
 #include <osbs/bsocket.h>

diff --git a/src/core/strings.c → src/core/string_utils.c b/src/core/strings.c → src/core/string_utils.c
@@ -4,13 +4,13 @@
  * MIT Licence
  * https://nappgui.com/en/legal/license.html
  *
- * File: strings.c
+ * File: string_utils.c
  *
  */
 
 /* UTF8 strings */
 
-#include "strings.h"
+#include "string_utils.h"
 #include "arrpt.h"
 #include "heap.h"
 #include "stream.h"

diff --git a/src/core/strings.h → src/core/string_utils.h b/src/core/strings.h → src/core/string_utils.h
@@ -4,7 +4,7 @@
  * MIT Licence
  * https://nappgui.com/en/legal/license.html
  *
- * File: strings.h
+ * File: string_utils.h
  *
  */
 

diff --git a/src/core/tfilter.c b/src/core/tfilter.c
@@ -12,7 +12,7 @@
 
 #include "tfilter.inl"
 #include "date.h"
-#include "strings.h"
+#include "string_utils.h"
 #include <sewer/cassert.h>
 #include <sewer/unicode.h>
 

diff --git a/src/draw2d/color.c b/src/draw2d/color.c
@@ -12,7 +12,7 @@
 
 #include "color.h"
 #include "draw2d.inl"
-#include <core/strings.h>
+#include <core/string_utils.h>
 #include <sewer/bmath.h>
 #include <sewer/bstd.h>
 #include <sewer/cassert.h>

diff --git a/src/draw2d/dctx.c b/src/draw2d/dctx.c
@@ -16,7 +16,7 @@
 #include "draw.h"
 #include "color.h"
 #include "font.h"
-#include <core/strings.h>
+#include <core/string_utils.h>
 #include <geom2d/t2d.h>
 #include <sewer/cassert.h>
 

diff --git a/src/draw2d/draw2d.c b/src/draw2d/draw2d.c
@@ -23,7 +23,7 @@
 #include <core/core.h>
 #include <core/dbindh.h>
 #include <core/heap.h>
-#include <core/strings.h>
+#include <core/string_utils.h>
 #include <osbs/log.h>
 #include <sewer/blib.h>
 #include <sewer/bmath.h>

diff --git a/src/draw2d/font.c b/src/draw2d/font.c
@@ -14,7 +14,7 @@
 #include "font.inl"
 #include "draw2d.inl"
 #include <core/heap.h>
-#include <core/strings.h>
+#include <core/string_utils.h>
 #include <sewer/cassert.h>
 #include <sewer/ptr.h>
 

diff --git a/src/draw2d/gtk/osfont.c b/src/draw2d/gtk/osfont.c
@@ -16,7 +16,7 @@
 #include "draw2d.inl"
 #include <core/arrpt.h>
 #include <core/heap.h>
-#include <core/strings.h>
+#include <core/string_utils.h>
 #include <sewer/cassert.h>
 #include <sewer/ptr.h>
 

diff --git a/src/draw2d/gtk/osimage.c b/src/draw2d/gtk/osimage.c
@@ -18,7 +18,7 @@
 #include "draw2d_gtk.ixx"
 #include <core/buffer.h>
 #include <core/heap.h>
-#include <core/strings.h>
+#include <core/string_utils.h>
 #include <core/stream.h>
 #include <sewer/bmem.h>
 #include <sewer/cassert.h>

diff --git a/src/draw2d/image.c b/src/draw2d/image.c
@@ -24,7 +24,7 @@
 #include <core/hfile.h>
 #include <core/respackh.h>
 #include <core/stream.h>
-#include <core/strings.h>
+#include <core/string_utils.h>
 #include <sewer/bmem.h>
 #include <sewer/cassert.h>
 #include <sewer/ptr.h>

diff --git a/src/draw2d/imgutil.c b/src/draw2d/imgutil.c
@@ -15,7 +15,7 @@
 #include "palette.h"
 #include "pixbuf.h"
 #include <core/buffer.h>
-#include <core/strings.h>
+#include <core/string_utils.h>
 #include <core/stream.h>
 #include <sewer/bmem.h>
 #include <sewer/cassert.h>

diff --git a/src/draw2d/osx/osfont.m b/src/draw2d/osx/osfont.m
@@ -20,7 +20,7 @@
 #include "draw2d.inl"
 #include "draw.inl"
 #include <core/arrpt.h>
-#include <core/strings.h>
+#include <core/string_utils.h>
 #include <sewer/cassert.h>
 
 #if !defined(__MACOS__)

diff --git a/src/draw2d/win/osfont.cpp b/src/draw2d/win/osfont.cpp
@@ -18,7 +18,7 @@
 #include <core/arrpt.h>
 #include <core/arrst.h>
 #include <core/heap.h>
-#include <core/strings.h>
+#include <core/string_utils.h>
 #include <osbs/osbs.h>
 #include <sewer/cassert.h>
 #include <sewer/unicode.h>

diff --git a/src/gui/button.c b/src/gui/button.c
@@ -24,7 +24,7 @@
 #include <geom2d/v2d.h>
 #include <core/event.h>
 #include <core/objh.h>
-#include <core/strings.h>
+#include <core/string_utils.h>
 #include <sewer/cassert.h>
 #include <sewer/ptr.h>
 

diff --git a/src/gui/combo.c b/src/gui/combo.c
@@ -22,7 +22,7 @@
 #include <core/arrpt.h>
 #include <core/event.h>
 #include <core/objh.h>
-#include <core/strings.h>
+#include <core/string_utils.h>
 #include <sewer/cassert.h>
 #include <sewer/ptr.h>
 

diff --git a/src/gui/edit.c b/src/gui/edit.c
@@ -23,7 +23,7 @@
 #include <draw2d/guictx.h>
 #include <core/event.h>
 #include <core/objh.h>
-#include <core/strings.h>
+#include <core/string_utils.h>
 #include <sewer/cassert.h>
 #include <sewer/ptr.h>
 #include <sewer/unicode.h>

diff --git a/src/gui/gbind.c b/src/gui/gbind.c
@@ -26,7 +26,7 @@
 #include <core/arrpt.h>
 #include <core/dbindh.h>
 #include <core/event.h>
-#include <core/strings.h>
+#include <core/string_utils.h>
 #include <sewer/bmath.h>
 #include <sewer/bmem.h>
 #include <sewer/bstd.h>

diff --git a/src/gui/gui.c b/src/gui/gui.c
@@ -36,7 +36,7 @@
 #include <core/hfileh.h>
 #include <core/respack.h>
 #include <core/respackh.h>
-#include <core/strings.h>
+#include <core/string_utils.h>
 #include <osbs/bproc.h>
 #include <osbs/bfile.h>
 #include <osbs/log.h>

diff --git a/src/gui/guicontrol.c b/src/gui/guicontrol.c
@@ -13,7 +13,7 @@
 #include "guicontrol.h"
 #include "component.inl"
 #include "view.inl"
-#include <core/strings.h>
+#include <core/string_utils.h>
 #include <sewer/cassert.h>
 
 /*---------------------------------------------------------------------------*/

diff --git a/src/gui/label.c b/src/gui/label.c
@@ -22,7 +22,7 @@
 #include <geom2d/s2d.h>
 #include <core/event.h>
 #include <core/objh.h>
-#include <core/strings.h>
+#include <core/string_utils.h>
 #include <sewer/cassert.h>
 #include <sewer/ptr.h>
 

diff --git a/src/gui/layout.c b/src/gui/layout.c
@@ -36,7 +36,7 @@
 #include <core/event.h>
 #include <core/heap.h>
 #include <core/objh.h>
-#include <core/strings.h>
+#include <core/string_utils.h>
 #include <sewer/bmath.h>
 #include <sewer/bmem.h>
 #include <sewer/cassert.h>

diff --git a/src/gui/listbox.c b/src/gui/listbox.c
@@ -26,7 +26,7 @@
 #include <core/arrst.h>
 #include <core/event.h>
 #include <core/heap.h>
-#include <core/strings.h>
+#include <core/string_utils.h>
 #include <sewer/bmath.h>
 #include <sewer/cassert.h>
 #include <sewer/ptr.h>

diff --git a/src/gui/menuitem.c b/src/gui/menuitem.c
@@ -18,7 +18,7 @@
 #include <draw2d/image.h>
 #include <core/event.h>
 #include <core/objh.h>
-#include <core/strings.h>
+#include <core/string_utils.h>
 #include <sewer/cassert.h>
 #include <sewer/ptr.h>
 

diff --git a/src/gui/panel.c b/src/gui/panel.c
@@ -21,7 +21,7 @@
 #include <geom2d/v2d.h>
 #include <core/arrpt.h>
 #include <core/objh.h>
-#include <core/strings.h>
+#include <core/string_utils.h>
 #include <sewer/cassert.h>
 #include <sewer/ptr.h>