diff --git a/.gitignore b/.gitignore index 03391ec..c5fd1bc 100644 --- a/.gitignore +++ b/.gitignore @@ -31,11 +31,13 @@ *.app build*/ +Build*/ .vs/ .vscode/ +.idea/ out/ CMakeSettings.json # Exceptions .cache/ -*.patch \ No newline at end of file +*.patch diff --git a/Premake/ProjectUtil.lua b/Premake/ProjectUtil.lua index a114394..c4e3dc2 100644 --- a/Premake/ProjectUtil.lua +++ b/Premake/ProjectUtil.lua @@ -44,8 +44,8 @@ end systemToExecutableExtensionMap = { - windows = "exe", - linux = "sh" + windows = ".exe", + linux = "" } systemToDynamicLibExtensionMap = @@ -491,4 +491,4 @@ if InitBuildSettings == nil then BuildSettings:SetSilentFailOnDuplicateSetting(silentFailOnDuplicateSetting) end -end \ No newline at end of file +end diff --git a/Source/Server-Game/Server-Game/ECS/Systems/DatabaseSetup.cpp b/Source/Server-Game/Server-Game/ECS/Systems/DatabaseSetup.cpp index 092b3f2..fc05be9 100644 --- a/Source/Server-Game/Server-Game/ECS/Systems/DatabaseSetup.cpp +++ b/Source/Server-Game/Server-Game/ECS/Systems/DatabaseSetup.cpp @@ -41,7 +41,7 @@ namespace ECS::Systems { "password", "postgres" } }; - if (!JsonUtils::LoadFromPathOrCreate(gameCache.config, fallback, "Data/config/Database.json")) + if (!JsonUtils::LoadFromPathOrCreate(gameCache.config, fallback, "Data/Config/Database.json")) { NC_LOG_CRITICAL("[Database] : Failed to create config file"); } @@ -101,4 +101,4 @@ namespace ECS::Systems { entt::registry::context& ctx = registry.ctx(); } -} \ No newline at end of file +} diff --git a/Source/Server-Game/Server-Game/Scripting/Handlers/ItemHandler.cpp b/Source/Server-Game/Server-Game/Scripting/Handlers/ItemHandler.cpp index 529bc32..65cd047 100644 --- a/Source/Server-Game/Server-Game/Scripting/Handlers/ItemHandler.cpp +++ b/Source/Server-Game/Server-Game/Scripting/Handlers/ItemHandler.cpp @@ -1,4 +1,4 @@ -#include "Itemhandler.h" +#include "ItemHandler.h" #include "Server-Game/Scripting/Game/Item.h" #include "Server-Game/Scripting/Game/ItemTemplate.h" #include "Server-Game/Scripting/Game/ItemWeaponTemplate.h"