diff --git a/.gitmodules b/.gitmodules index 103f20d..afec923 100644 --- a/.gitmodules +++ b/.gitmodules @@ -1,3 +1,6 @@ [submodule "Dependencies/spdlog"] path = Dependencies/spdlog url = https://github.com/gabime/spdlog +[submodule "Dependencies/GLFW"] + path = Dependencies/GLFW + url = https://github.com/Light3039/glfw diff --git a/BuildScripts/premake5.lua b/BuildScripts/premake5.lua index ed70be2..7de98ab 100644 --- a/BuildScripts/premake5.lua +++ b/BuildScripts/premake5.lua @@ -17,4 +17,7 @@ outputdir = "%{cfg.buildcfg}/%{cfg.system}/%{cfg.architecture}/%{prj.name}" -- Projects -- include "../Sandbox/" -include "../Engine/" \ No newline at end of file +include "../Engine/" + +group "Dependencies" +include "../Dependencies/GLFW/" \ No newline at end of file diff --git a/Dependencies/GLFW b/Dependencies/GLFW new file mode 160000 index 0000000..7222944 --- /dev/null +++ b/Dependencies/GLFW @@ -0,0 +1 @@ +Subproject commit 72229440a46f607a325fa430ef0c9c14c7ec1218 diff --git a/Engine/premake5.lua b/Engine/premake5.lua index ec925d7..50baf6b 100644 --- a/Engine/premake5.lua +++ b/Engine/premake5.lua @@ -1,10 +1,10 @@ project "Engine" -- Output Directories -- - location "../Engine/" + location "%{wks.location}/Engine/" - targetdir ("../bin/" .. outputdir) - objdir ("../bin-int/" .. outputdir) + targetdir ("%{wks.location}/bin/" .. outputdir) + objdir ("%{wks.location}/bin-int/" .. outputdir) -- Compiler -- kind "StaticLib" @@ -27,6 +27,11 @@ project "Engine" (dependenciesdir .. "spdlog/include/"), } + + links + { + "GLFW", + } --- Filters --- -- windows diff --git a/Sandbox/premake5.lua b/Sandbox/premake5.lua index f45bd53..33585bd 100644 --- a/Sandbox/premake5.lua +++ b/Sandbox/premake5.lua @@ -1,10 +1,10 @@ project "Sandbox" -- Output Directories -- - location "../Sandbox/" + location "%{wks.location}/Sandbox/" - targetdir ("../bin/" .. outputdir) - objdir ("../bin-int/" .. outputdir) + targetdir ("%{wks.location}/bin/" .. outputdir) + objdir ("%{wks.location}/bin-int/" .. outputdir) -- Compiler -- kind "ConsoleApp"