From b359a940bacb749266353964ea81af5d5fd14eaf Mon Sep 17 00:00:00 2001 From: nigelbarink Date: Sat, 22 Oct 2022 17:20:09 +0200 Subject: [PATCH] Adding a new submodel ENTT --- .gitmodules | 3 +++ BarinkEngine/premake5.lua | 23 +++++++++++++---------- libs/entt | 1 + premake5.lua | 2 +- 4 files changed, 18 insertions(+), 11 deletions(-) create mode 160000 libs/entt diff --git a/.gitmodules b/.gitmodules index 4244e52..4d64e93 100644 --- a/.gitmodules +++ b/.gitmodules @@ -28,3 +28,6 @@ [submodule "libs/physx"] path = libs/physx url = https://git.barink.dev/Nigel/PhysX.git +[submodule "libs/entt"] + path = libs/entt + url = https://github.com/skypjack/entt.git diff --git a/BarinkEngine/premake5.lua b/BarinkEngine/premake5.lua index e109523..648fc88 100644 --- a/BarinkEngine/premake5.lua +++ b/BarinkEngine/premake5.lua @@ -4,22 +4,25 @@ project "BarinkEngine" buildmessage "Building BarinkEngine" includedirs { - "../libs/lua/include", "../libs/spdlog/include", "../libs/glm", - "../libs/GorillaAudio/include", - - "../libs/physx/physx/include", - "../libs/steam-audio/include", - - "../libs/assimp/include", - - - "../libs/glad/include", "../libs/glfw/include", "../libs/glew/include", + "../libs/glad/include", + + + "../libs/assimp/include", + "../libs/entt/src", + "../libs/physx/physx/include", + + "../libs/lua/include", + + "../libs/GorillaAudio/include", + "../libs/steam-audio/include", + + "../libs/ImGui", } diff --git a/libs/entt b/libs/entt new file mode 160000 index 0000000..9ac5f6d --- /dev/null +++ b/libs/entt @@ -0,0 +1 @@ +Subproject commit 9ac5f6d0465e80762b5289c659c9306300af4c66 diff --git a/premake5.lua b/premake5.lua index 5f9e0a5..3d03cf5 100644 --- a/premake5.lua +++ b/premake5.lua @@ -6,7 +6,7 @@ workspace "BarinkEngine" architecture "x86_64" targetdir "./%{prj.name}/build/%{cfg.buildcfg}" - objdir "./%{prj.name}/intermediates/%{cfg.buildcfg}" + objdir "./%{prj.name}/%{cfg.buildcfg}/intermediates/" startproject("SandboxApp")