Merge branch 'sdl2-hg' of https://github.com/flibitijibibo/SDL2-CS
Conflicts: src/SDL2.cs
This commit is contained in:
commit
cfec5bc59f
12
src/SDL2.cs
12
src/SDL2.cs
@ -3795,6 +3795,7 @@ namespace SDL2
|
|||||||
}
|
}
|
||||||
|
|
||||||
#endregion
|
#endregion
|
||||||
|
|
||||||
#region SDL_keycode.h
|
#region SDL_keycode.h
|
||||||
|
|
||||||
public const int SDLK_SCANCODE_MASK = (1 << 30);
|
public const int SDLK_SCANCODE_MASK = (1 << 30);
|
||||||
@ -5368,5 +5369,16 @@ namespace SDL2
|
|||||||
);
|
);
|
||||||
|
|
||||||
#endregion
|
#endregion
|
||||||
|
|
||||||
|
#region SDL_cpuinfo.h
|
||||||
|
|
||||||
|
/// <summary>
|
||||||
|
/// This function returns the amount of RAM configured in the system, in MB.
|
||||||
|
/// </summary>
|
||||||
|
/// <returns></returns>
|
||||||
|
[DllImport(nativeLibName, CallingConvention = CallingConvention.Cdecl)]
|
||||||
|
public static extern int SDL_GetSystemRAM();
|
||||||
|
|
||||||
|
#endregion
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
Loading…
x
Reference in New Issue
Block a user