Conflicts:
	src/SDL2.cs
This commit is contained in:
David Gow 2013-10-23 10:18:48 +08:00
commit cfec5bc59f

View file

@ -3795,6 +3795,7 @@ namespace SDL2
}
#endregion
#region SDL_keycode.h
public const int SDLK_SCANCODE_MASK = (1 << 30);
@ -5368,5 +5369,16 @@ namespace SDL2
);
#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
}
}