diff --git a/.gitignore b/.gitignore index 58ffb92d..a263d463 100644 --- a/.gitignore +++ b/.gitignore @@ -17,6 +17,10 @@ ipch Thumbs.db +# Build results +[Bb]in/ +[Oo]bj/ + Content/Integration/DirectX9/_temp Content/Integration/DirectX9/Debug Content/Integration/DirectX9/Release diff --git a/Samples/Buttons/C#/Buttons.sln b/Samples/Buttons/C#/Buttons.sln index abe37e0e..615fee43 100644 --- a/Samples/Buttons/C#/Buttons.sln +++ b/Samples/Buttons/C#/Buttons.sln @@ -15,16 +15,20 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Buttons-uwp", "Projects\uwp EndProject Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Buttons-windows", "Projects\windows\Buttons-windows.csproj", "{11A5F6A0-A38E-40A0-A662-8DDA40504A0D}" EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Buttons-linux", "Projects\linux\Buttons-linux.csproj", "{344F0E07-6B47-4E30-98C9-987C6833F428}" +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Buttons-linux", "Projects\linux\Buttons-linux.csproj", "{DD9D9907-D6D4-4DD5-B45D-06B15C168CFB}" +EndProject +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Buttons-core", "Projects\core\Buttons-core.csproj", "{1C8433AC-5F30-49BB-B255-AD4CF179C90C}" EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution + Debug|Any CPU = Debug|Any CPU Debug|ARM = Debug|ARM Debug|ARM64 = Debug|ARM64 Debug|iPhone = Debug|iPhone Debug|iPhoneSimulator = Debug|iPhoneSimulator Debug|x64 = Debug|x64 Debug|x86 = Debug|x86 + Release|Any CPU = Release|Any CPU Release|ARM = Release|ARM Release|ARM64 = Release|ARM64 Release|iPhone = Release|iPhone @@ -33,6 +37,7 @@ Global Release|x86 = Release|x86 EndGlobalSection GlobalSection(ProjectConfigurationPlatforms) = postSolution + {86BCC0F4-19B1-4308-B51A-A1DCFF47F9ED}.Debug|Any CPU.ActiveCfg = Debug|x86 {86BCC0F4-19B1-4308-B51A-A1DCFF47F9ED}.Debug|ARM.ActiveCfg = Debug|ARM {86BCC0F4-19B1-4308-B51A-A1DCFF47F9ED}.Debug|ARM.Build.0 = Debug|ARM {86BCC0F4-19B1-4308-B51A-A1DCFF47F9ED}.Debug|ARM.Deploy.0 = Debug|ARM @@ -45,6 +50,7 @@ Global {86BCC0F4-19B1-4308-B51A-A1DCFF47F9ED}.Debug|x86.ActiveCfg = Debug|x86 {86BCC0F4-19B1-4308-B51A-A1DCFF47F9ED}.Debug|x86.Build.0 = Debug|x86 {86BCC0F4-19B1-4308-B51A-A1DCFF47F9ED}.Debug|x86.Deploy.0 = Debug|x86 + {86BCC0F4-19B1-4308-B51A-A1DCFF47F9ED}.Release|Any CPU.ActiveCfg = Release|x86 {86BCC0F4-19B1-4308-B51A-A1DCFF47F9ED}.Release|ARM.ActiveCfg = Release|ARM {86BCC0F4-19B1-4308-B51A-A1DCFF47F9ED}.Release|ARM.Build.0 = Release|ARM {86BCC0F4-19B1-4308-B51A-A1DCFF47F9ED}.Release|ARM.Deploy.0 = Release|ARM @@ -57,6 +63,8 @@ Global {86BCC0F4-19B1-4308-B51A-A1DCFF47F9ED}.Release|x86.ActiveCfg = Release|x86 {86BCC0F4-19B1-4308-B51A-A1DCFF47F9ED}.Release|x86.Build.0 = Release|x86 {86BCC0F4-19B1-4308-B51A-A1DCFF47F9ED}.Release|x86.Deploy.0 = Release|x86 + {5E1D351F-0D23-4669-87F2-9D1A4A0F1A67}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {5E1D351F-0D23-4669-87F2-9D1A4A0F1A67}.Debug|Any CPU.Build.0 = Debug|Any CPU {5E1D351F-0D23-4669-87F2-9D1A4A0F1A67}.Debug|ARM.ActiveCfg = Debug|Any CPU {5E1D351F-0D23-4669-87F2-9D1A4A0F1A67}.Debug|ARM.Build.0 = Debug|Any CPU {5E1D351F-0D23-4669-87F2-9D1A4A0F1A67}.Debug|ARM64.ActiveCfg = Debug|Any CPU @@ -69,6 +77,8 @@ Global {5E1D351F-0D23-4669-87F2-9D1A4A0F1A67}.Debug|x64.Build.0 = Debug|Any CPU {5E1D351F-0D23-4669-87F2-9D1A4A0F1A67}.Debug|x86.ActiveCfg = Debug|Any CPU {5E1D351F-0D23-4669-87F2-9D1A4A0F1A67}.Debug|x86.Build.0 = Debug|Any CPU + {5E1D351F-0D23-4669-87F2-9D1A4A0F1A67}.Release|Any CPU.ActiveCfg = Release|Any CPU + {5E1D351F-0D23-4669-87F2-9D1A4A0F1A67}.Release|Any CPU.Build.0 = Release|Any CPU {5E1D351F-0D23-4669-87F2-9D1A4A0F1A67}.Release|ARM.ActiveCfg = Release|Any CPU {5E1D351F-0D23-4669-87F2-9D1A4A0F1A67}.Release|ARM.Build.0 = Release|Any CPU {5E1D351F-0D23-4669-87F2-9D1A4A0F1A67}.Release|ARM64.ActiveCfg = Release|Any CPU @@ -81,6 +91,7 @@ Global {5E1D351F-0D23-4669-87F2-9D1A4A0F1A67}.Release|x64.Build.0 = Release|Any CPU {5E1D351F-0D23-4669-87F2-9D1A4A0F1A67}.Release|x86.ActiveCfg = Release|Any CPU {5E1D351F-0D23-4669-87F2-9D1A4A0F1A67}.Release|x86.Build.0 = Release|Any CPU + {4AA80AAC-C54C-4667-9E36-7BD0E5F5C686}.Debug|Any CPU.ActiveCfg = Debug|iPhone {4AA80AAC-C54C-4667-9E36-7BD0E5F5C686}.Debug|ARM.ActiveCfg = Debug|iPhoneSimulator {4AA80AAC-C54C-4667-9E36-7BD0E5F5C686}.Debug|ARM64.ActiveCfg = Debug|iPhoneSimulator {4AA80AAC-C54C-4667-9E36-7BD0E5F5C686}.Debug|iPhone.ActiveCfg = Debug|iPhone @@ -91,6 +102,7 @@ Global {4AA80AAC-C54C-4667-9E36-7BD0E5F5C686}.Debug|iPhoneSimulator.Deploy.0 = Debug|iPhoneSimulator {4AA80AAC-C54C-4667-9E36-7BD0E5F5C686}.Debug|x64.ActiveCfg = Debug|iPhoneSimulator {4AA80AAC-C54C-4667-9E36-7BD0E5F5C686}.Debug|x86.ActiveCfg = Debug|iPhoneSimulator + {4AA80AAC-C54C-4667-9E36-7BD0E5F5C686}.Release|Any CPU.ActiveCfg = Release|iPhone {4AA80AAC-C54C-4667-9E36-7BD0E5F5C686}.Release|ARM.ActiveCfg = Release|iPhoneSimulator {4AA80AAC-C54C-4667-9E36-7BD0E5F5C686}.Release|ARM64.ActiveCfg = Release|iPhoneSimulator {4AA80AAC-C54C-4667-9E36-7BD0E5F5C686}.Release|iPhone.ActiveCfg = Release|iPhone @@ -101,6 +113,7 @@ Global {4AA80AAC-C54C-4667-9E36-7BD0E5F5C686}.Release|iPhoneSimulator.Deploy.0 = Release|iPhoneSimulator {4AA80AAC-C54C-4667-9E36-7BD0E5F5C686}.Release|x64.ActiveCfg = Release|iPhoneSimulator {4AA80AAC-C54C-4667-9E36-7BD0E5F5C686}.Release|x86.ActiveCfg = Release|iPhoneSimulator + {2E00DE02-2347-4872-B302-540484C134FA}.Debug|Any CPU.ActiveCfg = Debug|x64 {2E00DE02-2347-4872-B302-540484C134FA}.Debug|ARM.ActiveCfg = Debug|x64 {2E00DE02-2347-4872-B302-540484C134FA}.Debug|ARM64.ActiveCfg = Debug|x64 {2E00DE02-2347-4872-B302-540484C134FA}.Debug|iPhone.ActiveCfg = Debug|x64 @@ -108,6 +121,7 @@ Global {2E00DE02-2347-4872-B302-540484C134FA}.Debug|x64.ActiveCfg = Debug|x64 {2E00DE02-2347-4872-B302-540484C134FA}.Debug|x64.Build.0 = Debug|x64 {2E00DE02-2347-4872-B302-540484C134FA}.Debug|x86.ActiveCfg = Debug|x64 + {2E00DE02-2347-4872-B302-540484C134FA}.Release|Any CPU.ActiveCfg = Release|x64 {2E00DE02-2347-4872-B302-540484C134FA}.Release|ARM.ActiveCfg = Release|x64 {2E00DE02-2347-4872-B302-540484C134FA}.Release|ARM64.ActiveCfg = Release|x64 {2E00DE02-2347-4872-B302-540484C134FA}.Release|iPhone.ActiveCfg = Release|x64 @@ -115,6 +129,7 @@ Global {2E00DE02-2347-4872-B302-540484C134FA}.Release|x64.ActiveCfg = Release|x64 {2E00DE02-2347-4872-B302-540484C134FA}.Release|x64.Build.0 = Release|x64 {2E00DE02-2347-4872-B302-540484C134FA}.Release|x86.ActiveCfg = Release|x64 + {743D749B-EFAB-4F7A-9AEA-C1AF7A16786A}.Debug|Any CPU.ActiveCfg = Debug|x86 {743D749B-EFAB-4F7A-9AEA-C1AF7A16786A}.Debug|ARM.ActiveCfg = Debug|ARM {743D749B-EFAB-4F7A-9AEA-C1AF7A16786A}.Debug|ARM.Build.0 = Debug|ARM {743D749B-EFAB-4F7A-9AEA-C1AF7A16786A}.Debug|ARM.Deploy.0 = Debug|ARM @@ -127,6 +142,7 @@ Global {743D749B-EFAB-4F7A-9AEA-C1AF7A16786A}.Debug|x86.ActiveCfg = Debug|x86 {743D749B-EFAB-4F7A-9AEA-C1AF7A16786A}.Debug|x86.Build.0 = Debug|x86 {743D749B-EFAB-4F7A-9AEA-C1AF7A16786A}.Debug|x86.Deploy.0 = Debug|x86 + {743D749B-EFAB-4F7A-9AEA-C1AF7A16786A}.Release|Any CPU.ActiveCfg = Release|x86 {743D749B-EFAB-4F7A-9AEA-C1AF7A16786A}.Release|ARM.ActiveCfg = Release|ARM {743D749B-EFAB-4F7A-9AEA-C1AF7A16786A}.Release|ARM.Build.0 = Release|ARM {743D749B-EFAB-4F7A-9AEA-C1AF7A16786A}.Release|ARM.Deploy.0 = Release|ARM @@ -139,6 +155,7 @@ Global {743D749B-EFAB-4F7A-9AEA-C1AF7A16786A}.Release|x86.ActiveCfg = Release|x86 {743D749B-EFAB-4F7A-9AEA-C1AF7A16786A}.Release|x86.Build.0 = Release|x86 {743D749B-EFAB-4F7A-9AEA-C1AF7A16786A}.Release|x86.Deploy.0 = Release|x86 + {11A5F6A0-A38E-40A0-A662-8DDA40504A0D}.Debug|Any CPU.ActiveCfg = Debug|x86 {11A5F6A0-A38E-40A0-A662-8DDA40504A0D}.Debug|ARM.ActiveCfg = Debug|x86 {11A5F6A0-A38E-40A0-A662-8DDA40504A0D}.Debug|ARM64.ActiveCfg = Debug|x64 {11A5F6A0-A38E-40A0-A662-8DDA40504A0D}.Debug|iPhone.ActiveCfg = Debug|x86 @@ -147,6 +164,7 @@ Global {11A5F6A0-A38E-40A0-A662-8DDA40504A0D}.Debug|x64.Build.0 = Debug|x64 {11A5F6A0-A38E-40A0-A662-8DDA40504A0D}.Debug|x86.ActiveCfg = Debug|x86 {11A5F6A0-A38E-40A0-A662-8DDA40504A0D}.Debug|x86.Build.0 = Debug|x86 + {11A5F6A0-A38E-40A0-A662-8DDA40504A0D}.Release|Any CPU.ActiveCfg = Release|x86 {11A5F6A0-A38E-40A0-A662-8DDA40504A0D}.Release|ARM.ActiveCfg = Release|x86 {11A5F6A0-A38E-40A0-A662-8DDA40504A0D}.Release|ARM64.ActiveCfg = Release|x64 {11A5F6A0-A38E-40A0-A662-8DDA40504A0D}.Release|iPhone.ActiveCfg = Release|x86 @@ -155,22 +173,52 @@ Global {11A5F6A0-A38E-40A0-A662-8DDA40504A0D}.Release|x64.Build.0 = Release|x64 {11A5F6A0-A38E-40A0-A662-8DDA40504A0D}.Release|x86.ActiveCfg = Release|x86 {11A5F6A0-A38E-40A0-A662-8DDA40504A0D}.Release|x86.Build.0 = Release|x86 - {344F0E07-6B47-4E30-98C9-987C6833F428}.Debug|ARM.ActiveCfg = Debug|x86 - {344F0E07-6B47-4E30-98C9-987C6833F428}.Debug|ARM64.ActiveCfg = Debug|x86 - {344F0E07-6B47-4E30-98C9-987C6833F428}.Debug|iPhone.ActiveCfg = Debug|x86 - {344F0E07-6B47-4E30-98C9-987C6833F428}.Debug|iPhoneSimulator.ActiveCfg = Debug|x86 - {344F0E07-6B47-4E30-98C9-987C6833F428}.Debug|x64.ActiveCfg = Debug|x64 - {344F0E07-6B47-4E30-98C9-987C6833F428}.Debug|x64.Build.0 = Debug|x64 - {344F0E07-6B47-4E30-98C9-987C6833F428}.Debug|x86.ActiveCfg = Debug|x86 - {344F0E07-6B47-4E30-98C9-987C6833F428}.Debug|x86.Build.0 = Debug|x86 - {344F0E07-6B47-4E30-98C9-987C6833F428}.Release|ARM.ActiveCfg = Release|x86 - {344F0E07-6B47-4E30-98C9-987C6833F428}.Release|ARM64.ActiveCfg = Release|x86 - {344F0E07-6B47-4E30-98C9-987C6833F428}.Release|iPhone.ActiveCfg = Release|x86 - {344F0E07-6B47-4E30-98C9-987C6833F428}.Release|iPhoneSimulator.ActiveCfg = Release|x86 - {344F0E07-6B47-4E30-98C9-987C6833F428}.Release|x64.ActiveCfg = Release|x64 - {344F0E07-6B47-4E30-98C9-987C6833F428}.Release|x64.Build.0 = Release|x64 - {344F0E07-6B47-4E30-98C9-987C6833F428}.Release|x86.ActiveCfg = Release|x86 - {344F0E07-6B47-4E30-98C9-987C6833F428}.Release|x86.Build.0 = Release|x86 + {DD9D9907-D6D4-4DD5-B45D-06B15C168CFB}.Debug|Any CPU.ActiveCfg = Debug|x86 + {DD9D9907-D6D4-4DD5-B45D-06B15C168CFB}.Debug|ARM.ActiveCfg = Debug|x86 + {DD9D9907-D6D4-4DD5-B45D-06B15C168CFB}.Debug|ARM64.ActiveCfg = Debug|x86 + {DD9D9907-D6D4-4DD5-B45D-06B15C168CFB}.Debug|iPhone.ActiveCfg = Debug|x86 + {DD9D9907-D6D4-4DD5-B45D-06B15C168CFB}.Debug|iPhoneSimulator.ActiveCfg = Debug|x86 + {DD9D9907-D6D4-4DD5-B45D-06B15C168CFB}.Debug|x64.ActiveCfg = Debug|x64 + {DD9D9907-D6D4-4DD5-B45D-06B15C168CFB}.Debug|x64.Build.0 = Debug|x64 + {DD9D9907-D6D4-4DD5-B45D-06B15C168CFB}.Debug|x86.ActiveCfg = Debug|x86 + {DD9D9907-D6D4-4DD5-B45D-06B15C168CFB}.Debug|x86.Build.0 = Debug|x86 + {DD9D9907-D6D4-4DD5-B45D-06B15C168CFB}.Release|Any CPU.ActiveCfg = Release|x86 + {DD9D9907-D6D4-4DD5-B45D-06B15C168CFB}.Release|ARM.ActiveCfg = Release|x86 + {DD9D9907-D6D4-4DD5-B45D-06B15C168CFB}.Release|ARM64.ActiveCfg = Release|x86 + {DD9D9907-D6D4-4DD5-B45D-06B15C168CFB}.Release|iPhone.ActiveCfg = Release|x86 + {DD9D9907-D6D4-4DD5-B45D-06B15C168CFB}.Release|iPhoneSimulator.ActiveCfg = Release|x86 + {DD9D9907-D6D4-4DD5-B45D-06B15C168CFB}.Release|x64.ActiveCfg = Release|x64 + {DD9D9907-D6D4-4DD5-B45D-06B15C168CFB}.Release|x64.Build.0 = Release|x64 + {DD9D9907-D6D4-4DD5-B45D-06B15C168CFB}.Release|x86.ActiveCfg = Release|x86 + {DD9D9907-D6D4-4DD5-B45D-06B15C168CFB}.Release|x86.Build.0 = Release|x86 + {1C8433AC-5F30-49BB-B255-AD4CF179C90C}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {1C8433AC-5F30-49BB-B255-AD4CF179C90C}.Debug|Any CPU.Build.0 = Debug|Any CPU + {1C8433AC-5F30-49BB-B255-AD4CF179C90C}.Debug|ARM.ActiveCfg = Debug|Any CPU + {1C8433AC-5F30-49BB-B255-AD4CF179C90C}.Debug|ARM.Build.0 = Debug|Any CPU + {1C8433AC-5F30-49BB-B255-AD4CF179C90C}.Debug|ARM64.ActiveCfg = Debug|Any CPU + {1C8433AC-5F30-49BB-B255-AD4CF179C90C}.Debug|ARM64.Build.0 = Debug|Any CPU + {1C8433AC-5F30-49BB-B255-AD4CF179C90C}.Debug|iPhone.ActiveCfg = Debug|Any CPU + {1C8433AC-5F30-49BB-B255-AD4CF179C90C}.Debug|iPhone.Build.0 = Debug|Any CPU + {1C8433AC-5F30-49BB-B255-AD4CF179C90C}.Debug|iPhoneSimulator.ActiveCfg = Debug|Any CPU + {1C8433AC-5F30-49BB-B255-AD4CF179C90C}.Debug|iPhoneSimulator.Build.0 = Debug|Any CPU + {1C8433AC-5F30-49BB-B255-AD4CF179C90C}.Debug|x64.ActiveCfg = Debug|Any CPU + {1C8433AC-5F30-49BB-B255-AD4CF179C90C}.Debug|x64.Build.0 = Debug|Any CPU + {1C8433AC-5F30-49BB-B255-AD4CF179C90C}.Debug|x86.ActiveCfg = Debug|Any CPU + {1C8433AC-5F30-49BB-B255-AD4CF179C90C}.Debug|x86.Build.0 = Debug|Any CPU + {1C8433AC-5F30-49BB-B255-AD4CF179C90C}.Release|Any CPU.ActiveCfg = Release|Any CPU + {1C8433AC-5F30-49BB-B255-AD4CF179C90C}.Release|Any CPU.Build.0 = Release|Any CPU + {1C8433AC-5F30-49BB-B255-AD4CF179C90C}.Release|ARM.ActiveCfg = Release|Any CPU + {1C8433AC-5F30-49BB-B255-AD4CF179C90C}.Release|ARM.Build.0 = Release|Any CPU + {1C8433AC-5F30-49BB-B255-AD4CF179C90C}.Release|ARM64.ActiveCfg = Release|Any CPU + {1C8433AC-5F30-49BB-B255-AD4CF179C90C}.Release|ARM64.Build.0 = Release|Any CPU + {1C8433AC-5F30-49BB-B255-AD4CF179C90C}.Release|iPhone.ActiveCfg = Release|Any CPU + {1C8433AC-5F30-49BB-B255-AD4CF179C90C}.Release|iPhone.Build.0 = Release|Any CPU + {1C8433AC-5F30-49BB-B255-AD4CF179C90C}.Release|iPhoneSimulator.ActiveCfg = Release|Any CPU + {1C8433AC-5F30-49BB-B255-AD4CF179C90C}.Release|iPhoneSimulator.Build.0 = Release|Any CPU + {1C8433AC-5F30-49BB-B255-AD4CF179C90C}.Release|x64.ActiveCfg = Release|Any CPU + {1C8433AC-5F30-49BB-B255-AD4CF179C90C}.Release|x64.Build.0 = Release|Any CPU + {1C8433AC-5F30-49BB-B255-AD4CF179C90C}.Release|x86.ActiveCfg = Release|Any CPU + {1C8433AC-5F30-49BB-B255-AD4CF179C90C}.Release|x86.Build.0 = Release|Any CPU EndGlobalSection GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE diff --git a/Samples/Buttons/C#/Projects/core/App.cs b/Samples/Buttons/C#/Projects/core/App.cs new file mode 100644 index 00000000..f8cfbb52 --- /dev/null +++ b/Samples/Buttons/C#/Projects/core/App.cs @@ -0,0 +1,50 @@ +using NoesisApp; +using System; +using System.Diagnostics; +using System.Runtime.InteropServices; +using System.Threading; + +namespace Buttons +{ + partial class App : Application + { + protected override Display CreateDisplay() + { + if (RuntimeInformation.IsOSPlatform(OSPlatform.Linux)) + { + return new XDisplay(); + } + else if(RuntimeInformation.IsOSPlatform(OSPlatform.Windows)) + { + return new Win32Display(); + } + else + { + throw new PlatformNotSupportedException(); + } + } + + protected override RenderContext CreateRenderContext() + { + if (RuntimeInformation.IsOSPlatform(OSPlatform.Linux)) + { + //return new RenderContextGLX(); + return new RenderContextEGL(); + } + else if (RuntimeInformation.IsOSPlatform(OSPlatform.Windows)) + { + return new RenderContextWGL(); + } + else + { + throw new PlatformNotSupportedException(); + } + } + static void Main(string[] args) + { + App app = new App(); + app.Uri = "App.xaml"; + app.Run(); + } + } +} diff --git a/Samples/Buttons/C#/Projects/core/Buttons-core.csproj b/Samples/Buttons/C#/Projects/core/Buttons-core.csproj new file mode 100644 index 00000000..5fd3c865 --- /dev/null +++ b/Samples/Buttons/C#/Projects/core/Buttons-core.csproj @@ -0,0 +1,69 @@ + + + + Exe + netcoreapp3.0 + Buttons + false + win-x64;linux-x64;linux-arm64 + + + + true + TRACE;DEBUG;NOESIS + portable + prompt + + + TRACE;NOESIS + true + pdbonly + prompt + + + + App.xaml + + + MainWindow.xaml + + + Properties\AssemblyInfo.cs + + + ViewModel.cs + + + DelegateCommand.cs + + + + + Designer + + + Designer + + + Designer + + + AudioClick.mp3 + + + AudioSlide.mp3 + + + Aero Matics Regular.ttf + + + + + + + + + + + + diff --git a/Samples/Buttons/C#/Projects/linux/App.cs b/Samples/Buttons/C#/Projects/linux/App.cs index e21ef183..8b88dd5d 100644 --- a/Samples/Buttons/C#/Projects/linux/App.cs +++ b/Samples/Buttons/C#/Projects/linux/App.cs @@ -11,7 +11,8 @@ protected override Display CreateDisplay() protected override RenderContext CreateRenderContext() { - return new RenderContextGLX(); + return new RenderContextEGL(); + //return new RenderContextGLX(); } static void Main(string[] args) diff --git a/Samples/Buttons/C#/Projects/linux/Buttons-linux.csproj b/Samples/Buttons/C#/Projects/linux/Buttons-linux.csproj index 64b4bcb2..57af143c 100644 --- a/Samples/Buttons/C#/Projects/linux/Buttons-linux.csproj +++ b/Samples/Buttons/C#/Projects/linux/Buttons-linux.csproj @@ -13,6 +13,9 @@ 512 true + false + bin\$(Configuration)\$(Platform)\ + linux publish\ true Disk @@ -25,11 +28,8 @@ true 0 1.0.0.%2a - false false true - bin\$(Configuration)\$(Platform)\ - linux @@ -115,10 +115,25 @@ 2.2.1 + + 2.2.1 + 2.2.1 + + + False + Microsoft .NET Framework 4.6.1 %28x86 and x64%29 + true + + + False + .NET Framework 3.5 SP1 + false + +