From 52169679c53680e14852aed53ec44874662fbb84 Mon Sep 17 00:00:00 2001 From: Lars Brubaker Date: Thu, 3 Dec 2020 15:01:43 -0800 Subject: [PATCH] Fixing normal MC build --- MatterControl.sln | 20 ++++++++++---------- Submodules/agg-sharp | 2 +- 2 files changed, 11 insertions(+), 11 deletions(-) diff --git a/MatterControl.sln b/MatterControl.sln index 1cdccba1a..1af4876e6 100644 --- a/MatterControl.sln +++ b/MatterControl.sln @@ -114,7 +114,7 @@ Project("{D954291E-2A0B-460D-934E-DC6B0785DB48}") = "Typography.OpenFont", "Subm EndProject Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "GlfwProvider", "Submodules\agg-sharp\Glfw\GlfwProvider.csproj", "{5AC2F31C-BD33-4BD1-8A90-D6A23941A74F}" EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "GLFW.NETCore", "Submodules\agg-sharp\glfw-net\GLFW.NET\GLFW.NETCore.csproj", "{412DC2D7-5487-4093-A966-7A1FC19B010D}" +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "GLFW.NETStandard", "Submodules\agg-sharp\glfw-net\GLFW.NET\GLFW.NETStandard.csproj", "{7ECC040E-19FC-4E10-B314-412CF7AB2170}" EndProject Global GlobalSection(SharedMSBuildProjectFiles) = preSolution @@ -490,14 +490,14 @@ Global {5AC2F31C-BD33-4BD1-8A90-D6A23941A74F}.Release|Any CPU.Build.0 = Release|Any CPU {5AC2F31C-BD33-4BD1-8A90-D6A23941A74F}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU {5AC2F31C-BD33-4BD1-8A90-D6A23941A74F}.Release|Mixed Platforms.Build.0 = Release|Any CPU - {412DC2D7-5487-4093-A966-7A1FC19B010D}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {412DC2D7-5487-4093-A966-7A1FC19B010D}.Debug|Any CPU.Build.0 = Debug|Any CPU - {412DC2D7-5487-4093-A966-7A1FC19B010D}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU - {412DC2D7-5487-4093-A966-7A1FC19B010D}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU - {412DC2D7-5487-4093-A966-7A1FC19B010D}.Release|Any CPU.ActiveCfg = Release|Any CPU - {412DC2D7-5487-4093-A966-7A1FC19B010D}.Release|Any CPU.Build.0 = Release|Any CPU - {412DC2D7-5487-4093-A966-7A1FC19B010D}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU - {412DC2D7-5487-4093-A966-7A1FC19B010D}.Release|Mixed Platforms.Build.0 = Release|Any CPU + {7ECC040E-19FC-4E10-B314-412CF7AB2170}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {7ECC040E-19FC-4E10-B314-412CF7AB2170}.Debug|Any CPU.Build.0 = Debug|Any CPU + {7ECC040E-19FC-4E10-B314-412CF7AB2170}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU + {7ECC040E-19FC-4E10-B314-412CF7AB2170}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU + {7ECC040E-19FC-4E10-B314-412CF7AB2170}.Release|Any CPU.ActiveCfg = Release|Any CPU + {7ECC040E-19FC-4E10-B314-412CF7AB2170}.Release|Any CPU.Build.0 = Release|Any CPU + {7ECC040E-19FC-4E10-B314-412CF7AB2170}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU + {7ECC040E-19FC-4E10-B314-412CF7AB2170}.Release|Mixed Platforms.Build.0 = Release|Any CPU EndGlobalSection GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE @@ -549,7 +549,7 @@ Global {B112455B-E42E-4718-821F-862884B9C07C} = {FDD3A966-672B-42D8-86D5-D749B09A9060} {235A071B-8D06-40AE-A5C5-B1CE59715EE9} = {FDD3A966-672B-42D8-86D5-D749B09A9060} {5AC2F31C-BD33-4BD1-8A90-D6A23941A74F} = {2AB9B589-5C98-4C05-BBEA-F97DAE168EAB} - {412DC2D7-5487-4093-A966-7A1FC19B010D} = {2AB9B589-5C98-4C05-BBEA-F97DAE168EAB} + {7ECC040E-19FC-4E10-B314-412CF7AB2170} = {2AB9B589-5C98-4C05-BBEA-F97DAE168EAB} EndGlobalSection GlobalSection(ExtensibilityGlobals) = postSolution SolutionGuid = {42D74E06-00EA-43D2-A05B-9BEAD4A2C8A0} diff --git a/Submodules/agg-sharp b/Submodules/agg-sharp index 0a09a1e98..4c6ca8001 160000 --- a/Submodules/agg-sharp +++ b/Submodules/agg-sharp @@ -1 +1 @@ -Subproject commit 0a09a1e980710c0bf234dc9e6e95a14431504788 +Subproject commit 4c6ca8001a805181efcfd1a993e682ba051d5c34