From bd8e5b7ca0cef609fa0a1cb9ed70fc26203b0cf6 Mon Sep 17 00:00:00 2001 From: William Miles Date: Fri, 9 Sep 2022 21:07:23 +1000 Subject: [PATCH] Added glfw and imgui as submodules. --- .gitmodules | 6 ++++++ Navmesher.sln | 20 ++++++++++++++++++++ glfw | 1 + imgui | 1 + 4 files changed, 28 insertions(+) create mode 160000 glfw create mode 160000 imgui diff --git a/.gitmodules b/.gitmodules index 50aaad5..704824d 100644 --- a/.gitmodules +++ b/.gitmodules @@ -1,3 +1,9 @@ [submodule "zlib-win-build"] path = zlib-win-build url = https://github.com/kiyolee/zlib-win-build.git +[submodule "imgui"] + path = imgui + url = https://github.com/ocornut/imgui.git +[submodule "glfw"] + path = glfw + url = https://github.com/glfw/glfw.git diff --git a/Navmesher.sln b/Navmesher.sln index dea6d61..de745f2 100644 --- a/Navmesher.sln +++ b/Navmesher.sln @@ -16,6 +16,8 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "SizedBuffer", "SizedBuffer\SizedBuffer.vcxproj", "{CB1C8F66-5B90-4DE7-890B-F6430DAAF25F}" EndProject +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "example_glfw_opengl3", "imgui\examples\example_glfw_opengl3\example_glfw_opengl3.vcxproj", "{4A1FB5EA-22F5-42A8-AB92-1D2DF5D47FB9}" +EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution Debug|Itanium = Debug|Itanium @@ -101,6 +103,24 @@ Global {CB1C8F66-5B90-4DE7-890B-F6430DAAF25F}.ReleaseWithoutAsm|x64.Build.0 = Release|x64 {CB1C8F66-5B90-4DE7-890B-F6430DAAF25F}.ReleaseWithoutAsm|x86.ActiveCfg = Release|Win32 {CB1C8F66-5B90-4DE7-890B-F6430DAAF25F}.ReleaseWithoutAsm|x86.Build.0 = Release|Win32 + {4A1FB5EA-22F5-42A8-AB92-1D2DF5D47FB9}.Debug|Itanium.ActiveCfg = Debug|x64 + {4A1FB5EA-22F5-42A8-AB92-1D2DF5D47FB9}.Debug|Itanium.Build.0 = Debug|x64 + {4A1FB5EA-22F5-42A8-AB92-1D2DF5D47FB9}.Debug|x64.ActiveCfg = Debug|x64 + {4A1FB5EA-22F5-42A8-AB92-1D2DF5D47FB9}.Debug|x64.Build.0 = Debug|x64 + {4A1FB5EA-22F5-42A8-AB92-1D2DF5D47FB9}.Debug|x86.ActiveCfg = Debug|Win32 + {4A1FB5EA-22F5-42A8-AB92-1D2DF5D47FB9}.Debug|x86.Build.0 = Debug|Win32 + {4A1FB5EA-22F5-42A8-AB92-1D2DF5D47FB9}.Release|Itanium.ActiveCfg = Release|x64 + {4A1FB5EA-22F5-42A8-AB92-1D2DF5D47FB9}.Release|Itanium.Build.0 = Release|x64 + {4A1FB5EA-22F5-42A8-AB92-1D2DF5D47FB9}.Release|x64.ActiveCfg = Release|x64 + {4A1FB5EA-22F5-42A8-AB92-1D2DF5D47FB9}.Release|x64.Build.0 = Release|x64 + {4A1FB5EA-22F5-42A8-AB92-1D2DF5D47FB9}.Release|x86.ActiveCfg = Release|Win32 + {4A1FB5EA-22F5-42A8-AB92-1D2DF5D47FB9}.Release|x86.Build.0 = Release|Win32 + {4A1FB5EA-22F5-42A8-AB92-1D2DF5D47FB9}.ReleaseWithoutAsm|Itanium.ActiveCfg = Release|x64 + {4A1FB5EA-22F5-42A8-AB92-1D2DF5D47FB9}.ReleaseWithoutAsm|Itanium.Build.0 = Release|x64 + {4A1FB5EA-22F5-42A8-AB92-1D2DF5D47FB9}.ReleaseWithoutAsm|x64.ActiveCfg = Release|x64 + {4A1FB5EA-22F5-42A8-AB92-1D2DF5D47FB9}.ReleaseWithoutAsm|x64.Build.0 = Release|x64 + {4A1FB5EA-22F5-42A8-AB92-1D2DF5D47FB9}.ReleaseWithoutAsm|x86.ActiveCfg = Release|Win32 + {4A1FB5EA-22F5-42A8-AB92-1D2DF5D47FB9}.ReleaseWithoutAsm|x86.Build.0 = Release|Win32 EndGlobalSection GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE diff --git a/glfw b/glfw new file mode 160000 index 0000000..6b57e08 --- /dev/null +++ b/glfw @@ -0,0 +1 @@ +Subproject commit 6b57e08bb0078c9834889eab871bac2368198c15 diff --git a/imgui b/imgui new file mode 160000 index 0000000..aceab9a --- /dev/null +++ b/imgui @@ -0,0 +1 @@ +Subproject commit aceab9a877de0258d19d29a5d87a51b63a8999bf