From 32996428c26cc66b666e18c44d0a66ac3476a220 Mon Sep 17 00:00:00 2001 From: Collie_ <99091783+Collie1@users.noreply.github.com> Date: Thu, 28 Dec 2023 11:11:53 +0100 Subject: [PATCH 1/3] Fixed indentation in Build.lua --- Build.lua | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/Build.lua b/Build.lua index 059b37b..0096b52 100644 --- a/Build.lua +++ b/Build.lua @@ -1,12 +1,12 @@ -- premake5.lua workspace "New Project" - architecture "x64" - configurations { "Debug", "Release", "Dist" } - startproject "App" + architecture "x64" + configurations { "Debug", "Release", "Dist" } + startproject "App" - -- Workspace-wide build options for MSVC - filter "system:windows" - buildoptions { "/EHsc", "/Zc:preprocessor", "/Zc:__cplusplus" } + -- Workspace-wide build options for MSVC + filter "system:windows" + buildoptions { "/EHsc", "/Zc:preprocessor", "/Zc:__cplusplus" } OutputDir = "%{cfg.system}-%{cfg.architecture}/%{cfg.buildcfg}" @@ -14,4 +14,4 @@ group "Core" include "Core/Build-Core.lua" group "" -include "App/Build-App.lua" \ No newline at end of file +include "App/Build-App.lua" From 78e1607612951fa794216ff2661fb1e96751dc50 Mon Sep 17 00:00:00 2001 From: Collie_ <99091783+Collie1@users.noreply.github.com> Date: Thu, 28 Dec 2023 11:13:15 +0100 Subject: [PATCH 2/3] Fixed indentation Build-Core.lua --- Core/Build-Core.lua | 58 ++++++++++++++++++++++----------------------- 1 file changed, 29 insertions(+), 29 deletions(-) diff --git a/Core/Build-Core.lua b/Core/Build-Core.lua index 03a4b94..ea24d37 100644 --- a/Core/Build-Core.lua +++ b/Core/Build-Core.lua @@ -1,37 +1,37 @@ project "Core" - kind "StaticLib" - language "C++" - cppdialect "C++20" - targetdir "Binaries/%{cfg.buildcfg}" - staticruntime "off" + kind "StaticLib" + language "C++" + cppdialect "C++20" + targetdir "Binaries/%{cfg.buildcfg}" + staticruntime "off" - files { "Source/**.h", "Source/**.cpp" } + files { "Source/**.h", "Source/**.cpp" } - includedirs - { - "Source" - } + includedirs + { + "Source" + } - targetdir ("../Binaries/" .. OutputDir .. "/%{prj.name}") - objdir ("../Binaries/Intermediates/" .. OutputDir .. "/%{prj.name}") + targetdir ("../Binaries/" .. OutputDir .. "/%{prj.name}") + objdir ("../Binaries/Intermediates/" .. OutputDir .. "/%{prj.name}") - filter "system:windows" - systemversion "latest" - defines { } + filter "system:windows" + systemversion "latest" + defines { } - filter "configurations:Debug" - defines { "DEBUG" } - runtime "Debug" - symbols "On" + filter "configurations:Debug" + defines { "DEBUG" } + runtime "Debug" + symbols "On" - filter "configurations:Release" - defines { "RELEASE" } - runtime "Release" - optimize "On" - symbols "On" + filter "configurations:Release" + defines { "RELEASE" } + runtime "Release" + optimize "On" + symbols "On" - filter "configurations:Dist" - defines { "DIST" } - runtime "Release" - optimize "On" - symbols "Off" \ No newline at end of file + filter "configurations:Dist" + defines { "DIST" } + runtime "Release" + optimize "On" + symbols "Off" From db2fe9e0c52b5cd096316f6be4ba0510ba3f003a Mon Sep 17 00:00:00 2001 From: Collie_ <99091783+Collie1@users.noreply.github.com> Date: Thu, 28 Dec 2023 11:14:20 +0100 Subject: [PATCH 3/3] fixed indetation in Build-App.lua --- App/Build-App.lua | 88 +++++++++++++++++++++++------------------------ 1 file changed, 44 insertions(+), 44 deletions(-) diff --git a/App/Build-App.lua b/App/Build-App.lua index 4dc8d51..30618df 100644 --- a/App/Build-App.lua +++ b/App/Build-App.lua @@ -1,45 +1,45 @@ project "App" - kind "ConsoleApp" - language "C++" - cppdialect "C++20" - targetdir "Binaries/%{cfg.buildcfg}" - staticruntime "off" - - files { "Source/**.h", "Source/**.cpp" } - - includedirs - { - "Source", - - -- Include Core - "../Core/Source" - } - - links - { - "Core" - } - - targetdir ("../Binaries/" .. OutputDir .. "/%{prj.name}") - objdir ("../Binaries/Intermediates/" .. OutputDir .. "/%{prj.name}") - - filter "system:windows" - systemversion "latest" - defines { "WINDOWS" } - - filter "configurations:Debug" - defines { "DEBUG" } - runtime "Debug" - symbols "On" - - filter "configurations:Release" - defines { "RELEASE" } - runtime "Release" - optimize "On" - symbols "On" - - filter "configurations:Dist" - defines { "DIST" } - runtime "Release" - optimize "On" - symbols "Off" \ No newline at end of file + kind "ConsoleApp" + language "C++" + cppdialect "C++20" + targetdir "Binaries/%{cfg.buildcfg}" + staticruntime "off" + + files { "Source/**.h", "Source/**.cpp" } + + includedirs + { + "Source", + + -- Include Core + "../Core/Source" + } + + links + { + "Core" + } + + targetdir ("../Binaries/" .. OutputDir .. "/%{prj.name}") + objdir ("../Binaries/Intermediates/" .. OutputDir .. "/%{prj.name}") + + filter "system:windows" + systemversion "latest" + defines { "WINDOWS" } + + filter "configurations:Debug" + defines { "DEBUG" } + runtime "Debug" + symbols "On" + + filter "configurations:Release" + defines { "RELEASE" } + runtime "Release" + optimize "On" + symbols "On" + + filter "configurations:Dist" + defines { "DIST" } + runtime "Release" + optimize "On" + symbols "Off"