From b532b72c94a80d3feae50e2517c4978545d758ee Mon Sep 17 00:00:00 2001 From: anulax1225 Date: Wed, 17 Jan 2024 20:35:58 +0100 Subject: [PATCH] Fixed include error from premake config --- bakara/src/bakara/math/mathpch.h | 1 - bakara/vendor/premake5.lua | 2 +- premake5.lua | 12 ++++++------ sandbox/premake5.lua | 3 ++- 4 files changed, 9 insertions(+), 9 deletions(-) diff --git a/bakara/src/bakara/math/mathpch.h b/bakara/src/bakara/math/mathpch.h index b292481..63405f1 100644 --- a/bakara/src/bakara/math/mathpch.h +++ b/bakara/src/bakara/math/mathpch.h @@ -1,5 +1,4 @@ #pragma once -#include #include #include \ No newline at end of file diff --git a/bakara/vendor/premake5.lua b/bakara/vendor/premake5.lua index 0a7ebad..a65ab0e 100644 --- a/bakara/vendor/premake5.lua +++ b/bakara/vendor/premake5.lua @@ -1,5 +1,5 @@ project "glm" - location "glm/glm" + location "./glm/glm" kind "StaticLib" language "C++" cppdialect "C++17" diff --git a/premake5.lua b/premake5.lua index d66ba40..9fdc26e 100644 --- a/premake5.lua +++ b/premake5.lua @@ -3,13 +3,13 @@ workspace "Bakara" configurations { "Debug", "Release" } startproject "sandbox" - outputdir = "%{cfg.system}-%{cfg.architecture}-%{cfg.buildcfg}" +outputdir = "%{cfg.system}-%{cfg.architecture}-%{cfg.buildcfg}" - IncludeDirs = {} - IncludeDirs["bakara"] = "%{wks.location}/bakara/src" - IncludeDirs["vendor"] = "%{wks.location}/bakara/vendor" - IncludeDirs["spdlog"] = "%{wks.location}/bakara/vendor/spdloglib/include" - IncludeDirs["glm"] = "%{wks.location}/bakara/vendor/glm" +IncludeDirs = {} +IncludeDirs["bakara"] = "%{wks.location}/bakara/src" +IncludeDirs["vendor"] = "%{wks.location}/bakara/vendor" +IncludeDirs["spdlog"] = "%{wks.location}/bakara/vendor/spdloglib/include" +IncludeDirs["glm"] = "%{wks.location}/bakara/vendor/glm" group "Dependencies" include "bakara/vendor" diff --git a/sandbox/premake5.lua b/sandbox/premake5.lua index 4adde23..b982f86 100644 --- a/sandbox/premake5.lua +++ b/sandbox/premake5.lua @@ -17,7 +17,8 @@ project "sandbox" includedirs { "%{IncludeDirs.bakara}", - "%{IncludeDirs.spdlog}" + "%{IncludeDirs.spdlog}", + "%{IncludeDirs.glm}" } links