From ac713d9f58a34e5442b421e2a7a35bdd2b1acd93 Mon Sep 17 00:00:00 2001 From: UnknownShadow200 Date: Thu, 12 Jul 2018 23:47:49 +1000 Subject: [PATCH] Game no longer requires separate OpenTK.dll --- ClassicalSharp.sln | 10 - ClassicalSharp/ClassicalSharp.csproj | 103 ++++++- ClassicalSharp/Program.cs | 5 - Launcher2/Launcher2.csproj | 443 ++++++++++++++++----------- Launcher2/Program.cs | 5 - 5 files changed, 367 insertions(+), 199 deletions(-) diff --git a/ClassicalSharp.sln b/ClassicalSharp.sln index 71e986b3a..27890acf3 100644 --- a/ClassicalSharp.sln +++ b/ClassicalSharp.sln @@ -4,8 +4,6 @@ Microsoft Visual Studio Solution File, Format Version 9.00 # SharpDevelop 4.4 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ClassicalSharp", "ClassicalSharp\ClassicalSharp.csproj", "{BEB1C785-5CAD-48FF-A886-876BF0A318D4}" EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "OpenTK", "OpenTK\OpenTK.csproj", "{35FEE071-2DE6-48A1-9343-B5C1F202A12B}" -EndProject Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "InteropPatcher", "InteropPatcher\InteropPatcher.csproj", "{4A4110EE-21CA-4715-AF67-0C8B7CE0642F}" EndProject Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Launcher2", "Launcher2\Launcher2.csproj", "{3E84ACC1-27B4-401B-A359-6AAE4DF6C9B5}" @@ -26,14 +24,6 @@ Global {BEB1C785-5CAD-48FF-A886-876BF0A318D4}.Debug_DX|Any CPU.ActiveCfg = Debug_D3D|Any CPU {BEB1C785-5CAD-48FF-A886-876BF0A318D4}.Release_DX|Any CPU.Build.0 = Release_D3D|Any CPU {BEB1C785-5CAD-48FF-A886-876BF0A318D4}.Release_DX|Any CPU.ActiveCfg = Release_D3D|Any CPU - {35FEE071-2DE6-48A1-9343-B5C1F202A12B}.Debug|Any CPU.Build.0 = Debug|Any CPU - {35FEE071-2DE6-48A1-9343-B5C1F202A12B}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {35FEE071-2DE6-48A1-9343-B5C1F202A12B}.Release|Any CPU.Build.0 = Release|Any CPU - {35FEE071-2DE6-48A1-9343-B5C1F202A12B}.Release|Any CPU.ActiveCfg = Release|Any CPU - {35FEE071-2DE6-48A1-9343-B5C1F202A12B}.Debug_DX|Any CPU.Build.0 = Debug|Any CPU - {35FEE071-2DE6-48A1-9343-B5C1F202A12B}.Debug_DX|Any CPU.ActiveCfg = Debug|Any CPU - {35FEE071-2DE6-48A1-9343-B5C1F202A12B}.Release_DX|Any CPU.Build.0 = Release|Any CPU - {35FEE071-2DE6-48A1-9343-B5C1F202A12B}.Release_DX|Any CPU.ActiveCfg = Release|Any CPU {4A4110EE-21CA-4715-AF67-0C8B7CE0642F}.Debug|Any CPU.Build.0 = Debug|Any CPU {4A4110EE-21CA-4715-AF67-0C8B7CE0642F}.Debug|Any CPU.ActiveCfg = Debug|Any CPU {4A4110EE-21CA-4715-AF67-0C8B7CE0642F}.Release|Any CPU.Build.0 = Release|Any CPU diff --git a/ClassicalSharp/ClassicalSharp.csproj b/ClassicalSharp/ClassicalSharp.csproj index 4247c253d..162a51a1d 100644 --- a/ClassicalSharp/ClassicalSharp.csproj +++ b/ClassicalSharp/ClassicalSharp.csproj @@ -298,6 +298,105 @@ + + OpenTK\DisplayDevice.cs + + + OpenTK\INativeWindow.cs + + + OpenTK\Keyboard.cs + + + OpenTK\Utils.cs + + + OpenTK\Graphics\ColorFormat.cs + + + OpenTK\Graphics\GraphicsMode.cs + + + OpenTK\Graphics\IGraphicsContext.cs + + + OpenTK\Mouse.cs + + + OpenTK\Platform\Configuration.cs + + + OpenTK\Platform\IPlatformFactory.cs + + + OpenTK\Platform\MacOS\AglContext.cs + + + OpenTK\Platform\MacOS\Application.cs + + + OpenTK\Platform\MacOS\CarbonBindings\Agl.cs + + + OpenTK\Platform\MacOS\CarbonBindings\CarbonAPI.cs + + + OpenTK\Platform\MacOS\CarbonBindings\API.cs + + + OpenTK\Platform\MacOS\CarbonBindings\MacOSKeys.cs + + + OpenTK\Platform\MacOS\CarbonWindow.cs + + + OpenTK\Platform\MacOS\MacOSException.cs + + + OpenTK\Platform\MacOS\MacOSKeyMap.cs + + + OpenTK\Platform\MacOS\QuartzDisplayDevice.cs + + + OpenTK\Platform\Windows\API.cs + + + OpenTK\Platform\Windows\Wgl.cs + + + OpenTK\Platform\Windows\WinDisplayDevice.cs + + + OpenTK\Platform\Windows\WinGLContext.cs + + + OpenTK\Platform\Windows\WinWindow.cs + + + OpenTK\Platform\Windows\WinKeyMap.cs + + + OpenTK\Platform\X11\API.cs + + + OpenTK\Platform\X11\Glx.cs + + + OpenTK\Platform\X11\Structs.cs + + + OpenTK\Platform\X11\X11DisplayDevice.cs + + + OpenTK\Platform\X11\X11GLContext.cs + + + OpenTK\Platform\X11\X11Window.cs + + + OpenTK\Platform\X11\X11KeyMap.cs + @@ -350,10 +449,6 @@ - - {35FEE071-2DE6-48A1-9343-B5C1F202A12B} - OpenTK - {4A4110EE-21CA-4715-AF67-0C8B7CE0642F} InteropPatcher diff --git a/ClassicalSharp/Program.cs b/ClassicalSharp/Program.cs index 76df986b8..3a9f3be71 100644 --- a/ClassicalSharp/Program.cs +++ b/ClassicalSharp/Program.cs @@ -22,11 +22,6 @@ namespace ClassicalSharp { return; } - if (!Platform.FileExists("OpenTK.dll")) { - ErrorHandler.ShowDialog("Missing file", "OpenTK.dll needs to be in the same folder as the game"); - return; - } - // NOTE: we purposely put this in another method, as we need to ensure // that we do not reference any OpenTK code directly in the main function // (such as DisplayDevice), which otherwise causes native crash. diff --git a/Launcher2/Launcher2.csproj b/Launcher2/Launcher2.csproj index 44f6a5e0a..48be3ad4b 100644 --- a/Launcher2/Launcher2.csproj +++ b/Launcher2/Launcher2.csproj @@ -1,176 +1,269 @@ - - - - {3E84ACC1-27B4-401B-A359-6AAE4DF6C9B5} - Debug - AnyCPU - WinExe - Launcher - Launcher2 - v2.0 - - - Properties - False - True - False - False - obj\$(Configuration)\ - 4 - icon.ico - OnBuildSuccess - - - AnyCPU - 4194304 - False - Auto - 4096 - - - ..\output\debug\ - True - Full - False - False - DEBUG;TRACE;LAUNCHER - obj\ - Project - - - ..\output\release\ - False - None - True - False - TRACE;LAUNCHER - obj\ - Project - - - - ..\ClassicalSharp\SharpWave.dll - - - - - - - - - Shared\GdiPlusDrawer2D.cs - - - Shared\IDrawer2D.cs - - - Shared\IDrawer2D.TextMC.cs - - - Shared\FastBitmap.cs - - - Shared\FastColour.cs - - - Shared\AsyncDownloader.cs - - - Shared\Platform.cs - - - Shared\Program.cs - - - Shared\ZipReader.cs - - - Shared\ErrorHandler.cs - - - Shared\Options.cs - - - Shared\Utils.cs - - - Shared\Utils.Math.cs - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - {35FEE071-2DE6-48A1-9343-B5C1F202A12B} - OpenTK - - - - - - - - - - - - - - - - + + + + {3E84ACC1-27B4-401B-A359-6AAE4DF6C9B5} + Debug + AnyCPU + WinExe + Launcher + Launcher2 + v2.0 + + + Properties + False + True + False + False + obj\$(Configuration)\ + 4 + icon.ico + OnBuildSuccess + + + AnyCPU + 4194304 + False + Auto + 4096 + + + ..\output\debug\ + True + Full + False + False + DEBUG;TRACE;LAUNCHER + obj\ + Project + + + ..\output\release\ + False + None + True + False + TRACE;LAUNCHER + obj\ + Project + + + + ..\ClassicalSharp\SharpWave.dll + + + + + + + + + Shared\GdiPlusDrawer2D.cs + + + Shared\IDrawer2D.cs + + + Shared\IDrawer2D.TextMC.cs + + + Shared\FastBitmap.cs + + + Shared\FastColour.cs + + + Shared\AsyncDownloader.cs + + + Shared\Platform.cs + + + Shared\Program.cs + + + Shared\ZipReader.cs + + + Shared\ErrorHandler.cs + + + Shared\Options.cs + + + Shared\Utils.cs + + + Shared\Utils.Math.cs + + + OpenTK\DisplayDevice.cs + + + OpenTK\INativeWindow.cs + + + OpenTK\Keyboard.cs + + + OpenTK\Utils.cs + + + OpenTK\Graphics\ColorFormat.cs + + + OpenTK\Graphics\GraphicsMode.cs + + + OpenTK\Graphics\IGraphicsContext.cs + + + OpenTK\Mouse.cs + + + OpenTK\Platform\Configuration.cs + + + OpenTK\Platform\IPlatformFactory.cs + + + OpenTK\Platform\MacOS\AglContext.cs + + + OpenTK\Platform\MacOS\Application.cs + + + OpenTK\Platform\MacOS\CarbonBindings\Agl.cs + + + OpenTK\Platform\MacOS\CarbonBindings\CarbonAPI.cs + + + OpenTK\Platform\MacOS\CarbonBindings\API.cs + + + OpenTK\Platform\MacOS\CarbonBindings\MacOSKeys.cs + + + OpenTK\Platform\MacOS\CarbonWindow.cs + + + OpenTK\Platform\MacOS\MacOSException.cs + + + OpenTK\Platform\MacOS\MacOSKeyMap.cs + + + OpenTK\Platform\MacOS\QuartzDisplayDevice.cs + + + OpenTK\Platform\Windows\API.cs + + + OpenTK\Platform\Windows\Wgl.cs + + + OpenTK\Platform\Windows\WinDisplayDevice.cs + + + OpenTK\Platform\Windows\WinGLContext.cs + + + OpenTK\Platform\Windows\WinWindow.cs + + + OpenTK\Platform\Windows\WinKeyMap.cs + + + OpenTK\Platform\X11\API.cs + + + OpenTK\Platform\X11\Glx.cs + + + OpenTK\Platform\X11\Structs.cs + + + OpenTK\Platform\X11\X11DisplayDevice.cs + + + OpenTK\Platform\X11\X11GLContext.cs + + + OpenTK\Platform\X11\X11Window.cs + + + OpenTK\Platform\X11\X11KeyMap.cs + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/Launcher2/Program.cs b/Launcher2/Program.cs index 36c127243..ec2bd2f12 100644 --- a/Launcher2/Program.cs +++ b/Launcher2/Program.cs @@ -18,11 +18,6 @@ namespace Launcher { ErrorHandler.ShowDialog("Missing file", "ClassicalSharp.exe needs to be in the same folder as the launcher."); return; } - - if (!Platform.FileExists("OpenTK.dll")) { - ErrorHandler.ShowDialog("Missing file", "OpenTK.dll needs to be in the same folder as the launcher."); - return; - } // NOTE: we purposely put this in another method, as we need to ensure // that we do not reference any OpenTK code directly in the main function