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

Merge branch 'nazara-next' into graphics-next

Browse Source
This commit is contained in:
Jérôme Leclercq
2021-01-28 16:37:46 +01:00
parent 5eedd3c0bc afe190041f
commit 2ef772cec7
23 changed files with 215 additions and 157 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)
{

4
include/Nazara/OpenGLRenderer/Utils.hpp
View File

@@ -10,7 +10,7 @@
#include <Nazara/Prerequisites.hpp>
#include <Nazara/Renderer/Enums.hpp>
#include <Nazara/Utility/Enums.hpp>
#include <Nazara/OpenGLRenderer/Wrapper/Loader.hpp>
#include <Nazara/OpenGLRenderer/Wrapper/Context.hpp>
#include <optional>
#include <string>
@@ -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 <Nazara/OpenGLRenderer/Utils.inl>

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