sid/NazaraEngine
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Build Nazara on macos up to Nazara_network (not included

Browse Source
This commit is contained in:
ImperatorS79
2020-11-21 20:05:19 +01:00
parent d243e7bcd2
commit 4bf49876c6
13 changed files with 158 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
include/Nazara/Math/Angle.inl
View File

@@ -97,7 +97,7 @@ namespace Nz
}
};
#ifdef NAZARA_PLATFORM_POSIX
#ifdef NAZARA_PLATFORM_LINUX
template<typename T>
void SinCos(std::enable_if_t<!std::is_same<T, float>::value && !std::is_same<T, long double>::value, double> x, T* sin, T* cos)
{

9
include/Nazara/Prerequisites.hpp
View File

@@ -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

3
include/Nazara/Shader/ShaderAstSerializer.hpp
View File

@@ -68,6 +68,7 @@ namespace Nz
virtual void Value(UInt16& val) = 0;
virtual void Value(UInt32& val) = 0;
virtual void Value(UInt64& val) = 0;
virtual void Value(std::size_t& val) = 0;
inline void SizeT(std::size_t& val);
virtual void Variable(ShaderNodes::VariablePtr& var) = 0;
@@ -101,6 +102,7 @@ namespace Nz
void Value(UInt16& val) override;
void Value(UInt32& val) override;
void Value(UInt64& val) override;
void Value(std::size_t& val) override;
void Variable(ShaderNodes::VariablePtr& var) override;
ByteStream& m_stream;
@@ -132,6 +134,7 @@ namespace Nz
void Value(UInt16& val) override;
void Value(UInt32& val) override;
void Value(UInt64& val) override;
void Value(std::size_t& val) override;
void Variable(ShaderNodes::VariablePtr& var) override;
ByteStream& m_stream;