Skip to content
This repository was archived by the owner on Sep 17, 2023. It is now read-only.

Commit be4c8f4

Browse files
prepareprepare
committed
11.4: .net framework 2.0 build
1 parent d377e49 commit be4c8f4

File tree

8 files changed

+130
-39
lines changed

8 files changed

+130
-39
lines changed

‎OpenTK.sln‎

Lines changed: 23 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -43,8 +43,6 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "OpenTK.Tests.Math", "tests\
4343
EndProject
4444
Project("{F2A71F9B-5D33-465A-A702-920D77279786}") = "OpenTK.Tests.Generators", "tests\OpenTK.Tests.Generators\OpenTK.Tests.Generators.fsproj", "{2B11AAEB-D8AC-4356-938F-532D720E0C30}"
4545
EndProject
46-
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "MiniOpenTK", "src\MiniOpenTK\MiniOpenTK.csproj", "{73772A2F-7357-49CA-9FD3-7D8D448F9424}"
47-
EndProject
4846
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "MiniOpenTKWinForms", "src\MiniOpenTKWinForms\MiniOpenTKWinForms.csproj", "{43EBD500-B9A1-4671-92D6-35FB835CCA0F}"
4947
EndProject
5048
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "BasicTriangle", "..\opentk-examples-master\src\BasicTriangle\BasicTriangle.csproj", "{82E18ED0-E9A4-4EF4-830C-AA497B8A70EF}"
@@ -53,10 +51,21 @@ Project("{D954291E-2A0B-460D-934E-DC6B0785DB48}") = "MiniOpenTK_Core1", "src\Ope
5351
EndProject
5452
Project("{D954291E-2A0B-460D-934E-DC6B0785DB48}") = "MiniOpenTK_Core2", "src\OpenTK\MiniOpenTK_Core2.shproj", "{FF741509-C054-49D1-AA4F-C3E10BB2A63E}"
5553
EndProject
54+
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "builds", "builds", "{4D9DA694-9EF4-4A92-9449-F4DED77D1EF8}"
55+
EndProject
56+
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "NETSTD2", "NETSTD2", "{A13BC320-1CF8-4514-B550-ABFC3D02943F}"
57+
EndProject
58+
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "MiniOpenTKCore1", "src\Builds\NETSTD2\MiniOpenTKCore1\MiniOpenTKCore1.csproj", "{AEC72FBF-5286-4AB9-A18A-26CED9499DE2}"
59+
EndProject
60+
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Net20", "Net20", "{6446602F-7343-4184-AC08-8C4DEF8E5357}"
61+
EndProject
62+
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "MiniOpenTKCore1", "src\Builds\Net20\MiniOpenTKCore1\MiniOpenTKCore1.csproj", "{D49440C2-785F-4BAC-9F2E-FC93603FA647}"
63+
EndProject
5664
Global
5765
GlobalSection(SharedMSBuildProjectFiles) = preSolution
5866
src\OpenTK\MiniOpenTK_Core1.projitems*{17b7fb0c-7638-4c89-aadf-f3835803cb17}*SharedItemsImports = 13
5967
src\OpenTK\MiniOpenTK_Core2.projitems*{43ebd500-b9a1-4671-92d6-35fb835cca0f}*SharedItemsImports = 4
68+
src\OpenTK\MiniOpenTK_Core1.projitems*{d49440c2-785f-4bac-9f2e-fc93603fa647}*SharedItemsImports = 4
6069
src\OpenTK\MiniOpenTK_Core2.projitems*{ff741509-c054-49d1-aa4f-c3e10bb2a63e}*SharedItemsImports = 13
6170
EndGlobalSection
6271
GlobalSection(SolutionConfigurationPlatforms) = preSolution
@@ -112,10 +121,6 @@ Global
112121
{2B11AAEB-D8AC-4356-938F-532D720E0C30}.Debug|Any CPU.Build.0 = Debug|Any CPU
113122
{2B11AAEB-D8AC-4356-938F-532D720E0C30}.Release|Any CPU.ActiveCfg = Release|Any CPU
114123
{2B11AAEB-D8AC-4356-938F-532D720E0C30}.Release|Any CPU.Build.0 = Release|Any CPU
115-
{73772A2F-7357-49CA-9FD3-7D8D448F9424}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
116-
{73772A2F-7357-49CA-9FD3-7D8D448F9424}.Debug|Any CPU.Build.0 = Debug|Any CPU
117-
{73772A2F-7357-49CA-9FD3-7D8D448F9424}.Release|Any CPU.ActiveCfg = Release|Any CPU
118-
{73772A2F-7357-49CA-9FD3-7D8D448F9424}.Release|Any CPU.Build.0 = Release|Any CPU
119124
{43EBD500-B9A1-4671-92D6-35FB835CCA0F}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
120125
{43EBD500-B9A1-4671-92D6-35FB835CCA0F}.Debug|Any CPU.Build.0 = Debug|Any CPU
121126
{43EBD500-B9A1-4671-92D6-35FB835CCA0F}.Release|Any CPU.ActiveCfg = Release|Any CPU
@@ -124,6 +129,14 @@ Global
124129
{82E18ED0-E9A4-4EF4-830C-AA497B8A70EF}.Debug|Any CPU.Build.0 = Debug|Any CPU
125130
{82E18ED0-E9A4-4EF4-830C-AA497B8A70EF}.Release|Any CPU.ActiveCfg = Release|Any CPU
126131
{82E18ED0-E9A4-4EF4-830C-AA497B8A70EF}.Release|Any CPU.Build.0 = Release|Any CPU
132+
{AEC72FBF-5286-4AB9-A18A-26CED9499DE2}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
133+
{AEC72FBF-5286-4AB9-A18A-26CED9499DE2}.Debug|Any CPU.Build.0 = Debug|Any CPU
134+
{AEC72FBF-5286-4AB9-A18A-26CED9499DE2}.Release|Any CPU.ActiveCfg = Release|Any CPU
135+
{AEC72FBF-5286-4AB9-A18A-26CED9499DE2}.Release|Any CPU.Build.0 = Release|Any CPU
136+
{D49440C2-785F-4BAC-9F2E-FC93603FA647}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
137+
{D49440C2-785F-4BAC-9F2E-FC93603FA647}.Debug|Any CPU.Build.0 = Debug|Any CPU
138+
{D49440C2-785F-4BAC-9F2E-FC93603FA647}.Release|Any CPU.ActiveCfg = Release|Any CPU
139+
{D49440C2-785F-4BAC-9F2E-FC93603FA647}.Release|Any CPU.Build.0 = Release|Any CPU
127140
EndGlobalSection
128141
GlobalSection(SolutionProperties) = preSolution
129142
HideSolutionNode = FALSE
@@ -134,6 +147,10 @@ Global
134147
{C2B07CD9-B388-4FC3-AF31-C648F7EA904E} = {1857BB8E-1A35-4EBF-9F6D-685F11DC025B}
135148
{2B11AAEB-D8AC-4356-938F-532D720E0C30} = {1857BB8E-1A35-4EBF-9F6D-685F11DC025B}
136149
{82E18ED0-E9A4-4EF4-830C-AA497B8A70EF} = {1857BB8E-1A35-4EBF-9F6D-685F11DC025B}
150+
{A13BC320-1CF8-4514-B550-ABFC3D02943F} = {4D9DA694-9EF4-4A92-9449-F4DED77D1EF8}
151+
{AEC72FBF-5286-4AB9-A18A-26CED9499DE2} = {A13BC320-1CF8-4514-B550-ABFC3D02943F}
152+
{6446602F-7343-4184-AC08-8C4DEF8E5357} = {4D9DA694-9EF4-4A92-9449-F4DED77D1EF8}
153+
{D49440C2-785F-4BAC-9F2E-FC93603FA647} = {6446602F-7343-4184-AC08-8C4DEF8E5357}
137154
EndGlobalSection
138155
GlobalSection(ExtensibilityGlobals) = postSolution
139156
SolutionGuid = {2E5408E2-D8EE-4B94-923F-E48F40323736}

src/MiniOpenTK/MiniOpenTK.csproj renamed to src/Builds/NETSTD2/MiniOpenTKCore1/MiniOpenTKCore1.csproj

Lines changed: 5 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -5,18 +5,14 @@
55
</PropertyGroup>
66

77
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|AnyCPU'">
8-
<DefineConstants>TRACE;DEBUG;OPENGLES, WIN32,__MOBILE__</DefineConstants>
98
<AllowUnsafeBlocks>true</AllowUnsafeBlocks>
10-
<PlatformTarget>x86</PlatformTarget>
119
</PropertyGroup>
1210

13-
<ItemGroup>
14-
<Compile Remove="Math\**" />
15-
<EmbeddedResource Remove="Math\**" />
16-
<None Remove="Math\**" />
17-
</ItemGroup>
18-
11+
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|AnyCPU'">
12+
<AllowUnsafeBlocks>true</AllowUnsafeBlocks>
13+
<PlatformTarget>x86</PlatformTarget>
14+
</PropertyGroup>
1915

20-
<Import Project="..\OpenTK\MiniOpenTK_Core1.projitems" Label="Shared" />
16+
<Import Project="..\..\..\OpenTK\MiniOpenTK_Core1.projitems" Label="Shared" />
2117

2218
</Project>

‎src/Builds/Net20/MiniOpenTKCore1/MiniOpenTKCore1.csproj‎

Lines changed: 44 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,44 @@
1+
<?xml version="1.0" encoding="utf-8"?>
2+
<Project ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
3+
<Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" />
4+
<PropertyGroup>
5+
<Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
6+
<Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
7+
<ProjectGuid>{D49440C2-785F-4BAC-9F2E-FC93603FA647}</ProjectGuid>
8+
<OutputType>Library</OutputType>
9+
<AppDesignerFolder>Properties</AppDesignerFolder>
10+
<RootNamespace>MiniOpenTKCore1</RootNamespace>
11+
<AssemblyName>MiniOpenTKCore1</AssemblyName>
12+
<TargetFrameworkVersion>v2.0</TargetFrameworkVersion>
13+
<FileAlignment>512</FileAlignment>
14+
<Deterministic>true</Deterministic>
15+
</PropertyGroup>
16+
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
17+
<DebugSymbols>true</DebugSymbols>
18+
<DebugType>full</DebugType>
19+
<Optimize>false</Optimize>
20+
<OutputPath>bin\Debug\</OutputPath>
21+
<DefineConstants>TRACE;DEBUG;MINIMAL</DefineConstants>
22+
<ErrorReport>prompt</ErrorReport>
23+
<WarningLevel>4</WarningLevel>
24+
<AllowUnsafeBlocks>true</AllowUnsafeBlocks>
25+
</PropertyGroup>
26+
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
27+
<DebugType>pdbonly</DebugType>
28+
<Optimize>true</Optimize>
29+
<OutputPath>bin\Release\</OutputPath>
30+
<DefineConstants>TRACE</DefineConstants>
31+
<ErrorReport>prompt</ErrorReport>
32+
<WarningLevel>4</WarningLevel>
33+
<AllowUnsafeBlocks>true</AllowUnsafeBlocks>
34+
<PlatformTarget>x86</PlatformTarget>
35+
</PropertyGroup>
36+
<ItemGroup>
37+
<Reference Include="System" />
38+
</ItemGroup>
39+
<ItemGroup>
40+
<Compile Include="Properties\AssemblyInfo.cs" />
41+
</ItemGroup>
42+
<Import Project="..\..\..\OpenTK\MiniOpenTK_Core1.projitems" Label="Shared" />
43+
<Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
44+
</Project>

‎src/MiniOpenTKWinForms/MiniOpenTKWinForms.csproj‎

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -25,13 +25,14 @@
2525
<AllowUnsafeBlocks>true</AllowUnsafeBlocks>
2626
</PropertyGroup>
2727
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
28-
<PlatformTarget>AnyCPU</PlatformTarget>
28+
<PlatformTarget>x86</PlatformTarget>
2929
<DebugType>pdbonly</DebugType>
3030
<Optimize>true</Optimize>
3131
<OutputPath>bin\Release\</OutputPath>
32-
<DefineConstants>TRACE</DefineConstants>
32+
<DefineConstants>TRACE;OPENGLES, SDL2,WIN32</DefineConstants>
3333
<ErrorReport>prompt</ErrorReport>
3434
<WarningLevel>4</WarningLevel>
35+
<AllowUnsafeBlocks>true</AllowUnsafeBlocks>
3536
</PropertyGroup>
3637
<PropertyGroup>
3738
<StartupObject />
@@ -104,9 +105,9 @@
104105
<None Include="UserGLControl\App.config" />
105106
</ItemGroup>
106107
<ItemGroup>
107-
<ProjectReference Include="..\MiniOpenTK\MiniOpenTK.csproj">
108-
<Project>{73772a2f-7357-49ca-9fd3-7d8d448f9424}</Project>
109-
<Name>MiniOpenTK</Name>
108+
<ProjectReference Include="..\Builds\NETSTD2\MiniOpenTKCore1\MiniOpenTKCore1.csproj">
109+
<Project>{aec72fbf-5286-4ab9-a18a-26ced9499de2}</Project>
110+
<Name>MiniOpenTKCore1</Name>
110111
</ProjectReference>
111112
</ItemGroup>
112113
<Import Project="..\OpenTK\MiniOpenTK_Core2.projitems" Label="Shared" />

‎src/OpenTK/0_MyExtension/ES30mini/Helper.cs‎

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -380,17 +380,17 @@ public static void Viewport(Rectangle rectangle)
380380
{
381381
GL.Viewport(rectangle.X, rectangle.Y, rectangle.Width, rectangle.Height);
382382
}
383-
#if MINIMAL
384-
public static void Viewport(OpenTK.Point location, OpenTK.Size size)
385-
{
386-
GL.Viewport(location.X, location.Y, size.Width, size.Height);
387-
}
388-
389-
public static void Viewport(OpenTK.Rectangle rectangle)
390-
{
391-
GL.Viewport(rectangle.X, rectangle.Y, rectangle.Width, rectangle.Height);
392-
}
393-
#endif
383+
//#if MINIMAL
384+
// public static void Viewport(OpenTK.Point location, OpenTK.Size size)
385+
// {
386+
// GL.Viewport(location.X, location.Y, size.Width, size.Height);
387+
// }
388+
389+
// public static void Viewport(OpenTK.Rectangle rectangle)
390+
// {
391+
// GL.Viewport(rectangle.X, rectangle.Y, rectangle.Width, rectangle.Height);
392+
// }
393+
//#endif
394394

395395
#pragma warning restore 3019
396396
#pragma warning restore 1591

‎src/OpenTK/0_MyExtension/Factory.cs‎

Lines changed: 28 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,28 @@
1-

1+
//
2+
// The Open Toolkit Library License
3+
//
4+
// Copyright (c) 2006 - 2009 the Open Toolkit library.
5+
//
6+
// Permission is hereby granted, free of charge, to any person obtaining a copy
7+
// of this software and associated documentation files (the "Software"), to deal
8+
// in the Software without restriction, including without limitation the rights to
9+
// use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of
10+
// the Software, and to permit persons to whom the Software is furnished to do
11+
// so, subject to the following conditions:
12+
//
13+
// The above copyright notice and this permission notice shall be included in all
14+
// copies or substantial portions of the Software.
15+
//
16+
// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
17+
// EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES
18+
// OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
19+
// NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT
20+
// HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
21+
// WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
22+
// FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
23+
// OTHER DEALINGS IN THE SOFTWARE.
24+
//
25+
226
using System;
327
using System.Collections.Generic;
428
using System.Text;
@@ -13,9 +37,11 @@ namespace OpenTK.Platform
1337

1438
public sealed class Factory : IPlatformFactory
1539
{
40+
public delegate IPlatformFactory GetCustomFactoryDelegate();
41+
1642
private bool disposed;
1743

18-
public static Func<IPlatformFactory> GetCustomPlatformFactory;
44+
public static GetCustomFactoryDelegate GetCustomPlatformFactory;
1945

2046
public Factory()
2147
{

‎src/OpenTK/0_MyExtension/MyExt.cs‎

Lines changed: 11 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -23,15 +23,21 @@
2323
// OTHER DEALINGS IN THE SOFTWARE.
2424
//
2525

26-
26+
2727

2828
namespace OpenTK.Graphics
2929
{
30-
31-
3230
public static class PlatformAddressPortal
3331
{
34-
//Platform.Utilities.CreateGetAddress()
3532
public static GraphicsContext.GetAddressDelegate GetAddressDelegate;
36-
}
33+
}
34+
}
35+
36+
#if MINIMAL
37+
namespace System.Xml.Serialization
38+
{
39+
class dummy { }
3740
}
41+
#endif
42+
43+

‎src/OpenTK/Math/Quaternion.cs‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,8 +21,9 @@ OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
2121
*/
2222

2323
using System;
24-
using System.Runtime.InteropServices;
24+
using System.Runtime.InteropServices;
2525
using System.Xml.Serialization;
26+
2627

2728
namespace OpenTK
2829
{

0 commit comments

Comments
 (0)