diff --git a/.gitignore b/.gitignore index 74ff7e9..959882a 100644 --- a/.gitignore +++ b/.gitignore @@ -4,4 +4,5 @@ bin/ bin-int/ # VS Files -**.vcxproj** \ No newline at end of file +**.vcxproj** +**.sln \ No newline at end of file diff --git a/BuildScripts/LICENSE.txt b/BuildScripts/LICENSE.txt new file mode 100644 index 0000000..4866338 --- /dev/null +++ b/BuildScripts/LICENSE.txt @@ -0,0 +1,27 @@ +Copyright (c) 2003-2019 Jason Perkins and individual contributors. +All rights reserved. + +Redistribution and use in source and binary forms, with or without modification, +are permitted provided that the following conditions are met: + + 1. Redistributions of source code must retain the above copyright notice, + this list of conditions and the following disclaimer. + + 2. Redistributions in binary form must reproduce the above copyright notice, + this list of conditions and the following disclaimer in the documentation + and/or other materials provided with the distribution. + + 3. Neither the name of Premake nor the names of its contributors may be + used to endorse or promote products derived from this software without + specific prior written permission. + +THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND +ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED +WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE +DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE +FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL +DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR +SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER +CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, +OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE +OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. \ No newline at end of file diff --git a/BuildScripts/premake5.exe b/BuildScripts/premake5.exe new file mode 100644 index 0000000..5c557b1 Binary files /dev/null and b/BuildScripts/premake5.exe differ diff --git a/BuildScripts/premake5.lua b/BuildScripts/premake5.lua new file mode 100644 index 0000000..82c6f9f --- /dev/null +++ b/BuildScripts/premake5.lua @@ -0,0 +1,19 @@ +workspace "Light" + location "../" + startproject "Sandbox" + + architecture "x64" + + configurations + { + "Debug", + "Release", + "Distribution", + } + +-- Directories -- +outputdir = "%{cfg.buildcfg}/%{cfg.system}/%{cfg.architecture}/%{prj.name}" + +-- Projects -- +include "../Sandbox/" +include "../Engine/" \ No newline at end of file diff --git a/Engine/premake5.lua b/Engine/premake5.lua new file mode 100644 index 0000000..004b6e4 --- /dev/null +++ b/Engine/premake5.lua @@ -0,0 +1,45 @@ +project "Engine" + + -- Output Directories -- + location "../Engine/" + + targetdir ("../bin/" .. outputdir) + objdir ("../bin-int/" .. outputdir) + + -- Compiler -- + kind "StaticLib" + language "C++" + cppdialect "C++17" + staticruntime "on" + + -- Project Files --- + files + { + "%{prj.location}/**.h", + "%{prj.location}/**.cpp", + "%{prj.location}/**.lua", + } + + -- Dependencies -- + -- NILL -- + + --- Filters --- + -- windows + filter "system:windows" + defines "LT_PLATFORM_WINDOWS" + systemversion "latest" + + -- debug + filter "configurations:Debug" + defines "LT_DEBUG" + symbols "on" + + -- release + filter "configurations:Release" + defines "LT_RELEASE" + optimize "on" + + -- distribution + filter "configurations:Distribution" + defines "LT_DIST" + optimize "on" \ No newline at end of file diff --git a/Light Engine/src/Engine/Application.cpp b/Engine/src/Engine/Application.cpp similarity index 100% rename from Light Engine/src/Engine/Application.cpp rename to Engine/src/Engine/Application.cpp diff --git a/Light Engine/src/Engine/Application.h b/Engine/src/Engine/Application.h similarity index 100% rename from Light Engine/src/Engine/Application.h rename to Engine/src/Engine/Application.h diff --git a/Light Engine/src/Engine/Base.h b/Engine/src/Engine/Base.h similarity index 100% rename from Light Engine/src/Engine/Base.h rename to Engine/src/Engine/Base.h diff --git a/Light Engine/src/Engine/EntryPoint.h b/Engine/src/Engine/EntryPoint.h similarity index 100% rename from Light Engine/src/Engine/EntryPoint.h rename to Engine/src/Engine/EntryPoint.h diff --git a/Light Engine/src/LightEngine.h b/Engine/src/LightEngine.h similarity index 100% rename from Light Engine/src/LightEngine.h rename to Engine/src/LightEngine.h diff --git a/Light Engine.sln b/Light Engine.sln deleted file mode 100644 index df598bb..0000000 --- a/Light Engine.sln +++ /dev/null @@ -1,34 +0,0 @@ - -Microsoft Visual Studio Solution File, Format Version 12.00 -# Visual Studio Version 16 -VisualStudioVersion = 16.0.30330.147 -MinimumVisualStudioVersion = 10.0.40219.1 -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Light Engine", "Light Engine\Light Engine.vcxproj", "{039B5335-8EC7-4005-AFF9-833E1B760755}" -EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Sandbox", "Sandbox\Sandbox.vcxproj", "{A72B03C9-4FE6-4288-AE22-8DD8E4E37A4D}" - ProjectSection(ProjectDependencies) = postProject - {039B5335-8EC7-4005-AFF9-833E1B760755} = {039B5335-8EC7-4005-AFF9-833E1B760755} - EndProjectSection -EndProject -Global - GlobalSection(SolutionConfigurationPlatforms) = preSolution - Debug|x64 = Debug|x64 - Release|x64 = Release|x64 - EndGlobalSection - GlobalSection(ProjectConfigurationPlatforms) = postSolution - {039B5335-8EC7-4005-AFF9-833E1B760755}.Debug|x64.ActiveCfg = Debug|x64 - {039B5335-8EC7-4005-AFF9-833E1B760755}.Debug|x64.Build.0 = Debug|x64 - {039B5335-8EC7-4005-AFF9-833E1B760755}.Release|x64.ActiveCfg = Release|x64 - {039B5335-8EC7-4005-AFF9-833E1B760755}.Release|x64.Build.0 = Release|x64 - {A72B03C9-4FE6-4288-AE22-8DD8E4E37A4D}.Debug|x64.ActiveCfg = Debug|x64 - {A72B03C9-4FE6-4288-AE22-8DD8E4E37A4D}.Debug|x64.Build.0 = Debug|x64 - {A72B03C9-4FE6-4288-AE22-8DD8E4E37A4D}.Release|x64.ActiveCfg = Release|x64 - {A72B03C9-4FE6-4288-AE22-8DD8E4E37A4D}.Release|x64.Build.0 = Release|x64 - EndGlobalSection - GlobalSection(SolutionProperties) = preSolution - HideSolutionNode = FALSE - EndGlobalSection - GlobalSection(ExtensibilityGlobals) = postSolution - SolutionGuid = {ADE7ECA1-8548-4C9C-90A7-F56634490371} - EndGlobalSection -EndGlobal diff --git a/Sandbox/premake5.lua b/Sandbox/premake5.lua new file mode 100644 index 0000000..6cf2c04 --- /dev/null +++ b/Sandbox/premake5.lua @@ -0,0 +1,53 @@ +project "Sandbox" + + -- Output Directories -- + location "../Sandbox/" + + targetdir ("../bin/" .. outputdir) + objdir ("../bin-int/" .. outputdir) + + -- Compiler -- + kind "ConsoleApp" + language "C++" + cppdialect "C++17" + staticruntime "on" + + -- Project Files --- + files + { + "%{prj.location}/src/**.h", + "%{prj.location}/src/**.cpp", + "%{prj.location}/**.lua", + } + + -- Dependencies -- + includedirs + { + "%{wks.location}/Engine/src", + } + + links + { + "Engine", + } + + --- Filters --- + -- windows + filter "system:windows" + defines "LT_PLATFORM_WINDOWS" + systemversion "latest" + + -- debug + filter "configurations:Debug" + defines "LT_DEBUG" + symbols "on" + + -- release + filter "configurations:Release" + defines "LT_RELEASE" + optimize "on" + + -- distribution + filter "configurations:Distribution" + defines "LT_DIST" + optimize "on" \ No newline at end of file diff --git a/Sandbox/SandboxApp.cpp b/Sandbox/src/SandboxApp.cpp similarity index 84% rename from Sandbox/SandboxApp.cpp rename to Sandbox/src/SandboxApp.cpp index 877ff8d..981bff9 100644 --- a/Sandbox/SandboxApp.cpp +++ b/Sandbox/src/SandboxApp.cpp @@ -2,11 +2,6 @@ class Sandbox : public Light::Application { -public: - Sandbox() - { - } - }; Light::Application* Light::CreateApplication()