Skip to content
Draft
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
21 changes: 13 additions & 8 deletions .github/workflows/build_linux.yml
Original file line number Diff line number Diff line change
Expand Up @@ -13,18 +13,23 @@ jobs:
matrix:
configuration: [debug, release]
steps:
- uses: actions/checkout@v2
- uses: actions/checkout@v4
with:
submodules: 'true'

- name: Install dependencies
run: |
sudo apt install libxrandr-dev
sudo apt install libxinerama-dev
sudo apt install libxcursor-dev
sudo apt install libxi-dev
sudo apt install libglvnd-dev
sudo apt install libvulkan-dev
sudo apt-get update
sudo apt-get install -y \
libxrandr-dev \
libxrender-dev \
libxinerama-dev \
libxcursor-dev \
libxi-dev \
libglvnd-dev \
libvulkan-dev \
clang \
libc++-dev

- name: Build
run: ./build_linux.sh ${{matrix.configuration}}
run: ./build_linux.sh ${{matrix.configuration}}
2 changes: 1 addition & 1 deletion .github/workflows/build_macos.yml
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ jobs:
matrix:
configuration: [debug, release]
steps:
- uses: actions/checkout@v2
- uses: actions/checkout@v4
with:
submodules: 'true'

Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/build_windows.yml
Original file line number Diff line number Diff line change
Expand Up @@ -14,9 +14,9 @@ jobs:
matrix:
configuration: [debug, release]
steps:
- uses: actions/checkout@v2
- uses: actions/checkout@v4
with:
submodules: 'true'

- name: Build
run: ./build_windows.bat ${{matrix.configuration}}
run: ./build_windows.bat ${{matrix.configuration}}
6 changes: 3 additions & 3 deletions build_macos.sh
Original file line number Diff line number Diff line change
Expand Up @@ -13,9 +13,9 @@ fi


if test \( \( -n "$1" \) -a \( "$1" = "debug" \) \);then
CONFIG=" Debug"
CONFIG="Debug"
elif test \( \( -n "$1" \) -a \( "$1" = "release" \) \);then
CONFIG=" Release"
CONFIG="Release"
else
echo "The config \"$1\" is not supported!"
echo ""
Expand All @@ -26,6 +26,6 @@ else
exit 1
fi

cmake -S . -B build -G "Xcode"
cmake -S . -B build -G "Xcode" -DCMAKE_POLICY_VERSION_MINIMUM=3.5

cmake --build build --config "${CONFIG}"
4 changes: 4 additions & 0 deletions engine/3rdparty/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -56,6 +56,10 @@ if(NOT TARGET Jolt)
if(COMPILER_CHECK_UNQUALIFIED)
target_compile_options(Jolt PRIVATE "-Wno-unqualified-std-cast-call")
endif()
check_cxx_compiler_flag("-Wno-nontrivial-memcall" COMPILER_CHECK_NONTRIVIAL_MEMCALL)
if(COMPILER_CHECK_NONTRIVIAL_MEMCALL)
target_compile_options(Jolt PRIVATE "-Wno-nontrivial-memcall")
endif()
endif()

if(ENABLE_PHYSICS_DEBUG_RENDERER)
Expand Down
1 change: 1 addition & 0 deletions engine/3rdparty/JoltPhysics/Jolt/Core/Core.h
Original file line number Diff line number Diff line change
Expand Up @@ -217,6 +217,7 @@ JPH_SUPPRESS_WARNINGS_STD_BEGIN
#include <cmath>
#include <sstream>
#include <functional>
#include <cstdint>
JPH_SUPPRESS_WARNINGS_STD_END
#if defined(JPH_USE_SSE)
#include <immintrin.h>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2191,7 +2191,8 @@ namespace sol {
static_assert(std::is_constructible<T, Args&&...>::value, "T must be constructible with Args");

*this = nullopt;
this->construct(std::forward<Args>(args)...);
new (static_cast<void*>(this)) optional(std::in_place, std::forward<Args>(args)...);
return **this;
}

/// Swaps this optional with the other.
Expand Down
2 changes: 1 addition & 1 deletion engine/3rdparty/tinyobjloader/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
#This configures the Cmake system with multiple properties, depending
#on the platform and configuration it is set to build in.
project(tinyobjloader)
cmake_minimum_required(VERSION 3.2)
cmake_minimum_required(VERSION 3.5)
set(TINYOBJLOADER_SOVERSION 2)
set(TINYOBJLOADER_VERSION 2.0.0-rc.9)

Expand Down
1 change: 1 addition & 0 deletions engine/source/runtime/core/meta/reflection/reflection.cpp
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
#include "reflection.h"
#include <algorithm>
#include <cstring>
#include <map>

Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
#define VMA_IMPLEMENTATION 1
#define VMA_STATIC_VULKAN_FUNCTIONS 0
#define VMA_DYNAMIC_VULKAN_FUNCTIONS 1
#include <cstdio>
#include "vk_mem_alloc.h"
Loading