Fixes for new SDL embedded libc stuff
--HG-- extra : convert_revision : svn%3Ac70aab31-4412-0410-b14c-859654838e24/trunk%401354
This commit is contained in:
parent
4643293856
commit
83e8409a41
8 changed files with 9 additions and 11 deletions
|
@ -26,7 +26,6 @@
|
||||||
Patrice Mandin
|
Patrice Mandin
|
||||||
*/
|
*/
|
||||||
|
|
||||||
#include <string.h>
|
|
||||||
#include <unistd.h>
|
#include <unistd.h>
|
||||||
|
|
||||||
#include <mint/osbind.h>
|
#include <mint/osbind.h>
|
||||||
|
@ -35,6 +34,7 @@
|
||||||
|
|
||||||
#include "SDL_types.h"
|
#include "SDL_types.h"
|
||||||
#include "SDL_audio.h"
|
#include "SDL_audio.h"
|
||||||
|
#include "SDL_string.h"
|
||||||
|
|
||||||
#include "SDL_mintaudio.h"
|
#include "SDL_mintaudio.h"
|
||||||
#include "SDL_mintaudio_stfa.h"
|
#include "SDL_mintaudio_stfa.h"
|
||||||
|
|
|
@ -33,6 +33,7 @@
|
||||||
|
|
||||||
#include "SDL_error.h"
|
#include "SDL_error.h"
|
||||||
#include "SDL_cdrom.h"
|
#include "SDL_cdrom.h"
|
||||||
|
#include "SDL_string.h"
|
||||||
#include "SDL_syscdrom.h"
|
#include "SDL_syscdrom.h"
|
||||||
|
|
||||||
/* Some ioctl() errno values which occur when the tray is empty */
|
/* Some ioctl() errno values which occur when the tray is empty */
|
||||||
|
|
|
@ -34,6 +34,7 @@
|
||||||
#include "SDL_types.h"
|
#include "SDL_types.h"
|
||||||
#include "SDL_error.h"
|
#include "SDL_error.h"
|
||||||
#include "SDL_joystick.h"
|
#include "SDL_joystick.h"
|
||||||
|
#include "SDL_events.h"
|
||||||
#include "SDL_sysjoystick.h"
|
#include "SDL_sysjoystick.h"
|
||||||
#include "SDL_joystick_c.h"
|
#include "SDL_joystick_c.h"
|
||||||
|
|
||||||
|
|
|
@ -26,13 +26,12 @@
|
||||||
* Patrice Mandin
|
* Patrice Mandin
|
||||||
*/
|
*/
|
||||||
|
|
||||||
#include <string.h>
|
|
||||||
|
|
||||||
/* Mint includes */
|
/* Mint includes */
|
||||||
#include <mint/osbind.h>
|
#include <mint/osbind.h>
|
||||||
#include <mint/cookie.h>
|
#include <mint/cookie.h>
|
||||||
|
|
||||||
#include "SDL.h"
|
#include "SDL.h"
|
||||||
|
#include "SDL_string.h"
|
||||||
#include "SDL_sysevents.h"
|
#include "SDL_sysevents.h"
|
||||||
#include "SDL_events_c.h"
|
#include "SDL_events_c.h"
|
||||||
|
|
||||||
|
|
|
@ -26,13 +26,12 @@
|
||||||
* Patrice Mandin
|
* Patrice Mandin
|
||||||
*/
|
*/
|
||||||
|
|
||||||
#include <string.h>
|
|
||||||
|
|
||||||
/* Mint includes */
|
/* Mint includes */
|
||||||
#include <mint/osbind.h>
|
#include <mint/osbind.h>
|
||||||
#include <mint/cookie.h>
|
#include <mint/cookie.h>
|
||||||
|
|
||||||
#include "SDL.h"
|
#include "SDL.h"
|
||||||
|
#include "SDL_string.h"
|
||||||
#include "SDL_sysevents.h"
|
#include "SDL_sysevents.h"
|
||||||
#include "SDL_events_c.h"
|
#include "SDL_events_c.h"
|
||||||
|
|
||||||
|
|
|
@ -26,12 +26,11 @@
|
||||||
* Patrice Mandin
|
* Patrice Mandin
|
||||||
*/
|
*/
|
||||||
|
|
||||||
#include <string.h>
|
|
||||||
|
|
||||||
/* Mint includes */
|
/* Mint includes */
|
||||||
#include <mint/osbind.h>
|
#include <mint/osbind.h>
|
||||||
|
|
||||||
#include "SDL.h"
|
#include "SDL.h"
|
||||||
|
#include "SDL_string.h"
|
||||||
#include "SDL_sysevents.h"
|
#include "SDL_sysevents.h"
|
||||||
#include "SDL_events_c.h"
|
#include "SDL_events_c.h"
|
||||||
|
|
||||||
|
|
|
@ -29,11 +29,10 @@
|
||||||
* Olivier Landemarre, Johan Klockars, Xavier Joubert, Claude Attard
|
* Olivier Landemarre, Johan Klockars, Xavier Joubert, Claude Attard
|
||||||
*/
|
*/
|
||||||
|
|
||||||
#include <string.h>
|
|
||||||
|
|
||||||
#include <gem.h>
|
#include <gem.h>
|
||||||
|
|
||||||
#include "SDL.h"
|
#include "SDL.h"
|
||||||
|
#include "SDL_string.h"
|
||||||
#include "SDL_sysevents.h"
|
#include "SDL_sysevents.h"
|
||||||
#include "SDL_events_c.h"
|
#include "SDL_events_c.h"
|
||||||
#include "SDL_gemvideo.h"
|
#include "SDL_gemvideo.h"
|
||||||
|
|
|
@ -672,7 +672,7 @@ static SDL_Surface *XBIOS_SetVideoMode(_THIS, SDL_Surface *current,
|
||||||
if (XBIOS_centscreen) {
|
if (XBIOS_centscreen) {
|
||||||
SDL_XBIOS_CentscreenSetmode(this, width, height, new_depth);
|
SDL_XBIOS_CentscreenSetmode(this, width, height, new_depth);
|
||||||
} else {
|
} else {
|
||||||
Vsetmode(new_video_mode->number);
|
VsetMode(new_video_mode->number);
|
||||||
}
|
}
|
||||||
#endif
|
#endif
|
||||||
/* Set hardware palette to black in True Colour */
|
/* Set hardware palette to black in True Colour */
|
||||||
|
@ -884,7 +884,7 @@ static void XBIOS_VideoQuit(_THIS)
|
||||||
if (XBIOS_centscreen) {
|
if (XBIOS_centscreen) {
|
||||||
SDL_XBIOS_CentscreenRestore(this, XBIOS_oldvmode);
|
SDL_XBIOS_CentscreenRestore(this, XBIOS_oldvmode);
|
||||||
} else {
|
} else {
|
||||||
Vsetmode(XBIOS_oldvmode);
|
VsetMode(XBIOS_oldvmode);
|
||||||
}
|
}
|
||||||
if (XBIOS_oldnumcol) {
|
if (XBIOS_oldnumcol) {
|
||||||
VsetRGB(0, XBIOS_oldnumcol, XBIOS_oldpalette);
|
VsetRGB(0, XBIOS_oldnumcol, XBIOS_oldpalette);
|
||||||
|
|
Loading…
Add table
Add a link
Reference in a new issue