diff --git a/CMakeLists.txt b/CMakeLists.txt index fdf44b00..d2070b35 100644 --- 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 index 4ec5dd40..7d159a98 100644 --- a/src/Connection.cpp +++ b/src/Connection.cpp @@ -21,6 +21,9 @@ #include #include +#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 index 1c26cfe1..87ba0f11 100644 --- a/src/ControlManager.cpp +++ b/src/ControlManager.cpp @@ -25,6 +25,9 @@ #include #include +#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 index 5a09bdae..7e235e84 100644 --- a/src/NetworkSource.cpp +++ b/src/NetworkSource.cpp @@ -27,6 +27,9 @@ #include #include +#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 index 11b3961d..f79ed4ef 100644 --- 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 index 272a66f1..c075653a 100644 --- a/src/Streamer.cpp +++ b/src/Streamer.cpp @@ -33,6 +33,9 @@ #include //osc +#if ((ULONG_MAX) != (UINT_MAX)) +#define _M_X64 +#endif #include "osc/OscOutboundPacketStream.h" #include "Settings.h"