Skip to content

[2.0] SDL bindings #264

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 8 commits into from
Aug 8, 2020
Merged

[2.0] SDL bindings #264

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
e3d96f2
This is the first iteration of Silk.NET.SDL
Perksey Aug 7, 2020
570b824
Merge branch '2.0' into feature/sdl-bindings
Perksey Aug 7, 2020
0ba9f2b
Merge branch '2.0' into feature/sdl-bindings
Perksey Aug 7, 2020
5e3e592
Fix build
Perksey Aug 7, 2020
9862c3b
Remove comments
Perksey Aug 7, 2020
0177ec2
Use a mirror
Perksey Aug 8, 2020
88ddaec
Bind to all platforms, exclude RWops
Perksey Aug 8, 2020
66cb872
Remove removals of prematurely removed structs
Perksey Aug 8, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 3 additions & 0 deletions .gitmodules
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
[submodule "build/submodules/SDL-mirror"]
path = build/submodules/SDL-mirror
url = https://github.com/spurious/SDL-mirror
15 changes: 15 additions & 0 deletions Silk.NET.sln
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -296,6 +296,8 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Tutorial 3.5 - Lighting Map
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Silk.NET.Windowing", "src\Windowing\Silk.NET.Windowing\Silk.NET.Windowing.csproj", "{00D8F04F-2063-4F4E-B793-0F9DCF2BCFA9}"
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Silk.NET.SDL", "src\Windowing\Silk.NET.SDL\Silk.NET.SDL.csproj", "{F16EDD0F-5ABE-4B25-98EE-8397E55B5CBA}"
EndProject
Global
GlobalSection(SolutionConfigurationPlatforms) = preSolution
Debug|Any CPU = Debug|Any CPU
Expand Down Expand Up @@ -1809,6 +1811,18 @@ Global
{00D8F04F-2063-4F4E-B793-0F9DCF2BCFA9}.Release|x64.Build.0 = Release|Any CPU
{00D8F04F-2063-4F4E-B793-0F9DCF2BCFA9}.Release|x86.ActiveCfg = Release|Any CPU
{00D8F04F-2063-4F4E-B793-0F9DCF2BCFA9}.Release|x86.Build.0 = Release|Any CPU
{F16EDD0F-5ABE-4B25-98EE-8397E55B5CBA}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{F16EDD0F-5ABE-4B25-98EE-8397E55B5CBA}.Debug|Any CPU.Build.0 = Debug|Any CPU
{F16EDD0F-5ABE-4B25-98EE-8397E55B5CBA}.Debug|x64.ActiveCfg = Debug|Any CPU
{F16EDD0F-5ABE-4B25-98EE-8397E55B5CBA}.Debug|x64.Build.0 = Debug|Any CPU
{F16EDD0F-5ABE-4B25-98EE-8397E55B5CBA}.Debug|x86.ActiveCfg = Debug|Any CPU
{F16EDD0F-5ABE-4B25-98EE-8397E55B5CBA}.Debug|x86.Build.0 = Debug|Any CPU
{F16EDD0F-5ABE-4B25-98EE-8397E55B5CBA}.Release|Any CPU.ActiveCfg = Release|Any CPU
{F16EDD0F-5ABE-4B25-98EE-8397E55B5CBA}.Release|Any CPU.Build.0 = Release|Any CPU
{F16EDD0F-5ABE-4B25-98EE-8397E55B5CBA}.Release|x64.ActiveCfg = Release|Any CPU
{F16EDD0F-5ABE-4B25-98EE-8397E55B5CBA}.Release|x64.Build.0 = Release|Any CPU
{F16EDD0F-5ABE-4B25-98EE-8397E55B5CBA}.Release|x86.ActiveCfg = Release|Any CPU
{F16EDD0F-5ABE-4B25-98EE-8397E55B5CBA}.Release|x86.Build.0 = Release|Any CPU
EndGlobalSection
EndGlobalSection
GlobalSection(NestedProjects) = preSolution
Expand Down Expand Up @@ -1943,6 +1957,7 @@ Global
{5C119A02-AD0F-4222-9379-DB2DBAC59868} = {E1F91563-7277-4E9B-A3B7-8D5FD9802A4A}
{93CC7D39-530B-4E22-8D15-3A97FFA523F6} = {E1F91563-7277-4E9B-A3B7-8D5FD9802A4A}
{00D8F04F-2063-4F4E-B793-0F9DCF2BCFA9} = {23324041-2076-477C-A4BF-B385B8066C6C}
{F16EDD0F-5ABE-4B25-98EE-8397E55B5CBA} = {23324041-2076-477C-A4BF-B385B8066C6C}
EndGlobalSection
EndGlobalSection
EndGlobal
Binary file modified build/cache/assimp.json.gz
View file
Open in desktop
Binary file not shown.
Binary file modified build/cache/cl.json.gz
View file
Open in desktop
Binary file not shown.
Binary file modified build/cache/gl.json.gz
View file
Open in desktop
Binary file not shown.
Binary file modified build/cache/glcore.json.gz
View file
Open in desktop
Binary file not shown.
Binary file modified build/cache/gles2.json.gz
View file
Open in desktop
Binary file not shown.
Binary file modified build/cache/openxr.json.gz
View file
Open in desktop
Binary file not shown.
Binary file added build/cache/sdl.json.gz
View file
Open in desktop
Binary file not shown.
Binary file modified build/cache/vulkan.json.gz
View file
Open in desktop
Binary file not shown.
1 change: 0 additions & 1 deletion build/csharp_typemap.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -62,7 +62,6 @@
"int64_t": "long",
"int32_t": "int",
"Display": "IntPtr",
"Window": "IntPtr",
"Pixmap": "IntPtr",
"Colormap": "IntPtr",
"GLXWindow": "IntPtr",
Expand Down
1 change: 1 addition & 0 deletions build/submodules/SDL-mirror
Open in desktop
Submodule SDL-mirror added at 863c4b
94 changes: 93 additions & 1 deletion generator.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -342,7 +342,8 @@
"PFN_vkVoidFunction": "FuncPtr",
"PFN_vkDebugReportCallbackEXT": "FuncPtr",
"PFN_vkDebugUtilsMessengerCallbackEXT": "FuncPtr",
"char": "byte"
"char": "byte",
"Window": "IntPtr"
},
{
"$include.commonTypeMap": "build/csharp_typemap.json"
Expand Down Expand Up @@ -517,6 +518,7 @@
"ID3D12Device*": "IntPtr",
"ID3D12Resource*": "IntPtr",
"ID3D12CommandQueue*": "IntPtr",
"IUnknown*": "IntPtr",
"EGLDisplay": "IntPtr",
"EGLConfig": "IntPtr",
"EGLContext": "IntPtr",
Expand All @@ -527,6 +529,96 @@
"$include.commonTypeMap": "build/csharp_typemap.json"
}
]
},
{
"profileName": "SDL",
"sources": [
"build/submodules/SDL-mirror/include/SDL.h"
],
"mode": "Clang",
"cacheDir": "build/cache",
"cacheKey": "sdl",
"controlDescriptors": [
"convert-windows-only"
],
"converter": {},
"prefix": "sdl",
"clang": {
"args": [
"--language=c++",
"--std=c++17",
"-m32",
"-Wno-expansion-to-defined",
"-Wno-ignored-attributes",
"-Wno-ignored-pragma-intrinsic",
"-Wno-nonportable-include-path",
"-Wno-pragma-pack",
"-IC:/Program Files (x86)/Windows Kits/10/Include/10.0.19041.0/shared",
"-IC:/Program Files (x86)/Windows Kits/10/Include/10.0.19041.0/um",
"-IC:/Program Files (x86)/Windows Kits/10/Include/10.0.19041.0/ucrt",
"-IC:/Program Files (x86)/Microsoft Visual Studio/2019/Enterprise/VC/Tools/MSVC/14.26.28801/include",
"-IC:/Program Files (x86)/Microsoft Visual Studio/2019/Community/VC/Tools/MSVC/14.26.28801/include",
"-Ibuild/submodules/SDL-mirror/include",
"-D__IPHONEOS__",
"-D__ANDROID__",
"-D__WIN32__",
"-D__WINRT__",
"-D__LINUX__"
],
"traverse": [
"!build/submodules/SDL-mirror/include/SDL_rwops.h",
"build/submodules/SDL-mirror/include/*.h"
],
"classes": {
"SDL.h": "[Core]SDL"
}
},
"exclude": [
],
"rename": {
"__AnonymousEnum_SDL_shape_L80_C9": "WindowShapeModeVal",
"__AnonymousEnum_SDL_stdinc_L161_C9": "SdlBool",
"__AnonymousRecord_SDL_gamecontroller_L84_C5": "GameControllerBindValue",
"__AnonymousRecord_SDL_gamecontroller_L88_C9": "GameControllerHatValue",
"_SDL_Haptic": "Haptic",
"_SDL_GameController": "GameController",
"_SDL_Joystick": "Joystick",
"_SDL_AudioStream": "AudioStream",
"_SDL_iconv_t": "Icon",
"_SDL_Sensor": "Sensor"
},
"bakery": {
"profileNames": [
"SDL"
]
},
"output": {
"mode": "Default",
"path": "src/Windowing",
"licenseFile": "build/LICENSE_HEADER.txt",
"props": "build/props/bindings.props"
},
"namespace": "Silk.NET.SDL",
"extensionsNamespace": "Silk.NET.SDL.Extensions",
"legacyNameContainer": {
"Linux": "libSDL2-2.0.so.0",
"Windows": "SDL2.dll",
"MacOS": "libSDL2-2.0.0.dylib",
"Android": "libSDL2-2.0.so.0",
"IOS": "__Internal",
"ClassName": "SDLLibraryNameContainer"
},
"typeMaps": [
{
"$typemapPrecedesInjections": "true",
"WindowShapeMode": "WindowShapeModeVal",
"SDL_bool": "SdlBool",
"SDL_RWops": "RWops"
},
{
"$include.commonTypeMap": "build/csharp_typemap.json"
}
]
}
]
}
Loading