OSX 14 M2 platform compilation

brunoherbelin · Aug 17, 2024 · e115981 · e115981
1 parent 90962d0
commit e115981
Show file tree

Hide file tree

Showing 6 changed files with 17 additions and 5 deletions.
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -61,11 +61,11 @@ if(UNIX)
         set(CMAKE_SKIP_RPATH TRUE)
         set(OpenGL_DIR /Library/Developer/CommandLineTools/SDKs/MacOSX.sdk/System/Library/Frameworks/)
 
-        set(CMAKE_OSX_ARCHITECTURES "x86_64")
-        set(CMAKE_OSX_DEPLOYMENT_TARGET "11")
+        # set(CMAKE_OSX_ARCHITECTURES "x86_64")
+        # set(CMAKE_OSX_DEPLOYMENT_TARGET "11")
 
-#        set(CMAKE_OSX_ARCHITECTURES "arm64")
-#        set(CMAKE_OSX_DEPLOYMENT_TARGET "12")
+       set(CMAKE_OSX_ARCHITECTURES "arm64")
+       set(CMAKE_OSX_DEPLOYMENT_TARGET "13")
 
         # CPACK
         set(CPACK_SYSTEM_NAME  "OSX_${CMAKE_OSX_DEPLOYMENT_TARGET}_${CMAKE_OSX_ARCHITECTURES}")

diff --git a/src/Connection.cpp b/src/Connection.cpp
@@ -21,6 +21,9 @@
 #include <chrono>
 #include <algorithm>
 
+#if ((ULONG_MAX) != (UINT_MAX))
+#define _M_X64
+#endif
 #include "osc/OscOutboundPacketStream.h"
 
 #include "defines.h"

diff --git a/src/ControlManager.cpp b/src/ControlManager.cpp
@@ -25,6 +25,9 @@
 #include <regex>
 
 #include <GLFW/glfw3.h>
+#if ((ULONG_MAX) != (UINT_MAX))
+#define _M_X64
+#endif
 #include "osc/OscOutboundPacketStream.h"
 
 #include "Log.h"

diff --git a/src/NetworkSource.cpp b/src/NetworkSource.cpp
@@ -27,6 +27,9 @@
 #include <gst/pbutils/pbutils.h>
 #include <gst/gst.h>
 
+#if ((ULONG_MAX) != (UINT_MAX))
+#define _M_X64
+#endif
 #include "osc/OscOutboundPacketStream.h"
 
 #include "SystemToolkit.h"

diff --git a/src/ShaderEditWindow.cpp b/src/ShaderEditWindow.cpp
@@ -364,7 +364,7 @@ void ShaderEditWindow::Render()
             // cancel edit clone
             else {
                 // possibility that source was removed
-                g_printerr("cancel edit clone %ld\n", current_);
+                // g_printerr("cancel edit clone %ld\n", current_);
 
                 // disable editor
                 _editor.SetReadOnly(true);

diff --git a/src/Streamer.cpp b/src/Streamer.cpp
@@ -33,6 +33,9 @@
 #include <gst/pbutils/pbutils.h>
 
 //osc
+#if ((ULONG_MAX) != (UINT_MAX))
+#define _M_X64
+#endif
 #include "osc/OscOutboundPacketStream.h"
 
 #include "Settings.h"