Skip to content

Sanitized premake settings and removed unnecessary includes #473

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
adriengivry merged 5 commits into from
May 10, 2025
Merged

Sanitized premake settings and removed unnecessary includes #473

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
2753abb
Sanitized premake settings and removed unnecessary includes
adriengivry Apr 30, 2025
f2cea6d
Removed the need to add bullet includes to projects using OvPhysics
adriengivry Apr 30, 2025
53cb5f1
Lua/sol don't need to be included anymore in projects using OvCore!
adriengivry Apr 30, 2025
ece6101
Removed tinyxml include from EditorActions header
adriengivry Apr 30, 2025
e148023
Merge branch 'main' into refactor/sanitize_premake
adriengivry May 4, 2025
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
18 changes: 15 additions & 3 deletions Dependencies/ImGui/premake5.lua
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,11 +2,23 @@ project "ImGui"
kind "StaticLib"
language "C++"
cppdialect "C++20"
files { "**.h", "**.cpp", "**.lua" }
includedirs { "include", dependdir .. "glfw/include", dependdir .. "glad/include" }
targetdir (outputdir .. "%{cfg.buildcfg}/%{prj.name}")
objdir (objoutdir .. "%{cfg.buildcfg}/%{prj.name}")
characterset ("MBCS")
warnings "Off"

files {
"**.h",
"**.cpp",
"**.lua"
}

includedirs {
-- Dependencies
dependdir .. "glfw/include",

-- Current Project
"include"
}

filter { "configurations:Debug" }
defines { "DEBUG" }
Expand Down
5 changes: 3 additions & 2 deletions Dependencies/assimp/premake5.lua
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,12 +17,11 @@

project 'assimp'
kind 'StaticLib'
warnings 'Off'
language "C++"
cppdialect "C++20"
targetdir (outputdir .. "%{cfg.buildcfg}/%{prj.name}")
objdir (objoutdir .. "%{cfg.buildcfg}/%{prj.name}")
characterset ("MBCS")
warnings "Off"

includedirs {
'./',
Expand Down Expand Up @@ -58,6 +57,7 @@ project 'assimp'
'code/AssetLib/Obj/**',
'code/AssetLib/FBX/**',
}

-- Importers
defines {
'ASSIMP_BUILD_NO_3D_IMPORTER',
Expand Down Expand Up @@ -112,6 +112,7 @@ project 'assimp'
'ASSIMP_BUILD_NO_X3D_IMPORTER',
'ASSIMP_BUILD_NO_XGL_IMPORTER'
}

-- Exporters
defines {
'ASSIMP_BUILD_NO_COLLADA_EXPORTER',
Expand Down
8 changes: 5 additions & 3 deletions Dependencies/bullet3/premake5.lua
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,7 @@
project "bullet3"
kind "SharedItems"
files { "**.h", "**.lua" }
objdir (objoutdir .. "%{cfg.buildcfg}/%{prj.name}")
characterset ("MBCS")

files {
"**.h",
"**.lua"
}
16 changes: 12 additions & 4 deletions Dependencies/glad/premake5.lua
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,16 +2,24 @@ project "glad"
kind "StaticLib"
language "C"
cdialect "C17"
files { "**.h", "**.c", "**.lua" }
includedirs { "include" }
targetdir (outputdir .. "%{cfg.buildcfg}/%{prj.name}")
objdir (objoutdir .. "%{cfg.buildcfg}/%{prj.name}")
characterset ("MBCS")
warnings "Off"

files {
"**.h",
"**.c",
"**.lua"
}

includedirs {
"include"
}

filter { "configurations:Debug" }
defines { "DEBUG" }
optimize "On"

filter { "configurations:Release" }
defines { "NDEBUG" }
optimize "On"
optimize "On"
20 changes: 16 additions & 4 deletions Dependencies/glfw/premake5.lua
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,12 +2,24 @@ project "glfw"
kind "StaticLib"
language "C"
cdialect "C17"
files { "**.h", "**.c", "**.m", "**.lua" }
includedirs { "include" }
targetdir (outputdir .. "%{cfg.buildcfg}/%{prj.name}")
objdir (objoutdir .. "%{cfg.buildcfg}/%{prj.name}")
characterset ("MBCS")
defines { "_GLFW_WIN32" }
warnings "Off"

files {
"**.h",
"**.c",
"**.m",
"**.lua"
}

includedirs {
"include"
}

defines {
"_GLFW_WIN32"
}

filter { "configurations:Debug" }
defines { "DEBUG" }
Expand Down
1 change: 0 additions & 1 deletion Dependencies/lua/premake5.lua
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,6 @@ project "lua"
includedirs { "include" }
targetdir (outputdir .. "%{cfg.buildcfg}/%{prj.name}")
objdir (objoutdir .. "%{cfg.buildcfg}/%{prj.name}")
characterset ("MBCS")

filter { "configurations:Debug" }
defines { "DEBUG" }
Expand Down
9 changes: 6 additions & 3 deletions Dependencies/sol/premake5.lua
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,8 @@
project "sol"
kind "SharedItems"
files { "**.h", "**.hpp", "**.lua" }
objdir (objoutdir .. "%{cfg.buildcfg}/%{prj.name}")
characterset ("MBCS")

files {
"**.h",
"**.hpp",
"**.lua"
}
20 changes: 16 additions & 4 deletions Dependencies/soloud/premake5.lua
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,12 +2,24 @@ project "soloud"
kind "StaticLib"
language "C++"
cppdialect "C++20"
files { "**.h", "**.cpp", "**.c", "**.lua" }
includedirs { "include" }
targetdir (outputdir .. "%{cfg.buildcfg}/%{prj.name}")
objdir (objoutdir .. "%{cfg.buildcfg}/%{prj.name}")
characterset ("MBCS")
defines {"WITH_MINIAUDIO"}
warnings "Off"

files {
"**.h",
"**.cpp",
"**.c",
"**.lua"
}

includedirs {
"include"
}

defines {
"WITH_MINIAUDIO"
}

filter { "configurations:Debug" }
defines { "DEBUG" }
Expand Down
8 changes: 5 additions & 3 deletions Dependencies/stb_image/premake5.lua
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,7 @@
project "stb_image"
kind "SharedItems"
files { "**.h", "**.lua" }
objdir (objoutdir .. "%{cfg.buildcfg}/%{prj.name}")
characterset ("MBCS")

files {
"**.h",
"**.lua"
}
14 changes: 11 additions & 3 deletions Dependencies/tinyxml2/premake5.lua
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,11 +2,19 @@ project "tinyxml2"
kind "StaticLib"
language "C++"
cppdialect "C++20"
files { "**.h", "**.cpp", "**.lua" }
includedirs { "include" }
targetdir (outputdir .. "%{cfg.buildcfg}/%{prj.name}")
objdir (objoutdir .. "%{cfg.buildcfg}/%{prj.name}")
characterset ("MBCS")
warnings "Off"

files {
"**.h",
"**.cpp",
"**.lua"
}

includedirs {
"include"
}

filter { "configurations:Debug" }
defines { "DEBUG" }
Expand Down
12 changes: 8 additions & 4 deletions Dependencies/tracy/premake5.lua
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,13 +2,17 @@ project "tracy"
kind "StaticLib"
language "C++"
cppdialect "C++20"
files { "**.h", "**.hpp", "**.cpp", "**.lua" }
targetdir (outputdir .. "%{cfg.buildcfg}/%{prj.name}")
objdir (objoutdir .. "%{cfg.buildcfg}/%{prj.name}")
characterset ("MBCS")
defines { "_CRT_SECURE_NO_WARNINGS" }
disablewarnings { "4996" } -- Ignore deprecated functions warnings
warnings "Off"
linkoptions { "/ignore:4006" } -- Ignore "symbol already defined" warnings

files {
"**.h",
"**.hpp",
"**.cpp",
"**.lua"
}

filter { "configurations:Debug" }
defines { "DEBUG" }
Expand Down
24 changes: 19 additions & 5 deletions Sources/Overload/OvAudio/premake5.lua
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,15 +2,29 @@ project "OvAudio"
kind "StaticLib"
language "C++"
cppdialect "C++20"
files { "**.h", "**.inl", "**.cpp", "**.lua" }
targetdir (outputdir .. "%{cfg.buildcfg}/%{prj.name}")
objdir (objoutdir .. "%{cfg.buildcfg}/%{prj.name}")

files {
"**.h",
"**.inl",
"**.cpp",
"**.lua",
"**.ini"
}

includedirs {
-- Dependencies
dependdir .. "soloud/include",
"%{wks.location}/OvDebug/include", "%{wks.location}/OvMaths/include", "%{wks.location}/OvTools/include",

-- Overload SDK
"%{wks.location}/OvDebug/include",
"%{wks.location}/OvMaths/include",
"%{wks.location}/OvTools/include",

-- Current Project
"include"
}
targetdir (outputdir .. "%{cfg.buildcfg}/%{prj.name}")
objdir (objoutdir .. "%{cfg.buildcfg}/%{prj.name}")
characterset ("MBCS")

filter { "configurations:Debug" }
defines { "DEBUG" }
Expand Down
7 changes: 6 additions & 1 deletion Sources/Overload/OvCore/include/OvCore/Helpers/Serializer.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,6 @@
#pragma once

#include <string>
#include <tinyxml2.h>

#include <OvMaths/FVector2.h>
#include <OvMaths/FVector3.h>
Expand All @@ -34,6 +33,12 @@ namespace OvCore::Resources
class Material;
}

namespace tinyxml2
{
class XMLDocument;
class XMLNode;
}

namespace OvCore::Helpers
{
class Serializer
Expand Down
17 changes: 14 additions & 3 deletions Sources/Overload/OvCore/include/OvCore/Scripting/Lua/LuaScript.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,21 +10,32 @@

#include <OvCore/Scripting/Common/TScript.h>

#include <sol/sol.hpp>

namespace OvCore::ECS
{
class Actor;
}

namespace sol
{
template <bool b>
class basic_reference;
using reference = basic_reference<false>;

template <bool, typename>
class basic_table_core;
template <bool b>
using table_core = basic_table_core<b, reference>;
using table = table_core<false>;
}

namespace OvCore::Scripting
{
/**
* Lua script context
*/
struct LuaScriptContext
{
sol::table table;
std::unique_ptr<sol::table> table;
};

using LuaScriptBase = TScript<EScriptingLanguage::LUA, LuaScriptContext>;
Expand Down
9 changes: 6 additions & 3 deletions Sources/Overload/OvCore/include/OvCore/Scripting/Lua/LuaScriptEngine.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,13 +11,16 @@

#include <OvCore/Scripting/Common/TScriptEngine.h>

#include <sol/sol.hpp>

namespace OvCore::ECS::Components
{
class Behaviour;
}

namespace sol
{
class state;
}

namespace OvCore::Scripting
{
/**
Expand Down Expand Up @@ -47,7 +50,7 @@ namespace OvCore::Scripting
/**
* Destructor of the Lua script engine
*/
~LuaScriptEngine();
virtual ~LuaScriptEngine();

/**
* Create the Lua state
Expand Down
Loading