Skip to content

Commit 67f6008

Browse files
JunaMeinholdJunaMeinhold
committed
Upgraded HexaGen and to .net9.0
1 parent 8b3ed7d commit 67f6008

29 files changed

+8992
-8284
lines changed

‎Generator/Generator.csproj‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
</PropertyGroup>
99

1010
<ItemGroup>
11-
<PackageReference Include="HexaGen" Version="1.1.4" />
11+
<PackageReference Include="HexaGen" Version="1.1.15-rc18" />
1212
</ItemGroup>
1313

1414
<ItemGroup>

‎Generator/Program.cs‎

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,8 @@
11
using HexaGen;
22
using HexaGen.Patching;
33

4-
CsCodeGeneratorConfig config = CsCodeGeneratorConfig.Load("generator.json");
5-
CsCodeGenerator generator = new(config);
6-
generator.PatchEngine.RegisterPrePatch(new NamingPatch(["Raylib"], NamingPatchOptions.None));
7-
generator.Generate([.. Directory.GetFiles("include")], "../../../../Hexa.NET.Raylib/Generated");
4+
BatchGenerator batch = new();
5+
batch.Start()
6+
.Setup<CsCodeGenerator>("generator.json")
7+
.AddPrePatch(new NamingPatch(["Raylib"], NamingPatchOptions.None))
8+
.Generate([.. Directory.GetFiles("include")], "../../../../Hexa.NET.Raylib/Generated");

‎Generator/generator.json‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,6 @@
77
"GenerateSizeOfStructs": false,
88
"GeneratePlaceholderComments": false,
99
"GenerateMetadata": true,
10-
"ImportType": "VTable",
1110
"ConstantNamingConvention": "Unknown",
1211
"TypeMappings": {
1312
"ssize_t": "nint",

‎Hexa.NET.Raylib/AssemblyInfo.cs‎

Lines changed: 1 addition & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,6 @@
1-
using HexaGen.Runtime;
2-
3-
#if NET7_0_OR_GREATER
1+
#if NET7_0_OR_GREATER
42

53
using System.Runtime.CompilerServices;
64

75
[assembly: DisableRuntimeMarshalling]
86
#endif
9-
10-
[assembly: NativeLibrary("raylib", TargetPlatform.Windows)]
11-
[assembly: NativeLibrary("libraylib", TargetPlatform.Linux)]
12-
[assembly: NativeLibrary("libraylib", TargetPlatform.OSX)]
13-
[assembly: NativeLibrary("libraylib", TargetPlatform.Android)]

‎Hexa.NET.Raylib/Generated/Delegates/Delegates.000.cs‎

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ namespace Hexa.NET.Raylib
2323
/// </summary>
2424
[NativeName(NativeNameType.Delegate, "TraceLogCallback")]
2525
[UnmanagedFunctionPointer(CallingConvention.Cdecl)]
26-
public unsafe delegate void TraceLogCallback([NativeName(NativeNameType.Param, "logLevel")] [NativeName(NativeNameType.Type, "int")] int logLevel, [NativeName(NativeNameType.Param, "text")] [NativeName(NativeNameType.Type, "const char*")] byte* text, [NativeName(NativeNameType.Param, "args")] [NativeName(NativeNameType.Type, "va_list")] nint args);
26+
public unsafe delegate void TraceLogCallback([NativeName(NativeNameType.Param, "logLevel")] [NativeName(NativeNameType.Type, "int")] int logLevel, [NativeName(NativeNameType.Param, "text")] [NativeName(NativeNameType.Type, "char const *")] byte* text, [NativeName(NativeNameType.Param, "args")] [NativeName(NativeNameType.Type, "va_list")] nint args);
2727

2828
#else
2929
/// <summary>
@@ -32,55 +32,55 @@ namespace Hexa.NET.Raylib
3232
/// </summary>
3333
[NativeName(NativeNameType.Delegate, "TraceLogCallback")]
3434
[UnmanagedFunctionPointer(CallingConvention.Cdecl)]
35-
public unsafe delegate void TraceLogCallback([NativeName(NativeNameType.Param, "logLevel")] [NativeName(NativeNameType.Type, "int")] int logLevel, [NativeName(NativeNameType.Param, "text")] [NativeName(NativeNameType.Type, "const char*")] nint text, [NativeName(NativeNameType.Param, "args")] [NativeName(NativeNameType.Type, "va_list")] nint args);
35+
public unsafe delegate void TraceLogCallback([NativeName(NativeNameType.Param, "logLevel")] [NativeName(NativeNameType.Type, "int")] int logLevel, [NativeName(NativeNameType.Param, "text")] [NativeName(NativeNameType.Type, "char const *")] nint text, [NativeName(NativeNameType.Param, "args")] [NativeName(NativeNameType.Type, "va_list")] nint args);
3636

3737
#endif
3838

3939
#if NET5_0_OR_GREATER
4040
[NativeName(NativeNameType.Delegate, "LoadFileDataCallback")]
4141
[UnmanagedFunctionPointer(CallingConvention.Cdecl)]
42-
public unsafe delegate byte* LoadFileDataCallback([NativeName(NativeNameType.Param, "fileName")] [NativeName(NativeNameType.Type, "const char*")] byte* fileName, [NativeName(NativeNameType.Param, "dataSize")] [NativeName(NativeNameType.Type, "int*")] int* dataSize);
42+
public unsafe delegate byte* LoadFileDataCallback([NativeName(NativeNameType.Param, "fileName")] [NativeName(NativeNameType.Type, "char const *")] byte* fileName, [NativeName(NativeNameType.Param, "dataSize")] [NativeName(NativeNameType.Type, "int *")] int* dataSize);
4343

4444
#else
4545
[NativeName(NativeNameType.Delegate, "LoadFileDataCallback")]
4646
[UnmanagedFunctionPointer(CallingConvention.Cdecl)]
47-
public unsafe delegate nint LoadFileDataCallback([NativeName(NativeNameType.Param, "fileName")] [NativeName(NativeNameType.Type, "const char*")] nint fileName, [NativeName(NativeNameType.Param, "dataSize")] [NativeName(NativeNameType.Type, "int*")] nint dataSize);
47+
public unsafe delegate nint LoadFileDataCallback([NativeName(NativeNameType.Param, "fileName")] [NativeName(NativeNameType.Type, "char const *")] nint fileName, [NativeName(NativeNameType.Param, "dataSize")] [NativeName(NativeNameType.Type, "int *")] nint dataSize);
4848

4949
#endif
5050

5151
#if NET5_0_OR_GREATER
5252
[NativeName(NativeNameType.Delegate, "SaveFileDataCallback")]
5353
[UnmanagedFunctionPointer(CallingConvention.Cdecl)]
54-
public unsafe delegate byte SaveFileDataCallback([NativeName(NativeNameType.Param, "fileName")] [NativeName(NativeNameType.Type, "const char*")] byte* fileName, [NativeName(NativeNameType.Param, "data")] [NativeName(NativeNameType.Type, "void*")] void* data, [NativeName(NativeNameType.Param, "dataSize")] [NativeName(NativeNameType.Type, "int")] int dataSize);
54+
public unsafe delegate byte SaveFileDataCallback([NativeName(NativeNameType.Param, "fileName")] [NativeName(NativeNameType.Type, "char const *")] byte* fileName, [NativeName(NativeNameType.Param, "data")] [NativeName(NativeNameType.Type, "void *")] void* data, [NativeName(NativeNameType.Param, "dataSize")] [NativeName(NativeNameType.Type, "int")] int dataSize);
5555

5656
#else
5757
[NativeName(NativeNameType.Delegate, "SaveFileDataCallback")]
5858
[UnmanagedFunctionPointer(CallingConvention.Cdecl)]
59-
public unsafe delegate byte SaveFileDataCallback([NativeName(NativeNameType.Param, "fileName")] [NativeName(NativeNameType.Type, "const char*")] nint fileName, [NativeName(NativeNameType.Param, "data")] [NativeName(NativeNameType.Type, "void*")] nint data, [NativeName(NativeNameType.Param, "dataSize")] [NativeName(NativeNameType.Type, "int")] int dataSize);
59+
public unsafe delegate byte SaveFileDataCallback([NativeName(NativeNameType.Param, "fileName")] [NativeName(NativeNameType.Type, "char const *")] nint fileName, [NativeName(NativeNameType.Param, "data")] [NativeName(NativeNameType.Type, "void *")] nint data, [NativeName(NativeNameType.Param, "dataSize")] [NativeName(NativeNameType.Type, "int")] int dataSize);
6060

6161
#endif
6262

6363
#if NET5_0_OR_GREATER
6464
[NativeName(NativeNameType.Delegate, "LoadFileTextCallback")]
6565
[UnmanagedFunctionPointer(CallingConvention.Cdecl)]
66-
public unsafe delegate byte* LoadFileTextCallback([NativeName(NativeNameType.Param, "fileName")] [NativeName(NativeNameType.Type, "const char*")] byte* fileName);
66+
public unsafe delegate byte* LoadFileTextCallback([NativeName(NativeNameType.Param, "fileName")] [NativeName(NativeNameType.Type, "char const *")] byte* fileName);
6767

6868
#else
6969
[NativeName(NativeNameType.Delegate, "LoadFileTextCallback")]
7070
[UnmanagedFunctionPointer(CallingConvention.Cdecl)]
71-
public unsafe delegate nint LoadFileTextCallback([NativeName(NativeNameType.Param, "fileName")] [NativeName(NativeNameType.Type, "const char*")] nint fileName);
71+
public unsafe delegate nint LoadFileTextCallback([NativeName(NativeNameType.Param, "fileName")] [NativeName(NativeNameType.Type, "char const *")] nint fileName);
7272

7373
#endif
7474

7575
#if NET5_0_OR_GREATER
7676
[NativeName(NativeNameType.Delegate, "SaveFileTextCallback")]
7777
[UnmanagedFunctionPointer(CallingConvention.Cdecl)]
78-
public unsafe delegate byte SaveFileTextCallback([NativeName(NativeNameType.Param, "fileName")] [NativeName(NativeNameType.Type, "const char*")] byte* fileName, [NativeName(NativeNameType.Param, "text")] [NativeName(NativeNameType.Type, "char*")] byte* text);
78+
public unsafe delegate byte SaveFileTextCallback([NativeName(NativeNameType.Param, "fileName")] [NativeName(NativeNameType.Type, "char const *")] byte* fileName, [NativeName(NativeNameType.Param, "text")] [NativeName(NativeNameType.Type, "char *")] byte* text);
7979

8080
#else
8181
[NativeName(NativeNameType.Delegate, "SaveFileTextCallback")]
8282
[UnmanagedFunctionPointer(CallingConvention.Cdecl)]
83-
public unsafe delegate byte SaveFileTextCallback([NativeName(NativeNameType.Param, "fileName")] [NativeName(NativeNameType.Type, "const char*")] nint fileName, [NativeName(NativeNameType.Param, "text")] [NativeName(NativeNameType.Type, "char*")] nint text);
83+
public unsafe delegate byte SaveFileTextCallback([NativeName(NativeNameType.Param, "fileName")] [NativeName(NativeNameType.Type, "char const *")] nint fileName, [NativeName(NativeNameType.Param, "text")] [NativeName(NativeNameType.Type, "char *")] nint text);
8484

8585
#endif
8686

@@ -92,7 +92,7 @@ namespace Hexa.NET.Raylib
9292
/// </summary>
9393
[NativeName(NativeNameType.Delegate, "AudioCallback")]
9494
[UnmanagedFunctionPointer(CallingConvention.Cdecl)]
95-
public unsafe delegate void AudioCallback([NativeName(NativeNameType.Param, "bufferData")] [NativeName(NativeNameType.Type, "void*")] void* bufferData, [NativeName(NativeNameType.Param, "frames")] [NativeName(NativeNameType.Type, "unsigned int")] uint frames);
95+
public unsafe delegate void AudioCallback([NativeName(NativeNameType.Param, "bufferData")] [NativeName(NativeNameType.Type, "void *")] void* bufferData, [NativeName(NativeNameType.Param, "frames")] [NativeName(NativeNameType.Type, "unsigned int")] uint frames);
9696

9797
#else
9898
/// <summary>
@@ -102,7 +102,7 @@ namespace Hexa.NET.Raylib
102102
/// </summary>
103103
[NativeName(NativeNameType.Delegate, "AudioCallback")]
104104
[UnmanagedFunctionPointer(CallingConvention.Cdecl)]
105-
public unsafe delegate void AudioCallback([NativeName(NativeNameType.Param, "bufferData")] [NativeName(NativeNameType.Type, "void*")] nint bufferData, [NativeName(NativeNameType.Param, "frames")] [NativeName(NativeNameType.Type, "unsigned int")] uint frames);
105+
public unsafe delegate void AudioCallback([NativeName(NativeNameType.Param, "bufferData")] [NativeName(NativeNameType.Type, "void *")] nint bufferData, [NativeName(NativeNameType.Param, "frames")] [NativeName(NativeNameType.Type, "unsigned int")] uint frames);
106106

107107
#endif
108108

0 commit comments

Comments
 (0)