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

CI: Try to build NazaraCore on macOS

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
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
.github/workflows/macos-build.yml vendored
View File

@ -58,3 +58,22 @@ jobs:
# Setup compilation mode and install project dependencies # Setup compilation mode and install project dependencies
- name: Configure xmake and install dependencies - name: Configure xmake and install dependencies
run: xmake config --shadernodes=y --tests=y --arch=${{ matrix.arch }} --mode=${{ matrix.mode }} --yes run: xmake config --shadernodes=y --tests=y --arch=${{ matrix.arch }} --mode=${{ matrix.mode }} --yes
# Build the engine
- name: Build Nazara
run: xmake build NazaraCore
# Run unit tests
#- name: Run unit tests
# if: matrix.mode != 'releasedbg'
# run: xmake run NazaraUnitTests
# Install the result files
- name: Install Nazara
run: xmake install -vo package
# Upload artifacts
- uses: actions/upload-artifact@v2
with:
name: ${{ matrix.os }}-${{ matrix.arch }}-${{ matrix.mode }}
path: package

2
include/Nazara/Core/DynLib.hpp
View File

@ -15,7 +15,7 @@
#define NAZARA_DYNLIB_EXTENSION ".dll" #define NAZARA_DYNLIB_EXTENSION ".dll"
#elif defined(NAZARA_PLATFORM_LINUX) #elif defined(NAZARA_PLATFORM_LINUX)
#define NAZARA_DYNLIB_EXTENSION ".so" #define NAZARA_DYNLIB_EXTENSION ".so"
#elif defined(NAZARA_PLATFORM_MACOSX) #elif defined(NAZARA_PLATFORM_MACOS)
#define NAZARA_DYNLIB_EXTENSION ".dynlib" #define NAZARA_DYNLIB_EXTENSION ".dynlib"
#else #else
#error OS not handled #error OS not handled

2
include/Nazara/Prerequisites.hpp
View File

@ -132,7 +132,7 @@
#define NAZARA_IMPORT __attribute__((visibility ("default"))) #define NAZARA_IMPORT __attribute__((visibility ("default")))
#elif defined(__APPLE__) && defined(__MACH__) #elif defined(__APPLE__) && defined(__MACH__)
#define NAZARA_PLATFORM_DESKTOP #define NAZARA_PLATFORM_DESKTOP
#define NAZARA_PLATFORM_MACOSX #define NAZARA_PLATFORM_MACOS
#define NAZARA_PLATFORM_POSIX #define NAZARA_PLATFORM_POSIX
#define NAZARA_EXPORT __attribute__((visibility ("default"))) #define NAZARA_EXPORT __attribute__((visibility ("default")))

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

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

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

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

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

@ -7,7 +7,7 @@
#ifdef NAZARA_PLATFORM_WINDOWS #ifdef NAZARA_PLATFORM_WINDOWS
#include <objbase.h> #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> #include <uuid/uuid.h>
#endif #endif
@ -94,7 +94,7 @@ namespace Nz
for (unsigned int i = 0; i < 8; ++i) for (unsigned int i = 0; i < 8; ++i)
uuid[8 + i] = static_cast<UInt8>(id.Data4[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_t id;
uuid_generate(id); uuid_generate(id);