CI: Try to build NazaraCore on macOS
This commit is contained in:
parent
10cba985fb
commit
04dfd25c74
|
|
@ -58,3 +58,22 @@ jobs:
|
|||
# Setup compilation mode and install project dependencies
|
||||
- name: Configure xmake and install dependencies
|
||||
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
|
||||
|
|
|
|||
|
|
@ -15,7 +15,7 @@
|
|||
#define NAZARA_DYNLIB_EXTENSION ".dll"
|
||||
#elif defined(NAZARA_PLATFORM_LINUX)
|
||||
#define NAZARA_DYNLIB_EXTENSION ".so"
|
||||
#elif defined(NAZARA_PLATFORM_MACOSX)
|
||||
#elif defined(NAZARA_PLATFORM_MACOS)
|
||||
#define NAZARA_DYNLIB_EXTENSION ".dynlib"
|
||||
#else
|
||||
#error OS not handled
|
||||
|
|
|
|||
|
|
@ -132,7 +132,7 @@
|
|||
#define NAZARA_IMPORT __attribute__((visibility ("default")))
|
||||
#elif defined(__APPLE__) && defined(__MACH__)
|
||||
#define NAZARA_PLATFORM_DESKTOP
|
||||
#define NAZARA_PLATFORM_MACOSX
|
||||
#define NAZARA_PLATFORM_MACOS
|
||||
#define NAZARA_PLATFORM_POSIX
|
||||
|
||||
#define NAZARA_EXPORT __attribute__((visibility ("default")))
|
||||
|
|
|
|||
|
|
@ -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",
|
||||
|
|
|
|||
|
|
@ -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
|
||||
|
|
|
|||
|
|
@ -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);
|
||||
|
||||
|
|
|
|||
Loading…
Reference in New Issue