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

CI: Try to build NazaraCore on macOS

Browse Source
This commit is contained in:
Jérôme Leclercq
2022-03-19 23:29:19 +01:00
parent 10cba985fb
commit 04dfd25c74
6 changed files with 25 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/Nazara/Audio/OpenALLibrary.cpp
View File

@@ -35,7 +35,7 @@ namespace Nz
"libopenal.so.0",
"libopenal.so"
};
#elif defined(NAZARA_PLATFORM_MACOSX)
#elif defined(NAZARA_PLATFORM_MACOS)
std::array libs {
"libopenal.dylib",
"libopenal.1.dylib",

2
src/Nazara/Core/Stream.cpp
View File

@@ -157,7 +157,7 @@ namespace Nz
#elif defined(NAZARA_PLATFORM_LINUX)
std::string_view temp(string);
// Nothing to do
#elif defined(NAZARA_PLATFORM_MACOSX)
#elif defined(NAZARA_PLATFORM_MACOS)
std::string temp(string);
ReplaceStr(temp, "\n", "\r");
#endif

4
src/Nazara/Core/Uuid.cpp
View File

@@ -7,7 +7,7 @@
#ifdef NAZARA_PLATFORM_WINDOWS
#include <objbase.h>
#elif defined(NAZARA_PLATFORM_LINUX) || defined(NAZARA_PLATFORM_MACOSX)
#elif defined(NAZARA_PLATFORM_LINUX) || defined(NAZARA_PLATFORM_MACOS)
#include <uuid/uuid.h>
#endif
@@ -94,7 +94,7 @@ namespace Nz
for (unsigned int i = 0; i < 8; ++i)
uuid[8 + i] = static_cast<UInt8>(id.Data4[i]);
#elif defined(NAZARA_PLATFORM_LINUX) || defined(NAZARA_PLATFORM_MACOSX)
#elif defined(NAZARA_PLATFORM_LINUX) || defined(NAZARA_PLATFORM_MACOS)
uuid_t id;
uuid_generate(id);