Game no longer requires separate OpenTK.dll

This commit is contained in:
UnknownShadow200 2018-07-12 23:47:49 +10:00
parent 06904219cd
commit ac713d9f58
5 changed files with 367 additions and 199 deletions

View File

@ -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

View File

@ -298,6 +298,105 @@
<Compile Include="Utils\Utils.cs" />
<Compile Include="Utils\Utils.Math.cs" />
<Compile Include="Utils\Vector3I.cs" />
<Compile Include="..\OpenTK\DisplayDevice.cs">
<Link>OpenTK\DisplayDevice.cs</Link>
</Compile>
<Compile Include="..\OpenTK\INativeWindow.cs">
<Link>OpenTK\INativeWindow.cs</Link>
</Compile>
<Compile Include="..\OpenTK\Keyboard.cs">
<Link>OpenTK\Keyboard.cs</Link>
</Compile>
<Compile Include="..\OpenTK\Utils.cs">
<Link>OpenTK\Utils.cs</Link>
</Compile>
<Compile Include="..\OpenTK\Graphics\ColorFormat.cs">
<Link>OpenTK\Graphics\ColorFormat.cs</Link>
</Compile>
<Compile Include="..\OpenTK\Graphics\GraphicsMode.cs">
<Link>OpenTK\Graphics\GraphicsMode.cs</Link>
</Compile>
<Compile Include="..\OpenTK\Graphics\IGraphicsContext.cs">
<Link>OpenTK\Graphics\IGraphicsContext.cs</Link>
</Compile>
<Compile Include="..\OpenTK\Mouse.cs">
<Link>OpenTK\Mouse.cs</Link>
</Compile>
<Compile Include="..\OpenTK\Platform\Configuration.cs">
<Link>OpenTK\Platform\Configuration.cs</Link>
</Compile>
<Compile Include="..\OpenTK\Platform\IPlatformFactory.cs">
<Link>OpenTK\Platform\IPlatformFactory.cs</Link>
</Compile>
<Compile Include="..\OpenTK\Platform\MacOS\AglContext.cs">
<Link>OpenTK\Platform\MacOS\AglContext.cs</Link>
</Compile>
<Compile Include="..\OpenTK\Platform\MacOS\Application.cs">
<Link>OpenTK\Platform\MacOS\Application.cs</Link>
</Compile>
<Compile Include="..\OpenTK\Platform\MacOS\CarbonBindings\Agl.cs">
<Link>OpenTK\Platform\MacOS\CarbonBindings\Agl.cs</Link>
</Compile>
<Compile Include="..\OpenTK\Platform\MacOS\CarbonBindings\CarbonAPI.cs">
<Link>OpenTK\Platform\MacOS\CarbonBindings\CarbonAPI.cs</Link>
</Compile>
<Compile Include="..\OpenTK\Platform\MacOS\CarbonBindings\API.cs">
<Link>OpenTK\Platform\MacOS\CarbonBindings\API.cs</Link>
</Compile>
<Compile Include="..\OpenTK\Platform\MacOS\CarbonBindings\MacOSKeys.cs">
<Link>OpenTK\Platform\MacOS\CarbonBindings\MacOSKeys.cs</Link>
</Compile>
<Compile Include="..\OpenTK\Platform\MacOS\CarbonWindow.cs">
<Link>OpenTK\Platform\MacOS\CarbonWindow.cs</Link>
</Compile>
<Compile Include="..\OpenTK\Platform\MacOS\MacOSException.cs">
<Link>OpenTK\Platform\MacOS\MacOSException.cs</Link>
</Compile>
<Compile Include="..\OpenTK\Platform\MacOS\MacOSKeyMap.cs">
<Link>OpenTK\Platform\MacOS\MacOSKeyMap.cs</Link>
</Compile>
<Compile Include="..\OpenTK\Platform\MacOS\QuartzDisplayDevice.cs">
<Link>OpenTK\Platform\MacOS\QuartzDisplayDevice.cs</Link>
</Compile>
<Compile Include="..\OpenTK\Platform\Windows\API.cs">
<Link>OpenTK\Platform\Windows\API.cs</Link>
</Compile>
<Compile Include="..\OpenTK\Platform\Windows\Wgl.cs">
<Link>OpenTK\Platform\Windows\Wgl.cs</Link>
</Compile>
<Compile Include="..\OpenTK\Platform\Windows\WinDisplayDevice.cs">
<Link>OpenTK\Platform\Windows\WinDisplayDevice.cs</Link>
</Compile>
<Compile Include="..\OpenTK\Platform\Windows\WinGLContext.cs">
<Link>OpenTK\Platform\Windows\WinGLContext.cs</Link>
</Compile>
<Compile Include="..\OpenTK\Platform\Windows\WinWindow.cs">
<Link>OpenTK\Platform\Windows\WinWindow.cs</Link>
</Compile>
<Compile Include="..\OpenTK\Platform\Windows\WinKeyMap.cs">
<Link>OpenTK\Platform\Windows\WinKeyMap.cs</Link>
</Compile>
<Compile Include="..\OpenTK\Platform\X11\API.cs">
<Link>OpenTK\Platform\X11\API.cs</Link>
</Compile>
<Compile Include="..\OpenTK\Platform\X11\Glx.cs">
<Link>OpenTK\Platform\X11\Glx.cs</Link>
</Compile>
<Compile Include="..\OpenTK\Platform\X11\Structs.cs">
<Link>OpenTK\Platform\X11\Structs.cs</Link>
</Compile>
<Compile Include="..\OpenTK\Platform\X11\X11DisplayDevice.cs">
<Link>OpenTK\Platform\X11\X11DisplayDevice.cs</Link>
</Compile>
<Compile Include="..\OpenTK\Platform\X11\X11GLContext.cs">
<Link>OpenTK\Platform\X11\X11GLContext.cs</Link>
</Compile>
<Compile Include="..\OpenTK\Platform\X11\X11Window.cs">
<Link>OpenTK\Platform\X11\X11Window.cs</Link>
</Compile>
<Compile Include="..\OpenTK\Platform\X11\X11KeyMap.cs">
<Link>OpenTK\Platform\X11\X11KeyMap.cs</Link>
</Compile>
</ItemGroup>
<ItemGroup>
<None Include="..\credits.txt">
@ -350,10 +449,6 @@
<Folder Include="Math" />
</ItemGroup>
<ItemGroup>
<ProjectReference Include="..\OpenTK\OpenTK.csproj">
<Project>{35FEE071-2DE6-48A1-9343-B5C1F202A12B}</Project>
<Name>OpenTK</Name>
</ProjectReference>
<ProjectReference Include="..\InteropPatcher\InteropPatcher.csproj">
<Project>{4A4110EE-21CA-4715-AF67-0C8B7CE0642F}</Project>
<Name>InteropPatcher</Name>

View File

@ -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.

View File

@ -1,176 +1,269 @@
<?xml version="1.0" encoding="utf-8"?>
<Project ToolsVersion="2.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003" DefaultTargets="Build">
<PropertyGroup>
<ProjectGuid>{3E84ACC1-27B4-401B-A359-6AAE4DF6C9B5}</ProjectGuid>
<Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
<Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
<OutputType>WinExe</OutputType>
<RootNamespace>Launcher</RootNamespace>
<AssemblyName>Launcher2</AssemblyName>
<TargetFrameworkVersion>v2.0</TargetFrameworkVersion>
<TargetFrameworkProfile>
</TargetFrameworkProfile>
<AppDesignerFolder>Properties</AppDesignerFolder>
<NoWin32Manifest>False</NoWin32Manifest>
<AllowUnsafeBlocks>True</AllowUnsafeBlocks>
<NoStdLib>False</NoStdLib>
<TreatWarningsAsErrors>False</TreatWarningsAsErrors>
<IntermediateOutputPath>obj\$(Configuration)\</IntermediateOutputPath>
<WarningLevel>4</WarningLevel>
<ApplicationIcon>icon.ico</ApplicationIcon>
<RunPostBuildEvent>OnBuildSuccess</RunPostBuildEvent>
</PropertyGroup>
<PropertyGroup Condition=" '$(Platform)' == 'AnyCPU' ">
<PlatformTarget>AnyCPU</PlatformTarget>
<BaseAddress>4194304</BaseAddress>
<RegisterForComInterop>False</RegisterForComInterop>
<GenerateSerializationAssemblies>Auto</GenerateSerializationAssemblies>
<FileAlignment>4096</FileAlignment>
</PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)' == 'Debug' ">
<OutputPath>..\output\debug\</OutputPath>
<DebugSymbols>True</DebugSymbols>
<DebugType>Full</DebugType>
<Optimize>False</Optimize>
<CheckForOverflowUnderflow>False</CheckForOverflowUnderflow>
<DefineConstants>DEBUG;TRACE;LAUNCHER</DefineConstants>
<BaseIntermediateOutputPath>obj\</BaseIntermediateOutputPath>
<StartAction>Project</StartAction>
</PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)' == 'Release' ">
<OutputPath>..\output\release\</OutputPath>
<DebugSymbols>False</DebugSymbols>
<DebugType>None</DebugType>
<Optimize>True</Optimize>
<CheckForOverflowUnderflow>False</CheckForOverflowUnderflow>
<DefineConstants>TRACE;LAUNCHER</DefineConstants>
<BaseIntermediateOutputPath>obj\</BaseIntermediateOutputPath>
<StartAction>Project</StartAction>
</PropertyGroup>
<ItemGroup>
<Reference Include="SharpWave">
<HintPath>..\ClassicalSharp\SharpWave.dll</HintPath>
</Reference>
<Reference Include="System" />
<Reference Include="System.Drawing" />
<Reference Include="System.Security" />
<Reference Include="System.Windows.Forms" />
</ItemGroup>
<ItemGroup>
<Compile Include="..\ClassicalSharp\2D\Drawing\GdiPlusDrawer2D.cs">
<Link>Shared\GdiPlusDrawer2D.cs</Link>
</Compile>
<Compile Include="..\ClassicalSharp\2D\Drawing\IDrawer2D.cs">
<Link>Shared\IDrawer2D.cs</Link>
</Compile>
<Compile Include="..\ClassicalSharp\2D\Drawing\IDrawer2D.TextMC.cs">
<Link>Shared\IDrawer2D.TextMC.cs</Link>
</Compile>
<Compile Include="..\ClassicalSharp\2D\Utils\FastBitmap.cs">
<Link>Shared\FastBitmap.cs</Link>
</Compile>
<Compile Include="..\ClassicalSharp\2D\Utils\FastColour.cs">
<Link>Shared\FastColour.cs</Link>
</Compile>
<Compile Include="..\ClassicalSharp\Network\Utils\AsyncDownloader.cs">
<Link>Shared\AsyncDownloader.cs</Link>
</Compile>
<Compile Include="..\ClassicalSharp\Platform\Platform.cs">
<Link>Shared\Platform.cs</Link>
</Compile>
<Compile Include="..\ClassicalSharp\Program.cs">
<Link>Shared\Program.cs</Link>
</Compile>
<Compile Include="..\ClassicalSharp\TexturePack\ZipReader.cs">
<Link>Shared\ZipReader.cs</Link>
</Compile>
<Compile Include="..\ClassicalSharp\Utils\ErrorHandler.cs">
<Link>Shared\ErrorHandler.cs</Link>
</Compile>
<Compile Include="..\ClassicalSharp\Utils\Options.cs">
<Link>Shared\Options.cs</Link>
</Compile>
<Compile Include="..\ClassicalSharp\Utils\Utils.cs">
<Link>Shared\Utils.cs</Link>
</Compile>
<Compile Include="..\ClassicalSharp\Utils\Utils.Math.cs">
<Link>Shared\Utils.Math.cs</Link>
</Compile>
<Compile Include="Drawing\BitmapDrawer.cs" />
<Compile Include="Drawing\Drawer2DExt.cs" />
<Compile Include="Drawing\Gradient.cs" />
<Compile Include="Drawing\Platform\OSXDrawer.cs" />
<Compile Include="Drawing\Platform\PlatformDrawer.cs" />
<Compile Include="Drawing\Platform\WindowsDrawer.cs" />
<Compile Include="Drawing\Platform\X11Drawer.cs" />
<Compile Include="Gui\Screens\ServersScreen.cs" />
<Compile Include="Gui\Screens\ColoursScreen.cs" />
<Compile Include="Gui\Screens\DirectConnectScreen.cs" />
<Compile Include="Gui\Screens\InputScreen.cs" />
<Compile Include="Gui\Screens\Screen.cs" />
<Compile Include="Gui\Screens\MainScreen.Classicube.cs" />
<Compile Include="Gui\Screens\MainScreen.cs" />
<Compile Include="Gui\Screens\ResourcesScreen.cs" />
<Compile Include="Gui\Screens\ChooseModeScreen.cs" />
<Compile Include="Gui\Screens\SettingsScreen.cs" />
<Compile Include="Gui\Screens\UpdatesScreen.cs" />
<Compile Include="Gui\TableWidget\Comparers.cs" />
<Compile Include="Gui\TableWidget\TableView.cs" />
<Compile Include="Gui\TableWidget\TableWidget.cs" />
<Compile Include="Gui\Views\ChooseModeView.cs" />
<Compile Include="Gui\Views\ColoursView.cs" />
<Compile Include="Gui\Views\DirectConnectView.cs" />
<Compile Include="Gui\Views\IView.cs" />
<Compile Include="Gui\Views\MainView.cs" />
<Compile Include="Gui\Views\ResourcesView.cs" />
<Compile Include="Gui\Views\ServersView.cs" />
<Compile Include="Gui\Views\SettingsView.cs" />
<Compile Include="Gui\Views\UpdatesView.cs" />
<Compile Include="Gui\Widgets\BitmapWidget.cs" />
<Compile Include="Gui\Widgets\CheckboxWidget.cs" />
<Compile Include="Gui\Widgets\InputText.cs" />
<Compile Include="Gui\Widgets\ButtonWidget.cs" />
<Compile Include="Gui\Widgets\InputWidget.cs" />
<Compile Include="Gui\Widgets\LabelWidget.cs" />
<Compile Include="Gui\Widgets\SliderWidget.cs" />
<Compile Include="Gui\Widgets\Widget.cs" />
<Compile Include="Gui\Widgets\Makers.cs" />
<Compile Include="LauncherWindow.Background.cs" />
<Compile Include="LauncherWindow.cs" />
<Compile Include="Patcher\ResourceChecker.cs" />
<Compile Include="Patcher\ResourceFetcher.cs" />
<Compile Include="Patcher\ResourcePatcher.cs" />
<Compile Include="Patcher\ResourcesList.cs" />
<Compile Include="Patcher\SoundPatcher.cs" />
<Compile Include="Patcher\ZipWriter.cs" />
<Compile Include="Program.cs" />
<Compile Include="Properties\AssemblyInfo.cs" />
<Compile Include="WebTasks.cs" />
<Compile Include="Updater\Scripts.cs" />
<Compile Include="Updater\Applier.cs" />
<Compile Include="Utils\Client.cs" />
<Compile Include="Utils\JSON.cs" />
<Compile Include="Utils\LauncherSkin.cs" />
<Compile Include="Utils\Secure.cs" />
</ItemGroup>
<ItemGroup>
<ProjectReference Include="..\OpenTK\OpenTK.csproj">
<Project>{35FEE071-2DE6-48A1-9343-B5C1F202A12B}</Project>
<Name>OpenTK</Name>
</ProjectReference>
</ItemGroup>
<ItemGroup>
<Folder Include="Gui" />
<Folder Include="Drawing\Platform" />
<Folder Include="Gui\Views" />
<Folder Include="Gui\TableWidget" />
<Folder Include="Gui\Screens" />
<Folder Include="Gui\Widgets" />
<Folder Include="Drawing" />
<Folder Include="Shared" />
<Folder Include="Updater" />
<Folder Include="Utils" />
<Folder Include="Patcher" />
</ItemGroup>
<Import Project="$(MSBuildBinPath)\Microsoft.CSharp.Targets" />
<?xml version="1.0" encoding="utf-8"?>
<Project ToolsVersion="2.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003" DefaultTargets="Build">
<PropertyGroup>
<ProjectGuid>{3E84ACC1-27B4-401B-A359-6AAE4DF6C9B5}</ProjectGuid>
<Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
<Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
<OutputType>WinExe</OutputType>
<RootNamespace>Launcher</RootNamespace>
<AssemblyName>Launcher2</AssemblyName>
<TargetFrameworkVersion>v2.0</TargetFrameworkVersion>
<TargetFrameworkProfile>
</TargetFrameworkProfile>
<AppDesignerFolder>Properties</AppDesignerFolder>
<NoWin32Manifest>False</NoWin32Manifest>
<AllowUnsafeBlocks>True</AllowUnsafeBlocks>
<NoStdLib>False</NoStdLib>
<TreatWarningsAsErrors>False</TreatWarningsAsErrors>
<IntermediateOutputPath>obj\$(Configuration)\</IntermediateOutputPath>
<WarningLevel>4</WarningLevel>
<ApplicationIcon>icon.ico</ApplicationIcon>
<RunPostBuildEvent>OnBuildSuccess</RunPostBuildEvent>
</PropertyGroup>
<PropertyGroup Condition=" '$(Platform)' == 'AnyCPU' ">
<PlatformTarget>AnyCPU</PlatformTarget>
<BaseAddress>4194304</BaseAddress>
<RegisterForComInterop>False</RegisterForComInterop>
<GenerateSerializationAssemblies>Auto</GenerateSerializationAssemblies>
<FileAlignment>4096</FileAlignment>
</PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)' == 'Debug' ">
<OutputPath>..\output\debug\</OutputPath>
<DebugSymbols>True</DebugSymbols>
<DebugType>Full</DebugType>
<Optimize>False</Optimize>
<CheckForOverflowUnderflow>False</CheckForOverflowUnderflow>
<DefineConstants>DEBUG;TRACE;LAUNCHER</DefineConstants>
<BaseIntermediateOutputPath>obj\</BaseIntermediateOutputPath>
<StartAction>Project</StartAction>
</PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)' == 'Release' ">
<OutputPath>..\output\release\</OutputPath>
<DebugSymbols>False</DebugSymbols>
<DebugType>None</DebugType>
<Optimize>True</Optimize>
<CheckForOverflowUnderflow>False</CheckForOverflowUnderflow>
<DefineConstants>TRACE;LAUNCHER</DefineConstants>
<BaseIntermediateOutputPath>obj\</BaseIntermediateOutputPath>
<StartAction>Project</StartAction>
</PropertyGroup>
<ItemGroup>
<Reference Include="SharpWave">
<HintPath>..\ClassicalSharp\SharpWave.dll</HintPath>
</Reference>
<Reference Include="System" />
<Reference Include="System.Drawing" />
<Reference Include="System.Security" />
<Reference Include="System.Windows.Forms" />
</ItemGroup>
<ItemGroup>
<Compile Include="..\ClassicalSharp\2D\Drawing\GdiPlusDrawer2D.cs">
<Link>Shared\GdiPlusDrawer2D.cs</Link>
</Compile>
<Compile Include="..\ClassicalSharp\2D\Drawing\IDrawer2D.cs">
<Link>Shared\IDrawer2D.cs</Link>
</Compile>
<Compile Include="..\ClassicalSharp\2D\Drawing\IDrawer2D.TextMC.cs">
<Link>Shared\IDrawer2D.TextMC.cs</Link>
</Compile>
<Compile Include="..\ClassicalSharp\2D\Utils\FastBitmap.cs">
<Link>Shared\FastBitmap.cs</Link>
</Compile>
<Compile Include="..\ClassicalSharp\2D\Utils\FastColour.cs">
<Link>Shared\FastColour.cs</Link>
</Compile>
<Compile Include="..\ClassicalSharp\Network\Utils\AsyncDownloader.cs">
<Link>Shared\AsyncDownloader.cs</Link>
</Compile>
<Compile Include="..\ClassicalSharp\Platform\Platform.cs">
<Link>Shared\Platform.cs</Link>
</Compile>
<Compile Include="..\ClassicalSharp\Program.cs">
<Link>Shared\Program.cs</Link>
</Compile>
<Compile Include="..\ClassicalSharp\TexturePack\ZipReader.cs">
<Link>Shared\ZipReader.cs</Link>
</Compile>
<Compile Include="..\ClassicalSharp\Utils\ErrorHandler.cs">
<Link>Shared\ErrorHandler.cs</Link>
</Compile>
<Compile Include="..\ClassicalSharp\Utils\Options.cs">
<Link>Shared\Options.cs</Link>
</Compile>
<Compile Include="..\ClassicalSharp\Utils\Utils.cs">
<Link>Shared\Utils.cs</Link>
</Compile>
<Compile Include="..\ClassicalSharp\Utils\Utils.Math.cs">
<Link>Shared\Utils.Math.cs</Link>
</Compile>
<Compile Include="..\OpenTK\DisplayDevice.cs">
<Link>OpenTK\DisplayDevice.cs</Link>
</Compile>
<Compile Include="..\OpenTK\INativeWindow.cs">
<Link>OpenTK\INativeWindow.cs</Link>
</Compile>
<Compile Include="..\OpenTK\Keyboard.cs">
<Link>OpenTK\Keyboard.cs</Link>
</Compile>
<Compile Include="..\OpenTK\Utils.cs">
<Link>OpenTK\Utils.cs</Link>
</Compile>
<Compile Include="..\OpenTK\Graphics\ColorFormat.cs">
<Link>OpenTK\Graphics\ColorFormat.cs</Link>
</Compile>
<Compile Include="..\OpenTK\Graphics\GraphicsMode.cs">
<Link>OpenTK\Graphics\GraphicsMode.cs</Link>
</Compile>
<Compile Include="..\OpenTK\Graphics\IGraphicsContext.cs">
<Link>OpenTK\Graphics\IGraphicsContext.cs</Link>
</Compile>
<Compile Include="..\OpenTK\Mouse.cs">
<Link>OpenTK\Mouse.cs</Link>
</Compile>
<Compile Include="..\OpenTK\Platform\Configuration.cs">
<Link>OpenTK\Platform\Configuration.cs</Link>
</Compile>
<Compile Include="..\OpenTK\Platform\IPlatformFactory.cs">
<Link>OpenTK\Platform\IPlatformFactory.cs</Link>
</Compile>
<Compile Include="..\OpenTK\Platform\MacOS\AglContext.cs">
<Link>OpenTK\Platform\MacOS\AglContext.cs</Link>
</Compile>
<Compile Include="..\OpenTK\Platform\MacOS\Application.cs">
<Link>OpenTK\Platform\MacOS\Application.cs</Link>
</Compile>
<Compile Include="..\OpenTK\Platform\MacOS\CarbonBindings\Agl.cs">
<Link>OpenTK\Platform\MacOS\CarbonBindings\Agl.cs</Link>
</Compile>
<Compile Include="..\OpenTK\Platform\MacOS\CarbonBindings\CarbonAPI.cs">
<Link>OpenTK\Platform\MacOS\CarbonBindings\CarbonAPI.cs</Link>
</Compile>
<Compile Include="..\OpenTK\Platform\MacOS\CarbonBindings\API.cs">
<Link>OpenTK\Platform\MacOS\CarbonBindings\API.cs</Link>
</Compile>
<Compile Include="..\OpenTK\Platform\MacOS\CarbonBindings\MacOSKeys.cs">
<Link>OpenTK\Platform\MacOS\CarbonBindings\MacOSKeys.cs</Link>
</Compile>
<Compile Include="..\OpenTK\Platform\MacOS\CarbonWindow.cs">
<Link>OpenTK\Platform\MacOS\CarbonWindow.cs</Link>
</Compile>
<Compile Include="..\OpenTK\Platform\MacOS\MacOSException.cs">
<Link>OpenTK\Platform\MacOS\MacOSException.cs</Link>
</Compile>
<Compile Include="..\OpenTK\Platform\MacOS\MacOSKeyMap.cs">
<Link>OpenTK\Platform\MacOS\MacOSKeyMap.cs</Link>
</Compile>
<Compile Include="..\OpenTK\Platform\MacOS\QuartzDisplayDevice.cs">
<Link>OpenTK\Platform\MacOS\QuartzDisplayDevice.cs</Link>
</Compile>
<Compile Include="..\OpenTK\Platform\Windows\API.cs">
<Link>OpenTK\Platform\Windows\API.cs</Link>
</Compile>
<Compile Include="..\OpenTK\Platform\Windows\Wgl.cs">
<Link>OpenTK\Platform\Windows\Wgl.cs</Link>
</Compile>
<Compile Include="..\OpenTK\Platform\Windows\WinDisplayDevice.cs">
<Link>OpenTK\Platform\Windows\WinDisplayDevice.cs</Link>
</Compile>
<Compile Include="..\OpenTK\Platform\Windows\WinGLContext.cs">
<Link>OpenTK\Platform\Windows\WinGLContext.cs</Link>
</Compile>
<Compile Include="..\OpenTK\Platform\Windows\WinWindow.cs">
<Link>OpenTK\Platform\Windows\WinWindow.cs</Link>
</Compile>
<Compile Include="..\OpenTK\Platform\Windows\WinKeyMap.cs">
<Link>OpenTK\Platform\Windows\WinKeyMap.cs</Link>
</Compile>
<Compile Include="..\OpenTK\Platform\X11\API.cs">
<Link>OpenTK\Platform\X11\API.cs</Link>
</Compile>
<Compile Include="..\OpenTK\Platform\X11\Glx.cs">
<Link>OpenTK\Platform\X11\Glx.cs</Link>
</Compile>
<Compile Include="..\OpenTK\Platform\X11\Structs.cs">
<Link>OpenTK\Platform\X11\Structs.cs</Link>
</Compile>
<Compile Include="..\OpenTK\Platform\X11\X11DisplayDevice.cs">
<Link>OpenTK\Platform\X11\X11DisplayDevice.cs</Link>
</Compile>
<Compile Include="..\OpenTK\Platform\X11\X11GLContext.cs">
<Link>OpenTK\Platform\X11\X11GLContext.cs</Link>
</Compile>
<Compile Include="..\OpenTK\Platform\X11\X11Window.cs">
<Link>OpenTK\Platform\X11\X11Window.cs</Link>
</Compile>
<Compile Include="..\OpenTK\Platform\X11\X11KeyMap.cs">
<Link>OpenTK\Platform\X11\X11KeyMap.cs</Link>
</Compile>
<Compile Include="Drawing\BitmapDrawer.cs" />
<Compile Include="Drawing\Drawer2DExt.cs" />
<Compile Include="Drawing\Gradient.cs" />
<Compile Include="Drawing\Platform\OSXDrawer.cs" />
<Compile Include="Drawing\Platform\PlatformDrawer.cs" />
<Compile Include="Drawing\Platform\WindowsDrawer.cs" />
<Compile Include="Drawing\Platform\X11Drawer.cs" />
<Compile Include="Gui\Screens\ServersScreen.cs" />
<Compile Include="Gui\Screens\ColoursScreen.cs" />
<Compile Include="Gui\Screens\DirectConnectScreen.cs" />
<Compile Include="Gui\Screens\InputScreen.cs" />
<Compile Include="Gui\Screens\Screen.cs" />
<Compile Include="Gui\Screens\MainScreen.Classicube.cs" />
<Compile Include="Gui\Screens\MainScreen.cs" />
<Compile Include="Gui\Screens\ResourcesScreen.cs" />
<Compile Include="Gui\Screens\ChooseModeScreen.cs" />
<Compile Include="Gui\Screens\SettingsScreen.cs" />
<Compile Include="Gui\Screens\UpdatesScreen.cs" />
<Compile Include="Gui\TableWidget\Comparers.cs" />
<Compile Include="Gui\TableWidget\TableView.cs" />
<Compile Include="Gui\TableWidget\TableWidget.cs" />
<Compile Include="Gui\Views\ChooseModeView.cs" />
<Compile Include="Gui\Views\ColoursView.cs" />
<Compile Include="Gui\Views\DirectConnectView.cs" />
<Compile Include="Gui\Views\IView.cs" />
<Compile Include="Gui\Views\MainView.cs" />
<Compile Include="Gui\Views\ResourcesView.cs" />
<Compile Include="Gui\Views\ServersView.cs" />
<Compile Include="Gui\Views\SettingsView.cs" />
<Compile Include="Gui\Views\UpdatesView.cs" />
<Compile Include="Gui\Widgets\BitmapWidget.cs" />
<Compile Include="Gui\Widgets\CheckboxWidget.cs" />
<Compile Include="Gui\Widgets\InputText.cs" />
<Compile Include="Gui\Widgets\ButtonWidget.cs" />
<Compile Include="Gui\Widgets\InputWidget.cs" />
<Compile Include="Gui\Widgets\LabelWidget.cs" />
<Compile Include="Gui\Widgets\SliderWidget.cs" />
<Compile Include="Gui\Widgets\Widget.cs" />
<Compile Include="Gui\Widgets\Makers.cs" />
<Compile Include="LauncherWindow.Background.cs" />
<Compile Include="LauncherWindow.cs" />
<Compile Include="Patcher\ResourceChecker.cs" />
<Compile Include="Patcher\ResourceFetcher.cs" />
<Compile Include="Patcher\ResourcePatcher.cs" />
<Compile Include="Patcher\ResourcesList.cs" />
<Compile Include="Patcher\SoundPatcher.cs" />
<Compile Include="Patcher\ZipWriter.cs" />
<Compile Include="Program.cs" />
<Compile Include="Properties\AssemblyInfo.cs" />
<Compile Include="WebTasks.cs" />
<Compile Include="Updater\Scripts.cs" />
<Compile Include="Updater\Applier.cs" />
<Compile Include="Utils\Client.cs" />
<Compile Include="Utils\JSON.cs" />
<Compile Include="Utils\LauncherSkin.cs" />
<Compile Include="Utils\Secure.cs" />
</ItemGroup>
<ItemGroup>
<Folder Include="Gui" />
<Folder Include="Drawing\Platform" />
<Folder Include="Gui\Views" />
<Folder Include="Gui\TableWidget" />
<Folder Include="Gui\Screens" />
<Folder Include="Gui\Widgets" />
<Folder Include="Drawing" />
<Folder Include="Shared" />
<Folder Include="Updater" />
<Folder Include="Utils" />
<Folder Include="Patcher" />
</ItemGroup>
<Import Project="$(MSBuildBinPath)\Microsoft.CSharp.Targets" />
</Project>

View File

@ -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