diff --git a/build/scripts/common.lua b/build/scripts/common.lua index d2e4a207c..f191249f1 100644 --- a/build/scripts/common.lua +++ b/build/scripts/common.lua @@ -158,7 +158,8 @@ function NazaraBuild:Execute() "../include", "../src/" }) - sysincludedirs("../thirdparty/include") + + sysincludedirs("../thirdparty/include", "/usr/local/include/") files(moduleTable.Files) excludes(moduleTable.FilesExcluded) @@ -173,6 +174,14 @@ function NazaraBuild:Execute() "../thirdparty/lib/common", "../lib" }) + + if (os.ishost("macosx")) then + libdirs({ + "../thirdparty/lib/common", + "../lib", + "/usr/local/lib" --brew + }) + end -- Output to lib/conf/arch self:FilterLibDirectory("../lib/", targetdir) @@ -932,7 +941,10 @@ end function NazaraBuild:PostconfigGenericProject() -- Add options required for C++17 thread and filesystem (have to be linked last) - filter("action:gmake*") + filter({"action:gmake*", "system:macosx"}) + links("pthread") + + filter({"action:gmake*", "system:not macosx"}) links("stdc++fs") links("pthread") diff --git a/build/scripts/modules/physics3d.lua b/build/scripts/modules/physics3d.lua index d8b9ea352..893948e76 100644 --- a/build/scripts/modules/physics3d.lua +++ b/build/scripts/modules/physics3d.lua @@ -21,4 +21,10 @@ MODULE.Custom = function() filter({"architecture:x86", "system:linux"}) defines("_POSIX_VER") + + filter({"architecture:x86_64", "system:macosx"}) + defines("_POSIX_VER_64") + + filter({"architecture:x86", "system:macosx"}) + defines("_POSIX_VER") end diff --git a/build/scripts/modules/platform.lua b/build/scripts/modules/platform.lua index cc9cc8be6..fbf1b94af 100644 --- a/build/scripts/modules/platform.lua +++ b/build/scripts/modules/platform.lua @@ -21,11 +21,15 @@ MODULE.OsDefines.Windows = { "SDL_VIDEO_DRIVER_WINDOWS=1" } -MODULE.OsDefines.Posix = { - "SDL_VIDEO_DRIVER_X11=1", - "SDL_VIDEO_DRIVER_WAYLAND=1", -} - MODULE.DynLib = { "SDL2" } + +MODULE.Custom = function() + filter("system:linux") + defines("SDL_VIDEO_DRIVER_X11=1") + defines("SDL_VIDEO_DRIVER_WAYLAND=1") + + filter("system:macosx") + defines("SDL_VIDEO_DRIVER_COCOA=1") +end diff --git a/include/Nazara/Math/Angle.inl b/include/Nazara/Math/Angle.inl index d18e07ca9..55ac418d9 100644 --- a/include/Nazara/Math/Angle.inl +++ b/include/Nazara/Math/Angle.inl @@ -97,7 +97,7 @@ namespace Nz } }; -#ifdef NAZARA_PLATFORM_POSIX +#ifdef NAZARA_PLATFORM_LINUX template void SinCos(std::enable_if_t::value && !std::is_same::value, double> x, T* sin, T* cos) { diff --git a/include/Nazara/OpenGLRenderer/Utils.hpp b/include/Nazara/OpenGLRenderer/Utils.hpp index 81c1eebe9..8c28d2419 100644 --- a/include/Nazara/OpenGLRenderer/Utils.hpp +++ b/include/Nazara/OpenGLRenderer/Utils.hpp @@ -10,7 +10,7 @@ #include #include #include -#include +#include #include #include @@ -39,7 +39,7 @@ namespace Nz inline GLenum ToOpenGL(GL::BufferTarget bufferTarget); inline GLenum ToOpenGL(GL::TextureTarget bufferTarget); - //NAZARA_OPENGLRENDERER_API std::string TranslateOpenGLError(GLenum code); + NAZARA_OPENGLRENDERER_API std::string TranslateOpenGLError(GLenum code); } #include diff --git a/include/Nazara/Prerequisites.hpp b/include/Nazara/Prerequisites.hpp index 24bc14dc1..c8384b9cc 100644 --- a/include/Nazara/Prerequisites.hpp +++ b/include/Nazara/Prerequisites.hpp @@ -121,9 +121,12 @@ #define NAZARA_EXPORT __attribute__((visibility ("default"))) #define NAZARA_IMPORT __attribute__((visibility ("default"))) -/*#elif defined(__APPLE__) && defined(__MACH__) - #define NAZARA_PLATFORM_MACOSX - #define NAZARA_PLATFORM_POSIX*/ +#elif defined(__APPLE__) && defined(__MACH__) + #define NAZARA_PLATFORM_MACOSX + #define NAZARA_PLATFORM_POSIX + + #define NAZARA_EXPORT __attribute__((visibility ("default"))) + #define NAZARA_IMPORT __attribute__((visibility ("default"))) #else #error This operating system is not fully supported by the Nazara Engine diff --git a/src/Nazara/Audio/OpenAL.cpp b/src/Nazara/Audio/OpenAL.cpp index e1a148a96..3e516115c 100644 --- a/src/Nazara/Audio/OpenAL.cpp +++ b/src/Nazara/Audio/OpenAL.cpp @@ -132,7 +132,11 @@ namespace Nz "libopenal.so.0", "libopenal.so" }; - //#elif defined(NAZARA_PLATFORM_MACOSX) + #elif defined(NAZARA_PLATFORM_MACOSX) + const char* libs[] = { + "libopenal.dylib", + "libopenal.1.dylib", + }; #else NazaraError("Unknown OS"); return false; diff --git a/src/Nazara/Core/Posix/FileImpl.cpp b/src/Nazara/Core/Posix/FileImpl.cpp index f1af9ebbe..b64370fbb 100644 --- a/src/Nazara/Core/Posix/FileImpl.cpp +++ b/src/Nazara/Core/Posix/FileImpl.cpp @@ -31,8 +31,8 @@ namespace Nz { if (!m_endOfFileUpdated) { - struct stat64 fileSize; - if (fstat64(m_fileDescriptor, &fileSize) == -1) + struct Stat fileSize; + if (Fstat(m_fileDescriptor, &fileSize) == -1) fileSize.st_size = 0; m_endOfFile = (GetCursorPos() >= static_cast(fileSize.st_size)); @@ -50,7 +50,7 @@ namespace Nz UInt64 FileImpl::GetCursorPos() const { - off64_t position = lseek64(m_fileDescriptor, 0, SEEK_CUR); + Off_t position = Lseek(m_fileDescriptor, 0, SEEK_CUR); return static_cast(position); } @@ -77,7 +77,7 @@ namespace Nz if (mode & OpenMode_Truncate) flags |= O_TRUNC; - int fileDescriptor = open64(filePath.generic_u8string().data(), flags, permissions); + int fileDescriptor = Open_def(filePath.generic_u8string().data(), flags, permissions); if (fileDescriptor == -1) { NazaraError("Failed to open \"" + filePath.generic_u8string() + "\" : " + Error::GetLastSystemError()); @@ -166,12 +166,12 @@ namespace Nz m_endOfFileUpdated = false; - return lseek64(m_fileDescriptor, offset, moveMethod) != -1; + return Lseek(m_fileDescriptor, offset, moveMethod) != -1; } bool FileImpl::SetSize(UInt64 size) { - return ftruncate64(m_fileDescriptor, size) != 0; + return Ftruncate(m_fileDescriptor, size) != 0; } std::size_t FileImpl::Write(const void* buffer, std::size_t size) diff --git a/src/Nazara/Core/Posix/FileImpl.hpp b/src/Nazara/Core/Posix/FileImpl.hpp index ae35375ce..81e09df7b 100644 --- a/src/Nazara/Core/Posix/FileImpl.hpp +++ b/src/Nazara/Core/Posix/FileImpl.hpp @@ -16,6 +16,24 @@ #include #include +#if defined(NAZARA_PLATFORM_MACOSX) + #define Stat stat + #define Fstat fstat + #define Off_t off_t + #define Lseek lseek + #define Open_def open + #define Ftruncate ftruncate +#elif defined(NAZARA_PLATFORM_LINUX) + #define Stat stat64 + #define Fstat fstat64 + #define Off_t off64_t + #define Lseek lseek64 + #define Open_def open64 + #define Ftruncate ftruncate64 +#else + #error This operating system is not fully supported by the Nazara Engine +#endif + namespace Nz { class File; diff --git a/src/Nazara/Core/Posix/TaskSchedulerImpl.cpp b/src/Nazara/Core/Posix/TaskSchedulerImpl.cpp index e8cbb3de8..0ec5b9ee8 100644 --- a/src/Nazara/Core/Posix/TaskSchedulerImpl.cpp +++ b/src/Nazara/Core/Posix/TaskSchedulerImpl.cpp @@ -6,6 +6,10 @@ #include #include +#if defined(NAZARA_PLATFORM_MACOSX) + #include +#endif + namespace Nz { bool TaskSchedulerImpl::Initialize(unsigned int workerCount) @@ -191,4 +195,55 @@ namespace Nz pthread_cond_t TaskSchedulerImpl::s_cvEmpty; pthread_cond_t TaskSchedulerImpl::s_cvNotEmpty; pthread_barrier_t TaskSchedulerImpl::s_barrier; + +#if defined(NAZARA_PLATFORM_MACOSX) + //Code from https://blog.albertarmea.com/post/47089939939/using-pthreadbarrier-on-mac-os-x + int TaskSchedulerImpl::pthread_barrier_init(pthread_barrier_t *barrier, const pthread_barrierattr_t *attr, unsigned int count) + { + if(count == 0) + { + errno = EINVAL; + return -1; + } + if(pthread_mutex_init(&barrier->mutex, 0) < 0) + { + return -1; + } + if(pthread_cond_init(&barrier->cond, 0) < 0) + { + pthread_mutex_destroy(&barrier->mutex); + return -1; + } + barrier->tripCount = count; + barrier->count = 0; + + return 0; + } + + int TaskSchedulerImpl::pthread_barrier_destroy(pthread_barrier_t *barrier) + { + pthread_cond_destroy(&barrier->cond); + pthread_mutex_destroy(&barrier->mutex); + return 0; + } + + int TaskSchedulerImpl::pthread_barrier_wait(pthread_barrier_t *barrier) + { + pthread_mutex_lock(&barrier->mutex); + ++(barrier->count); + if(barrier->count >= barrier->tripCount) + { + barrier->count = 0; + pthread_cond_broadcast(&barrier->cond); + pthread_mutex_unlock(&barrier->mutex); + return 1; + } + else + { + pthread_cond_wait(&barrier->cond, &(barrier->mutex)); + pthread_mutex_unlock(&barrier->mutex); + return 0; + } + } +#endif } diff --git a/src/Nazara/Core/Posix/TaskSchedulerImpl.hpp b/src/Nazara/Core/Posix/TaskSchedulerImpl.hpp index 405216286..024125cd9 100644 --- a/src/Nazara/Core/Posix/TaskSchedulerImpl.hpp +++ b/src/Nazara/Core/Posix/TaskSchedulerImpl.hpp @@ -13,6 +13,17 @@ #include #include +#if defined(NAZARA_PLATFORM_MACOSX) + typedef int pthread_barrierattr_t; + typedef struct + { + pthread_mutex_t mutex; + pthread_cond_t cond; + int count; + int tripCount; + } pthread_barrier_t; +#endif + namespace Nz { struct Functor; @@ -45,6 +56,12 @@ namespace Nz static pthread_cond_t s_cvEmpty; static pthread_cond_t s_cvNotEmpty; static pthread_barrier_t s_barrier; + +#if defined(NAZARA_PLATFORM_MACOSX) + static int pthread_barrier_init(pthread_barrier_t *barrier, const pthread_barrierattr_t *attr, unsigned int count); + static int pthread_barrier_destroy(pthread_barrier_t *barrier); + static int pthread_barrier_wait(pthread_barrier_t *barrier); +#endif }; } diff --git a/src/Nazara/Core/Stream.cpp b/src/Nazara/Core/Stream.cpp index 7bf90a157..9abc0a14a 100644 --- a/src/Nazara/Core/Stream.cpp +++ b/src/Nazara/Core/Stream.cpp @@ -157,7 +157,7 @@ namespace Nz #elif defined(NAZARA_PLATFORM_LINUX) std::string_view temp(string); // Nothing to do -#elif defined(NAZARA_PLATFORM_MACOS) +#elif defined(NAZARA_PLATFORM_MACOSX) std::string temp(string); ReplaceStr(temp, "\n", "\r"); #endif diff --git a/src/Nazara/Network/Posix/SocketImpl.cpp b/src/Nazara/Network/Posix/SocketImpl.cpp index a9623e544..fbe762ff1 100644 --- a/src/Nazara/Network/Posix/SocketImpl.cpp +++ b/src/Nazara/Network/Posix/SocketImpl.cpp @@ -17,6 +17,10 @@ #include #include +#if !defined(TCP_KEEPIDLE) && defined(TCP_KEEPALIVE) +#define TCP_KEEPIDLE TCP_KEEPALIVE // see -> https://gitlab.freedesktop.org/spice/usbredir/-/issues/9 +#endif + namespace Nz { constexpr int SOCKET_ERROR = -1; @@ -269,6 +273,9 @@ namespace Nz unsigned int code; socklen_t codeLength = sizeof(code); +#if defined(NAZARA_PLATFORM_MACOSX) + return 0; //No IP_MTU on macosx +#else if (getsockopt(handle, IPPROTO_IP, IP_MTU, &code, &codeLength) == SOCKET_ERROR) { if (error) @@ -276,6 +283,7 @@ namespace Nz return 0; } +#endif if (error) *error = SocketError_NoError; @@ -597,8 +605,11 @@ namespace Nz } IpAddress senderIp; - +#if defined(MSG_NOSIGNAL) int byteRead = recvmsg(handle, &msgHdr, MSG_NOSIGNAL); +#else + int byteRead = recvmsg(handle, &msgHdr, 0); +#endif if (byteRead == -1) { int errorCode = GetLastErrorCode(); @@ -714,7 +725,12 @@ namespace Nz msgHdr.msg_iov = sysBuffers.data(); msgHdr.msg_iovlen = static_cast(bufferCount); +#if defined(MSG_NOSIGNAL) int byteSent = sendmsg(handle, &msgHdr, MSG_NOSIGNAL); +#else + int byteSent = sendmsg(handle, &msgHdr, 0); +#endif + if (byteSent == SOCKET_ERROR) { int errorCode = GetLastErrorCode(); @@ -896,6 +912,18 @@ namespace Nz if (error) *error = SocketError_NoError; + +#if not defined(MSG_NOSIGNAL) // -> https://github.com/intel/parameter-framework/pull/133/files + //There is no MSG_NOSIGNAL on macos + const int set = 1; + if (setsockopt(handle, SOL_SOCKET, SO_NOSIGPIPE, &set, sizeof(set)) == SOCKET_ERROR) + { + if (error) + *error = TranslateErrnoToSocketError(GetLastErrorCode()); + + return false; //< Error + } +#endif return true; } diff --git a/src/Nazara/OpenGLRenderer/Utils_OpenGLRenderer.cpp b/src/Nazara/OpenGLRenderer/Utils_OpenGLRenderer.cpp index 10ac5f987..35af067e2 100644 --- a/src/Nazara/OpenGLRenderer/Utils_OpenGLRenderer.cpp +++ b/src/Nazara/OpenGLRenderer/Utils_OpenGLRenderer.cpp @@ -2,105 +2,47 @@ // This file is part of the "Nazara Engine - OpenGL Renderer" // For conditions of distribution and use, see copyright notice in Config.hpp -#if 0 - #include #include namespace Nz { - std::string TranslateOpenGLError(VkResult code) + std::string TranslateOpenGLError(GLenum code) { - // From https://www.khronos.org/registry/vulkan/specs/1.0-wsi_extensions/xhtml/vkspec.html#VkResult switch (code) { - case VK_SUCCESS: - return "No error"; - - case VK_NOT_READY: - return "A fence or query has not yet completed"; - - case VK_TIMEOUT: - return "A wait operation has not completed in the specified time"; - - case VK_EVENT_SET: - return "An event is signaled"; - - case VK_EVENT_RESET: - return "An event is unsignaled"; - - case VK_INCOMPLETE: - return "A return array was too small for the result"; - - case VK_ERROR_OUT_OF_HOST_MEMORY: - return "A host memory allocation has failed"; - - case VK_ERROR_OUT_OF_DEVICE_MEMORY: - return "A device memory allocation has failed"; - - case VK_ERROR_INITIALIZATION_FAILED: - return "Initialization of an object could not be completed for implementation-specific reasons"; - - case VK_ERROR_DEVICE_LOST: - return "The logical or physical device has been lost"; - - case VK_ERROR_MEMORY_MAP_FAILED: - return "Mapping of the memory object has failed"; - - case VK_ERROR_LAYER_NOT_PRESENT: - return "A requested layer is not present or could not be loaded"; - - case VK_ERROR_EXTENSION_NOT_PRESENT: - return "A requested extension is not supported"; - - case VK_ERROR_FEATURE_NOT_PRESENT: - return "A requested feature is not supported"; - - case VK_ERROR_INCOMPATIBLE_DRIVER: - return "The requested version of OpenGL is not supported by the driver or is otherwise incompatible for implementation-specific reasons"; - - case VK_ERROR_TOO_MANY_OBJECTS: - return "Too many objects of the type have already been created"; - - case VK_ERROR_FORMAT_NOT_SUPPORTED: - return "A requested format is not supported on this device"; - - case VK_ERROR_FRAGMENTED_POOL: - return "A requested pool allocation has failed due to fragmentation of the pool’s memory"; - - case VK_ERROR_SURFACE_LOST_KHR: - return "A surface is no longer available"; - - case VK_ERROR_NATIVE_WINDOW_IN_USE_KHR: - return "The requested window is already connected to a VkSurfaceKHR, or to some other non-OpenGL API"; - - case VK_SUBOPTIMAL_KHR: - return "A swapchain no longer matches the surface properties exactly, but can still be used to present to the surface successfully"; - - case VK_ERROR_OUT_OF_DATE_KHR: - return "A surface has changed in such a way that it is no longer compatible with the swapchain, and further presentation requests using the swapchain will fail. Applications must query the new surface properties and recreate their swapchain if they wish to continue presenting to the surface"; - - case VK_ERROR_INCOMPATIBLE_DISPLAY_KHR: - return "The display used by a swapchain does not use the same presentable image layout, or is incompatible in a way that prevents sharing an image"; - - case VK_ERROR_VALIDATION_FAILED_EXT: - return "A validation layer found an error"; - - case VK_ERROR_INVALID_SHADER_NV: - return "One or more shaders failed to compile or link"; - - case VK_ERROR_OUT_OF_POOL_MEMORY_KHR: - return "A requested pool allocation has failed"; - - case VK_ERROR_INVALID_EXTERNAL_HANDLE: - return "An external handle is not a valid handle of the specified type"; - - default: + // OpenGL/OpenGL ES error codes + case GL_INVALID_ENUM: + return "an unacceptable value is specified for an enumerated argument"; break; + + case GL_INVALID_VALUE: + return "a numeric argument is out of range"; + break; + + case GL_INVALID_OPERATION: + return "the specified operation is not allowed in the current state"; + break; + + case GL_INVALID_FRAMEBUFFER_OPERATION: + return "the framebuffer object is not complete"; + break; + + case GL_OUT_OF_MEMORY: + return "there is not enough memory left to execute the command"; + break; + + // OpenGL error codes + case GL_STACK_UNDERFLOW: + return "an attempt has been made to perform an operation that would cause an internal stack to underflow."; + break; + + case GL_STACK_OVERFLOW: + return "an attempt has been made to perform an operation that would cause an internal stack to overflow."; + break; + } return "Unknown OpenGL error (0x" + NumberToString(code, 16) + ')'; } } - -#endif diff --git a/src/Nazara/OpenGLRenderer/Wrapper/Context.cpp b/src/Nazara/OpenGLRenderer/Wrapper/Context.cpp index bbfa89d8b..4b50659da 100644 --- a/src/Nazara/OpenGLRenderer/Wrapper/Context.cpp +++ b/src/Nazara/OpenGLRenderer/Wrapper/Context.cpp @@ -378,42 +378,7 @@ namespace Nz::GL { hasAnyError = true; - switch (lastError) - { - // OpenGL/OpenGL ES error codes - case GL_INVALID_ENUM: - NazaraError("OpenGL error: an unacceptable value is specified for an enumerated argument"); - break; - - case GL_INVALID_VALUE: - NazaraError("OpenGL error: a numeric argument is out of range"); - break; - - case GL_INVALID_OPERATION: - NazaraError("OpenGL error: the specified operation is not allowed in the current state"); - break; - - case GL_INVALID_FRAMEBUFFER_OPERATION: - NazaraError("OpenGL error: the framebuffer object is not complete"); - break; - - case GL_OUT_OF_MEMORY: - NazaraError("OpenGL error: there is not enough memory left to execute the command"); - break; - - // OpenGL error codes - case GL_STACK_UNDERFLOW: - NazaraError("OpenGL error: an attempt has been made to perform an operation that would cause an internal stack to underflow."); - break; - - case GL_STACK_OVERFLOW: - NazaraError("OpenGL error: an attempt has been made to perform an operation that would cause an internal stack to overflow."); - break; - - default: - NazaraError("OpenGL error: an unknown error was reported (code: " + std::to_string(lastError) + ")"); - break; - } + NazaraError("OpenGL error: " + TranslateOpenGLError(lastError)); } return hasAnyError; diff --git a/src/Nazara/Shader/ShaderAstSerializer.cpp b/src/Nazara/Shader/ShaderAstSerializer.cpp index 66b346a7f..b998d8637 100644 --- a/src/Nazara/Shader/ShaderAstSerializer.cpp +++ b/src/Nazara/Shader/ShaderAstSerializer.cpp @@ -301,7 +301,7 @@ namespace Nz void ShaderAstSerializerBase::Serialize(ShaderNodes::SwizzleOp& node) { - Value(node.componentCount); + SizeT(node.componentCount); Node(node.expression); for (std::size_t i = 0; i < node.componentCount; ++i) @@ -805,7 +805,7 @@ namespace Nz { m_stream >> val; } - + void ShaderAstUnserializer::Variable(ShaderNodes::VariablePtr& var) { Int32 nodeTypeInt; diff --git a/src/ShaderNode/DataModels/BufferField.cpp b/src/ShaderNode/DataModels/BufferField.cpp index 11707f717..6f2c506fe 100644 --- a/src/ShaderNode/DataModels/BufferField.cpp +++ b/src/ShaderNode/DataModels/BufferField.cpp @@ -333,7 +333,7 @@ void BufferField::PopulateFieldList(std::size_t structIndex, const std::string& else if constexpr (std::is_same_v) PopulateFieldList(arg, prefix + member.name + "."); else - static_assert(AlwaysFalse::value, "non-exhaustive visitor"); + static_assert(Nz::AlwaysFalse::value, "non-exhaustive visitor"); }, member.type); } diff --git a/src/ShaderNode/DataModels/Cast.inl b/src/ShaderNode/DataModels/Cast.inl index 5a215c72a..a8e932fed 100644 --- a/src/ShaderNode/DataModels/Cast.inl +++ b/src/ShaderNode/DataModels/Cast.inl @@ -2,6 +2,7 @@ #include #include #include +#include #include template diff --git a/src/ShaderNode/DataTypes/VecData.hpp b/src/ShaderNode/DataTypes/VecData.hpp index d80bff106..f6e1bfdd9 100644 --- a/src/ShaderNode/DataTypes/VecData.hpp +++ b/src/ShaderNode/DataTypes/VecData.hpp @@ -48,7 +48,7 @@ struct VecExpressionTypeHelper<4> static constexpr Nz::ShaderNodes::BasicType ExpressionType = Nz::ShaderNodes::BasicType::Float4; }; -template constexpr Nz::ShaderNodes::BasicType VecExpressionType = VecExpressionTypeHelper::template ExpressionType; +template constexpr Nz::ShaderNodes::BasicType VecExpressionType = VecExpressionTypeHelper::ExpressionType; struct VecTypeDummy {}; @@ -86,7 +86,7 @@ struct VecTypeHelper<4> using Type = Nz::Vector4f; }; -template using VecType = typename VecTypeHelper::template Type; +template using VecType = typename VecTypeHelper::Type; constexpr std::array s_vectorComponents = { 'X', 'Y', 'Z', 'W' }; diff --git a/src/ShaderNode/ShaderGraph.cpp b/src/ShaderNode/ShaderGraph.cpp index 4900c5893..68e11685f 100644 --- a/src/ShaderNode/ShaderGraph.cpp +++ b/src/ShaderNode/ShaderGraph.cpp @@ -285,7 +285,7 @@ void ShaderGraph::Load(const QJsonObject& data) if (typeDocRef.isString()) memberInfo.type = DecodeEnum(typeDocRef.toString().toStdString()).value(); else - memberInfo.type = typeDocRef.toInt(); + memberInfo.type = static_cast(typeDocRef.toInt()); } } @@ -394,7 +394,7 @@ QJsonObject ShaderGraph::Save() else if constexpr (std::is_same_v) memberDoc["type"] = int(arg); else - static_assert(AlwaysFalse::value, "non-exhaustive visitor"); + static_assert(Nz::AlwaysFalse::value, "non-exhaustive visitor"); }, member.type); memberArray.append(std::move(memberDoc)); @@ -651,7 +651,7 @@ Nz::ShaderExpressionType ShaderGraph::ToShaderExpressionType(const std::variant< return s.name; } else - static_assert(AlwaysFalse::value, "non-exhaustive visitor"); + static_assert(Nz::AlwaysFalse::value, "non-exhaustive visitor"); }, type); }; diff --git a/src/ShaderNode/Widgets/StructEditDialog.cpp b/src/ShaderNode/Widgets/StructEditDialog.cpp index 320ad586a..6c10fa0d9 100644 --- a/src/ShaderNode/Widgets/StructEditDialog.cpp +++ b/src/ShaderNode/Widgets/StructEditDialog.cpp @@ -97,7 +97,7 @@ QString StructEditDialog::GetMemberName(const StructInfo::Member& member) else if constexpr (std::is_same_v) name += QString::fromStdString(m_shaderGraph.GetStruct(arg).name); else - static_assert(AlwaysFalse::value, "non-exhaustive visitor"); + static_assert(Nz::AlwaysFalse::value, "non-exhaustive visitor"); }, member.type); diff --git a/src/ShaderNode/Widgets/StructMemberEditDialog.cpp b/src/ShaderNode/Widgets/StructMemberEditDialog.cpp index 82bc4e1a2..dcf0d830f 100644 --- a/src/ShaderNode/Widgets/StructMemberEditDialog.cpp +++ b/src/ShaderNode/Widgets/StructMemberEditDialog.cpp @@ -50,7 +50,7 @@ StructMemberEditDialog(shaderGraph, parent) else if constexpr (std::is_same_v) m_typeList->setCurrentIndex(static_cast(PrimitiveTypeCount + arg)); else - static_assert(AlwaysFalse::value, "non-exhaustive visitor"); + static_assert(Nz::AlwaysFalse::value, "non-exhaustive visitor"); }, member.type); } diff --git a/thirdparty/build/newton.lua b/thirdparty/build/newton.lua index 9c9b93bb4..1c5bb8995 100644 --- a/thirdparty/build/newton.lua +++ b/thirdparty/build/newton.lua @@ -36,4 +36,7 @@ LIBRARY.Custom = function() filter({"architecture:x86", "system:linux"}) defines("_POSIX_VER") -end \ No newline at end of file + + filter({"architecture:x86_64", "system:macosx"}) + defines("_MACOSX_VER") +end