Fixing broken content folder links and builds.

PixelVision8 · Nov 19, 2019 · 3cf9dcd · 3cf9dcd
1 parent 99e9cba
commit 3cf9dcd
Show file tree

Hide file tree

Showing 8 changed files with 18 additions and 40 deletions.
diff --git a/PixelVision8Runner.sln b/PixelVision8Runner.sln
@@ -19,27 +19,17 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "MonoVision.OpenGL", "MonoVi
 EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "PixelVision8Runner.Desktop", "Runners\PixelVision8\PixelVision8Runner.Desktop.csproj", "{CC887541-6129-484B-8122-009F54E21AD1}"
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "PixelVision8Tune.Desktop", "..\Builds\PixelVision8Tune.Desktop.csproj", "{74E538F0-33B4-46AB-B04E-D6B19DA057FA}"
-EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "PixelVision8Draw.Desktop", "..\Builds\PixelVision8Draw.Desktop.csproj", "{F5CD2C0D-1C46-46F3-A72D-AEAF83BC08F6}"
-EndProject
 Global
 	GlobalSection(SharedMSBuildProjectFiles) = preSolution
 		SDK\PixelVision8.SDK.projitems*{0e005b2d-eac6-46a4-a054-97627ec9c805}*SharedItemsImports = 13
 		SDK\PixelVision8.Workspace.projitems*{19864555-b496-4a0f-ac32-eb668034a6e2}*SharedItemsImports = 13
-		SDK\PixelVision8.Lua.projitems*{74e538f0-33b4-46ab-b04e-d6b19da057fa}*SharedItemsImports = 4
-		SDK\PixelVision8.SDK.projitems*{74e538f0-33b4-46ab-b04e-d6b19da057fa}*SharedItemsImports = 4
-		SDK\PixelVision8.Workspace.projitems*{74e538f0-33b4-46ab-b04e-d6b19da057fa}*SharedItemsImports = 4
 		SDK\PixelVision8.Lua.projitems*{9030d2e9-3b2c-47d9-8af0-82874cb00c24}*SharedItemsImports = 4
 		SDK\PixelVision8.SDK.projitems*{9030d2e9-3b2c-47d9-8af0-82874cb00c24}*SharedItemsImports = 4
 		SDK\PixelVision8.Workspace.projitems*{9030d2e9-3b2c-47d9-8af0-82874cb00c24}*SharedItemsImports = 4
 		SDK\PixelVision8.Lua.projitems*{cc887541-6129-484b-8122-009f54e21ad1}*SharedItemsImports = 4
 		SDK\PixelVision8.SDK.projitems*{cc887541-6129-484b-8122-009f54e21ad1}*SharedItemsImports = 4
 		SDK\PixelVision8.Workspace.projitems*{cc887541-6129-484b-8122-009f54e21ad1}*SharedItemsImports = 4
 		SDK\PixelVision8.Lua.projitems*{e44760eb-e7c5-40c1-bbfc-0092fbf1c12b}*SharedItemsImports = 13
-		SDK\PixelVision8.Lua.projitems*{f5cd2c0d-1c46-46f3-a72d-aeaf83bc08f6}*SharedItemsImports = 4
-		SDK\PixelVision8.SDK.projitems*{f5cd2c0d-1c46-46f3-a72d-aeaf83bc08f6}*SharedItemsImports = 4
-		SDK\PixelVision8.Workspace.projitems*{f5cd2c0d-1c46-46f3-a72d-aeaf83bc08f6}*SharedItemsImports = 4
 	EndGlobalSection
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		Debug|Any CPU = Debug|Any CPU
@@ -86,30 +76,6 @@ Global
 		{CC887541-6129-484B-8122-009F54E21AD1}.Release|x64.Build.0 = Release|x64
 		{CC887541-6129-484B-8122-009F54E21AD1}.Release|x86.ActiveCfg = Release|x86
 		{CC887541-6129-484B-8122-009F54E21AD1}.Release|x86.Build.0 = Release|x86
-		{74E538F0-33B4-46AB-B04E-D6B19DA057FA}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{74E538F0-33B4-46AB-B04E-D6B19DA057FA}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{74E538F0-33B4-46AB-B04E-D6B19DA057FA}.Debug|x64.ActiveCfg = Debug|x64
-		{74E538F0-33B4-46AB-B04E-D6B19DA057FA}.Debug|x64.Build.0 = Debug|x64
-		{74E538F0-33B4-46AB-B04E-D6B19DA057FA}.Debug|x86.ActiveCfg = Debug|x86
-		{74E538F0-33B4-46AB-B04E-D6B19DA057FA}.Debug|x86.Build.0 = Debug|x86
-		{74E538F0-33B4-46AB-B04E-D6B19DA057FA}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{74E538F0-33B4-46AB-B04E-D6B19DA057FA}.Release|Any CPU.Build.0 = Release|Any CPU
-		{74E538F0-33B4-46AB-B04E-D6B19DA057FA}.Release|x64.ActiveCfg = Release|x64
-		{74E538F0-33B4-46AB-B04E-D6B19DA057FA}.Release|x64.Build.0 = Release|x64
-		{74E538F0-33B4-46AB-B04E-D6B19DA057FA}.Release|x86.ActiveCfg = Release|x86
-		{74E538F0-33B4-46AB-B04E-D6B19DA057FA}.Release|x86.Build.0 = Release|x86
-		{F5CD2C0D-1C46-46F3-A72D-AEAF83BC08F6}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{F5CD2C0D-1C46-46F3-A72D-AEAF83BC08F6}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{F5CD2C0D-1C46-46F3-A72D-AEAF83BC08F6}.Debug|x64.ActiveCfg = Debug|x64
-		{F5CD2C0D-1C46-46F3-A72D-AEAF83BC08F6}.Debug|x64.Build.0 = Debug|x64
-		{F5CD2C0D-1C46-46F3-A72D-AEAF83BC08F6}.Debug|x86.ActiveCfg = Debug|x86
-		{F5CD2C0D-1C46-46F3-A72D-AEAF83BC08F6}.Debug|x86.Build.0 = Debug|x86
-		{F5CD2C0D-1C46-46F3-A72D-AEAF83BC08F6}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{F5CD2C0D-1C46-46F3-A72D-AEAF83BC08F6}.Release|Any CPU.Build.0 = Release|Any CPU
-		{F5CD2C0D-1C46-46F3-A72D-AEAF83BC08F6}.Release|x64.ActiveCfg = Release|x64
-		{F5CD2C0D-1C46-46F3-A72D-AEAF83BC08F6}.Release|x64.Build.0 = Release|x64
-		{F5CD2C0D-1C46-46F3-A72D-AEAF83BC08F6}.Release|x86.ActiveCfg = Release|x86
-		{F5CD2C0D-1C46-46F3-A72D-AEAF83BC08F6}.Release|x86.Build.0 = Release|x86
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE
@@ -121,8 +87,6 @@ Global
 		{19864555-B496-4A0F-AC32-EB668034A6E2} = {B0E8551B-B9FD-4020-BD22-36DC2224F79F}
 		{6D75E618-19CA-4C51-9546-F10965FBC0B8} = {B0E8551B-B9FD-4020-BD22-36DC2224F79F}
 		{CC887541-6129-484B-8122-009F54E21AD1} = {8759BE68-DE03-4611-A6C1-D6E5C51E6708}
-		{74E538F0-33B4-46AB-B04E-D6B19DA057FA} = {8759BE68-DE03-4611-A6C1-D6E5C51E6708}
-		{F5CD2C0D-1C46-46F3-A72D-AEAF83BC08F6} = {8759BE68-DE03-4611-A6C1-D6E5C51E6708}
 	EndGlobalSection
 	GlobalSection(ExtensibilityGlobals) = postSolution
 		SolutionGuid = {F34BD1FF-9FB3-4809-B45D-C0B2DAB96D51}

diff --git a/Runners/CSharpRunner/CSharpRunner.Desktop.csproj b/Runners/CSharpRunner/CSharpRunner.Desktop.csproj
@@ -73,7 +73,7 @@
     </EmbeddedResource>
   </ItemGroup>
   <ItemGroup>
-    <Content Include="..\..\Disks\PV8GameTemplate\*.*">
+    <Content Include="..\..\Disks\PixelVision8System\*.*">
       <Link>Content\%(FileName)%(Extension)</Link>
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
     </Content>

diff --git a/Runners/GameRunner/GameRunner.Desktop.csproj b/Runners/GameRunner/GameRunner.Desktop.csproj
@@ -75,7 +75,7 @@
     <Content Include="Icon.icns" />
   </ItemGroup>
   <ItemGroup>
-    <Content Include="..\..\Disks\PV8GameTemplate\*.*">
+    <Content Include="..\..\Disks\PixelVision8System\*.*">
       <Link>Content\DefaultGame\%(FileName)%(Extension)</Link>
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
     </Content>

diff --git a/Runners/LuaRunner/LuaRunner.Desktop.csproj b/Runners/LuaRunner/LuaRunner.Desktop.csproj
@@ -74,7 +74,7 @@
     </EmbeddedResource>
   </ItemGroup>
   <ItemGroup>
-    <Content Include="..\..\Disks\PV8GameTemplate\*.*">
+    <Content Include="..\..\Disks\PixelVision8System\*.*">
       <Link>Content\%(FileName)%(Extension)</Link>
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
     </Content>

diff --git a/Runners/PixelVision8/PixelVision8Runner.Desktop.csproj b/Runners/PixelVision8/PixelVision8Runner.Desktop.csproj
@@ -107,7 +107,6 @@
     <Compile Include="Runner\Services\LuaServicePlus.cs" />
     <Compile Include="Runner\Services\ScreenshotService.cs" />
     <Compile Include="Runner\Services\WorkspaceServicePlus.cs" />
-    <Compile Include="Runner\Utils\OrdinalStringComparer.cs" />
   </ItemGroup>
   <ItemGroup>
     <Reference Include="ICSharpCode.SharpZipLib, Version=1.2.0.246, Culture=neutral, PublicKeyToken=1b03e6acf1164f73, processorArchitecture=MSIL">

diff --git a/Runners/PixelVision8/Runner/PixelVision8Runner.cs b/Runners/PixelVision8/Runner/PixelVision8Runner.cs
@@ -97,6 +97,11 @@ public PixelVision8Runner(string rootPath) : base(rootPath)
         {
         }
 
+        public PixelVision8Runner()
+        {
+//            throw new NotImplementedException();
+        }
+
 //        public List<string> loadHistory = new List<string>();
 //        protected List<Dictionary<string, string>> metaDataHistory = new List<Dictionary<string, string>>();
         protected string Documents => Environment.GetFolderPath(Environment.SpecialFolder.MyDocuments);

diff --git a/SDK/Runner/DesktopRunner.cs b/SDK/Runner/DesktopRunner.cs
@@ -63,6 +63,11 @@ public DesktopRunner(string rootPath)
             this.rootPath = rootPath;
         }
 
+        public DesktopRunner()
+        {
+            throw new NotImplementedException();
+        }
+
         protected WorkspacePath userBiosPath => WorkspacePath.Parse("/Storage/user-bios.json");
 
         /// <summary>

diff --git a/SDK/Runner/LuaRunner.cs b/SDK/Runner/LuaRunner.cs
@@ -43,6 +43,11 @@ public LuaRunner(string gamePath)
             this.gamePath = gamePath;
         }
 
+        public LuaRunner()
+        {
+            //throw new System.NotImplementedException();
+        }
+
         /// <summary>
         ///     The base runner contains a list of the core chips. Here you'll want to add the game chip to the list so it can run.
         ///     This is called when a new game is created by the runner.