From 4961e461bcf6b00e457cc343fcf8699d77aafaa9 Mon Sep 17 00:00:00 2001 From: anulax1225 Date: Wed, 5 Jun 2024 16:47:57 +0200 Subject: [PATCH] fixed build --- premake5.lua | 9 ++++----- src/bakara.h | 1 - src/bakara/core/entry.cpp | 3 +-- src/bakara/events/event.h | 3 +-- src/bkpch.h | 4 +--- 5 files changed, 7 insertions(+), 13 deletions(-) diff --git a/premake5.lua b/premake5.lua index a9abd96..894b21e 100644 --- a/premake5.lua +++ b/premake5.lua @@ -1,11 +1,12 @@ project "bakara" + kind "StaticLib" language "C++" - cppdialect "C++17" + cppdialect "C++20" targetdir("%{wks.location}/bin/" .. outputdir .. "/%{prj.name}") objdir("%{wks.location}/bin-int/" .. outputdir .. "/%{prj.name}") - + buildoptions { "-fPIC" } files { "%{wks.location}/vendor/glm/glm/**.hpp", @@ -64,7 +65,6 @@ project "bakara" optimize "on" filter "system:windows" - kind "StaticLib" staticruntime "on" defines { @@ -77,8 +77,7 @@ project "bakara" } filter "system:linux" - kind "SharedLib" - staticruntime "off" + staticruntime "on" files { diff --git a/src/bakara.h b/src/bakara.h index b0bb862..cdee964 100644 --- a/src/bakara.h +++ b/src/bakara.h @@ -15,7 +15,6 @@ Plaform namespace doc namespace Bk::Plaform {} #include -#include #include #include diff --git a/src/bakara/core/entry.cpp b/src/bakara/core/entry.cpp index 7ca12b7..5507d83 100644 --- a/src/bakara/core/entry.cpp +++ b/src/bakara/core/entry.cpp @@ -1,5 +1,4 @@ #include -#include "log.h" #include "application.h" /*! \file entry.cpp @@ -15,7 +14,7 @@ extern std::unique_ptr Bk::create_app(); Entry of the program. */ int main(int argc, char** argv) { - Bk::Log::init(); + Bk::Log::init("Bakara"); BK_CORE_INFO("Bienvenue dans la sandbox {0} version {1}", "bakara", 1); std::unique_ptr app = Bk::create_app(); app->run(); diff --git a/src/bakara/events/event.h b/src/bakara/events/event.h index e8dc84a..f925970 100644 --- a/src/bakara/events/event.h +++ b/src/bakara/events/event.h @@ -2,7 +2,6 @@ #include #include -#include namespace Bk { enum class EventType @@ -42,7 +41,7 @@ namespace Bk { #define EVENT_CLASS_CATEGORY(category) virtual int get_category_flags() const override { return category; } #ifdef BK_DEBUG - #define EVENT_STRINGIFY(str, ...) std::string to_string() const override { return Tools::format(str, __VA_ARGS__); } + #define EVENT_STRINGIFY(str, ...) std::string to_string() const override { return Tools::string_format(str, __VA_ARGS__); } #define GET_EVENT_STRING(event) event.to_string() #else diff --git a/src/bkpch.h b/src/bkpch.h index 97f7159..659f1bf 100644 --- a/src/bkpch.h +++ b/src/bkpch.h @@ -15,8 +15,6 @@ Precompiled headers communly used in bakara. #include #include #include -#include +#include -#include -#include #include