Skip to content

Commit

Permalink
Update for C2CS v6
Browse files Browse the repository at this point in the history
  • Loading branch information
lithiumtoast committed Jul 9, 2023
1 parent d13b342 commit ea7fed1
Show file tree
Hide file tree
Showing 11 changed files with 1,134 additions and 964 deletions.
50 changes: 50 additions & 0 deletions .editorconfig
Original file line number Diff line number Diff line change
@@ -0,0 +1,50 @@
# This file is the top-most EditorConfig file
root = true

# All Files
[*]
charset = utf-8
indent_style = space
indent_size = 4
insert_final_newline = true
trim_trailing_whitespace = true

# Visual Studio Solution Files
[*.sln]
indent_style = tab

# Visual Studio XML Project Files
[*.{csproj,vbproj,vcxproj.filters,proj,projitems,shproj}]
indent_size = 2

# XML Configuration Files
[*.{xml,config,props,targets,nuspec,resx,ruleset,vsixmanifest,vsct}]
indent_size = 2

# JSON Files
[*.{json,json5,webmanifest}]
indent_size = 2

# YAML Files
[*.{yml,yaml}]
indent_size = 2

# Markdown Files
[*.md]
trim_trailing_whitespace = false

# Web Files
[*.{htm,html,js,jsm,ts,tsx,css,sass,scss,less,svg,vue}]
indent_size = 2

# Batch Files
[*.{cmd,bat}]
end_of_line = crlf

# Bash Files
[*.sh]
end_of_line = lf

# Makefiles
[Makefile]
indent_style = tab
9 changes: 2 additions & 7 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,7 @@
.idea/

# C# build artifacts
/bin/
/obj/
/artifacts/

# C# packages
/nupkg/
Expand All @@ -16,8 +15,4 @@
/bindgen/x-ast/

# macOS
.DS_store

# scripts
/build
/ext/scripts
.DS_store
10 changes: 0 additions & 10 deletions SDL.props
Original file line number Diff line number Diff line change
Expand Up @@ -8,16 +8,6 @@
<_LinkDirectoryPath>bottlenoselabs/$(_LibraryName)/</_LinkDirectoryPath>
</PropertyGroup>

<!-- C# source code-->
<ItemGroup>
<Compile Include="$(_SourceCodeDirectoryPath)/**/*.cs" >
<Pack>false</Pack>
<Link>$(_LinkDirectoryPath)/%(RecursiveDir)%(Filename)%(Extension)</Link>
</Compile>
<Compile Remove="$(_SourceCodeDirectoryPath)/obj/**/*.cs" />
<Compile Remove="$(_SourceCodeDirectoryPath)/bin/**/*.cs" />
</ItemGroup>

<!-- Dynamic link libraries -->
<ItemGroup>
<Content Include="$(_LibraryDirectoryPath)/*.dll">
Expand Down
2 changes: 1 addition & 1 deletion bindgen/config-generate-cs.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"inputFilePath": "./x-ast/ast-cross-platform.json",
"outputFilePath": "./../src/cs/production/SDL/SDL.gen.cs",
"outputFileDirectory": "./../src/cs/production/SDL/Generated",
"namespaceName": "bottlenoselabs",
"className": "SDL",
"libraryName": "SDL3",
Expand Down
10 changes: 4 additions & 6 deletions src/cs/Directory.Build.props
Original file line number Diff line number Diff line change
@@ -1,10 +1,8 @@
<Project>

<!-- MSBuild settings -->
<PropertyGroup>
<BaseOutputPath>$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), .gitignore))/bin/$(MSBuildProjectName)</BaseOutputPath>
<BaseIntermediateOutputPath>$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), .gitignore))/obj/$(MSBuildProjectName)/$(Configuration)</BaseIntermediateOutputPath>
<MSBuildProjectExtensionsPath>$(BaseIntermediateOutputPath)</MSBuildProjectExtensionsPath>
</PropertyGroup>
<PropertyGroup>
<UseArtifactsOutput>true</UseArtifactsOutput>
<ArtifactsPath>$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildProjectDirectory), .gitignore))/artifacts</ArtifactsPath>
</PropertyGroup>

</Project>
26 changes: 26 additions & 0 deletions src/cs/production/SDL/Generated/AssemblyAttributes.gen.cs
Original file line number Diff line number Diff line change
@@ -0,0 +1,26 @@
// To disable generating this file set `isEnabledGenerateAssemblyAttributes` to `false` in the config file for generating C# code.
// <auto-generated>
// This code was generated by the following tool on 2023-07-09 13:28:21 GMT-04:00:
// https://github.com/bottlenoselabs/c2cs (v1.0.0.0)
//
// Changes to this file may cause incorrect behavior and will be lost if the code is regenerated.
// </auto-generated>
// ReSharper disable All

#region Template
#nullable enable
#pragma warning disable CS1591
#pragma warning disable CS8981
using System;
using System.Collections.Generic;
using System.Globalization;
using System.Runtime.InteropServices;
using System.Runtime.CompilerServices;
using static bottlenoselabs.C2CS.Runtime;
#endregion

#if NET7_0_OR_GREATER
[assembly: DisableRuntimeMarshalling]
#endif

[assembly: DefaultDllImportSearchPathsAttribute(DllImportSearchPath.SafeDirectories)]
Loading

0 comments on commit ea7fed1

Please sign in to comment.