diff options
| author | Jean-Philippe Bruyère <jp_bruyere@hotmail.com> | 2019-08-03 11:09:18 +0200 |
|---|---|---|
| committer | j-p <jp_bruyere@hotmail.com> | 2019-08-28 11:32:06 +0200 |
| commit | 3ebbf86e007af2ab49f5e50d8b36f63e00c29c81 (patch) | |
| tree | a91a9684d4770aa1fd33403dc365c98335f5c6c9 | |
| parent | 42ff911416db22dc16b7041d5e5e92421d69bfd8 (diff) | |
restore bindingsHelpers, update deps
| -rw-r--r-- | VK/BindingsHelpers.cs | 4 | ||||
| -rw-r--r-- | VK/vulkan.csproj | 4 | ||||
| -rw-r--r-- | samples/compute/compute.csproj | 4 | ||||
| -rw-r--r-- | vk.net.sln | 5 | ||||
| -rw-r--r-- | vke/CVKL.csproj | 4 |
5 files changed, 13 insertions, 8 deletions
diff --git a/VK/BindingsHelpers.cs b/VK/BindingsHelpers.cs index a0dabec..45ba40a 100644 --- a/VK/BindingsHelpers.cs +++ b/VK/BindingsHelpers.cs @@ -4,7 +4,7 @@ using System.Runtime.InteropServices; using System.Text; namespace VK { - /*public static class BindingsHelpers + public static class BindingsHelpers { public static unsafe StringHandle StringToHGlobalUtf8(string s) { @@ -28,7 +28,7 @@ namespace VK { public struct StringHandle { public IntPtr Handle; - }*/ + } //public partial struct VkQueue //{ // unsafe public VkResult submit (VkCommandBuffer cmd, VkSemaphore waitSemaphore, VkSemaphore signalSemaphore, VkFence waitFence) diff --git a/VK/vulkan.csproj b/VK/vulkan.csproj index f385699..c28391f 100644 --- a/VK/vulkan.csproj +++ b/VK/vulkan.csproj @@ -4,7 +4,7 @@ <TargetFrameworks>net471;netstandard2.0</TargetFrameworks> <Copyright></Copyright> - <AssemblyVersion>0.1.3</AssemblyVersion> + <AssemblyVersion>0.1.4</AssemblyVersion> <AssemblyName>VK</AssemblyName> <Description>C# vulkan binding</Description> <Company></Company> @@ -12,7 +12,7 @@ <PackageId>Vulkan</PackageId> <PackageTags>C# vulkan net binding</PackageTags> - <PackageVersion>$(AssemblyVersion)</PackageVersion> + <PackageVersion>$(AssemblyVersion)-beta</PackageVersion> <GeneratePackageOnBuild>True</GeneratePackageOnBuild> <PackageProjectUrl>https://github.com/jpbruyere/vk.net/blob/master/README.md</PackageProjectUrl> <PackageLicense>https://opensource.org/licenses/MIT</PackageLicense> diff --git a/samples/compute/compute.csproj b/samples/compute/compute.csproj index eb57ecc..09e76c4 100644 --- a/samples/compute/compute.csproj +++ b/samples/compute/compute.csproj @@ -14,8 +14,8 @@ <DefineConstants>TRACE;DEBUG;NETSTANDARD;NETSTANDARD2_0</DefineConstants> </PropertyGroup> <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' "> - <AllowUnsafeBlocks></AllowUnsafeBlocks> - <DefineConstants></DefineConstants> + <AllowUnsafeBlocks>true</AllowUnsafeBlocks> + <DefineConstants>TRACE;RELEASE;NETFRAMEWORK;NET471</DefineConstants> <DefineConstants>TRACE;RELEASE;NETFRAMEWORK;NET471</DefineConstants> <AllowUnsafeBlocks>true</AllowUnsafeBlocks> </PropertyGroup> @@ -38,11 +38,13 @@ Global {96A2E0B8-91AE-4EB9-A435-185D01E24067}.temp|Any CPU.ActiveCfg = Debug|Any CPU {96A2E0B8-91AE-4EB9-A435-185D01E24067}.DebugCrow|Any CPU.ActiveCfg = Debug|Any CPU {96A2E0B8-91AE-4EB9-A435-185D01E24067}.Debug|Any CPU.Build.0 = Debug|Any CPU + {96A2E0B8-91AE-4EB9-A435-185D01E24067}.Release|Any CPU.Build.0 = Release|Any CPU {96A2A7896-91AE-4EB9-A435-185D01E24067}.Debug|Any CPU.ActiveCfg = Debug|Any CPU {96A2A7896-91AE-4EB9-A435-185D01E24067}.Release|Any CPU.ActiveCfg = Release|Any CPU {96A2A7896-91AE-4EB9-A435-185D01E24067}.temp|Any CPU.ActiveCfg = Debug|Any CPU {96A2A7896-91AE-4EB9-A435-185D01E24067}.DebugCrow|Any CPU.ActiveCfg = Debug|Any CPU {96A2A7896-91AE-4EB9-A435-185D01E24067}.Debug|Any CPU.Build.0 = Debug|Any CPU + {96A2A7896-91AE-4EB9-A435-185D01E24067}.Release|Any CPU.Build.0 = Release|Any CPU {87AC7BE1-143E-4FF4-91F8-981B1CAAF1DD}.Debug|Any CPU.ActiveCfg = Debug|Any CPU {87AC7BE1-143E-4FF4-91F8-981B1CAAF1DD}.Release|Any CPU.ActiveCfg = Release|Any CPU {87AC7BE1-143E-4FF4-91F8-981B1CAAF1DD}.Release|Any CPU.Build.0 = Release|Any CPU @@ -79,6 +81,7 @@ Global {001F5D64-871B-47A4-A823-78C7CE3785AA}.temp|Any CPU.ActiveCfg = Debug|Any CPU {001F5D64-871B-47A4-A823-78C7CE3785AA}.DebugCrow|Any CPU.ActiveCfg = Debug|Any CPU {001F5D64-871B-47A4-A823-78C7CE3785AA}.Debug|Any CPU.Build.0 = Debug|Any CPU + {001F5D64-871B-47A4-A823-78C7CE3785AA}.Release|Any CPU.Build.0 = Release|Any CPU {BFF1BEEC-2E93-4963-AD3C-2A8C9BA05C36}.Debug|Any CPU.ActiveCfg = Debug|Any CPU {BFF1BEEC-2E93-4963-AD3C-2A8C9BA05C36}.Debug|Any CPU.Build.0 = Debug|Any CPU {BFF1BEEC-2E93-4963-AD3C-2A8C9BA05C36}.temp|Any CPU.ActiveCfg = Debug|Any CPU @@ -91,6 +94,7 @@ Global {05515E15-D3C3-4A8C-A940-9467D9D77823}.DebugCrow|Any CPU.ActiveCfg = Debug|Any CPU {05515E15-D3C3-4A8C-A940-9467D9D77823}.Debug|Any CPU.Build.0 = Debug|Any CPU {05515E15-D3C3-4A8C-A940-9467D9D77823}.Release|Any CPU.ActiveCfg = Release|Any CPU + {05515E15-D3C3-4A8C-A940-9467D9D77823}.Release|Any CPU.Build.0 = Release|Any CPU {790642C5-7AD1-437D-9F9C-3F721133AFEF}.Debug|Any CPU.ActiveCfg = Debug|Any CPU {790642C5-7AD1-437D-9F9C-3F721133AFEF}.Debug|Any CPU.Build.0 = Debug|Any CPU {790642C5-7AD1-437D-9F9C-3F721133AFEF}.Release|Any CPU.ActiveCfg = Release|Any CPU @@ -98,6 +102,7 @@ Global {790642C5-7AD1-437D-9F9C-3F721133AFEF}.temp|Any CPU.Build.0 = Debug|Any CPU {790642C5-7AD1-437D-9F9C-3F721133AFEF}.DebugCrow|Any CPU.ActiveCfg = Debug|Any CPU {790642C5-7AD1-437D-9F9C-3F721133AFEF}.DebugCrow|Any CPU.Build.0 = Debug|Any CPU + {790642C5-7AD1-437D-9F9C-3F721133AFEF}.Release|Any CPU.Build.0 = Release|Any CPU EndGlobalSection GlobalSection(NestedProjects) = preSolution {96A2E0B8-91AE-4EB9-A435-185D01E24067} = {A2A2849A-0032-4AA8-BC0E-82C69D7DE354} diff --git a/vke/CVKL.csproj b/vke/CVKL.csproj index aa1b684..c9fd9a3 100644 --- a/vke/CVKL.csproj +++ b/vke/CVKL.csproj @@ -4,13 +4,13 @@ <TargetFrameworks>net471;netstandard2.0</TargetFrameworks> <Copyright></Copyright> - <AssemblyVersion>0.1.4</AssemblyVersion> + <AssemblyVersion>0.1.5</AssemblyVersion> <Description>C# vulkan library with IDispose model and references counting</Description> <Company></Company> <Product>CVKL</Product> <PackageId>CVKL</PackageId> <PackageTags>C# vulkan game library compute glfw</PackageTags> - <PackageVersion>$(AssemblyVersion)</PackageVersion> + <PackageVersion>$(AssemblyVersion)-beta</PackageVersion> <GeneratePackageOnBuild>True</GeneratePackageOnBuild> <PackageRequireLicenseAcceptance>False</PackageRequireLicenseAcceptance> <PackageProjectUrl>https://github.com/jpbruyere/vk.net/blob/master/README.md</PackageProjectUrl> |