Added missing guards in implementation for PSP.

Thanks to Martin Gerhardy for pointing this out.
This commit is contained in:
Philipp Wiesemann 2015-01-31 22:45:54 +01:00
parent d036ad84ae
commit 86f87bf755
11 changed files with 50 additions and 1 deletions

View file

@ -20,6 +20,8 @@
*/ */
#include "../../SDL_internal.h" #include "../../SDL_internal.h"
#if SDL_AUDIO_DRIVER_PSP
#include <stdio.h> #include <stdio.h>
#include <string.h> #include <string.h>
#include <stdlib.h> #include <stdlib.h>
@ -192,5 +194,6 @@ AudioBootStrap PSPAUD_bootstrap = {
/* SDL_AUDI */ /* SDL_AUDI */
#endif /* SDL_AUDIO_DRIVER_PSP */
/* vi: set ts=4 sw=4 expandtab: */

View file

@ -20,6 +20,8 @@
*/ */
#include "../../SDL_internal.h" #include "../../SDL_internal.h"
#if SDL_JOYSTICK_PSP
/* This is the PSP implementation of the SDL joystick API */ /* This is the PSP implementation of the SDL joystick API */
#include <pspctrl.h> #include <pspctrl.h>
#include <pspkernel.h> #include <pspkernel.h>
@ -263,5 +265,7 @@ SDL_JoystickGUID SDL_SYS_JoystickGetGUID(SDL_Joystick * joystick)
return guid; return guid;
} }
#endif /* SDL_JOYSTICK_PSP */
/* vim: ts=4 sw=4 /* vim: ts=4 sw=4
*/ */

View file

@ -1,6 +1,9 @@
/* /*
SDL_psp_main.c, placed in the public domain by Sam Lantinga 3/13/14 SDL_psp_main.c, placed in the public domain by Sam Lantinga 3/13/14
*/ */
#include "SDL_config.h"
#ifdef __PSP__
#include "SDL_main.h" #include "SDL_main.h"
#include <pspkernel.h> #include <pspkernel.h>
@ -61,3 +64,7 @@ int main(int argc, char *argv[])
(void)SDL_main(argc, argv); (void)SDL_main(argc, argv);
return 0; return 0;
} }
#endif /* __PSP__ */
/* vi: set ts=4 sw=4 expandtab: */

View file

@ -20,6 +20,8 @@
*/ */
#include "../../SDL_internal.h" #include "../../SDL_internal.h"
#if SDL_THREAD_PSP
/* An implementation of condition variables using semaphores and mutexes */ /* An implementation of condition variables using semaphores and mutexes */
/* /*
This implementation borrows heavily from the BeOS condition variable This implementation borrows heavily from the BeOS condition variable
@ -217,4 +219,6 @@ SDL_CondWait(SDL_cond * cond, SDL_mutex * mutex)
return SDL_CondWaitTimeout(cond, mutex, SDL_MUTEX_MAXWAIT); return SDL_CondWaitTimeout(cond, mutex, SDL_MUTEX_MAXWAIT);
} }
#endif /* SDL_THREAD_PSP */
/* vi: set ts=4 sw=4 expandtab: */ /* vi: set ts=4 sw=4 expandtab: */

View file

@ -20,6 +20,8 @@
*/ */
#include "../../SDL_internal.h" #include "../../SDL_internal.h"
#if SDL_THREAD_PSP
/* An implementation of mutexes using semaphores */ /* An implementation of mutexes using semaphores */
#include "SDL_thread.h" #include "SDL_thread.h"
@ -129,4 +131,6 @@ SDL_mutexV(SDL_mutex * mutex)
#endif /* SDL_THREADS_DISABLED */ #endif /* SDL_THREADS_DISABLED */
} }
#endif /* SDL_THREAD_PSP */
/* vi: set ts=4 sw=4 expandtab: */ /* vi: set ts=4 sw=4 expandtab: */

View file

@ -20,6 +20,8 @@
*/ */
#include "../../SDL_internal.h" #include "../../SDL_internal.h"
#if SDL_THREAD_PSP
/* Semaphore functions for the PSP. */ /* Semaphore functions for the PSP. */
#include <stdio.h> #include <stdio.h>
@ -153,5 +155,7 @@ int SDL_SemPost(SDL_sem *sem)
return 0; return 0;
} }
#endif /* SDL_THREAD_PSP */
/* vim: ts=4 sw=4 /* vim: ts=4 sw=4
*/ */

View file

@ -20,6 +20,8 @@
*/ */
#include "../../SDL_internal.h" #include "../../SDL_internal.h"
#if SDL_THREAD_PSP
/* PSP thread management routines for SDL */ /* PSP thread management routines for SDL */
#include <stdio.h> #include <stdio.h>
@ -104,5 +106,7 @@ int SDL_SYS_SetThreadPriority(SDL_ThreadPriority priority)
} }
#endif /* SDL_THREAD_PSP */
/* vim: ts=4 sw=4 /* vim: ts=4 sw=4
*/ */

View file

@ -20,6 +20,8 @@
*/ */
#include "../../SDL_internal.h" #include "../../SDL_internal.h"
#ifdef SDL_TIMERS_PSP
#include "SDL_thread.h" #include "SDL_thread.h"
#include "SDL_timer.h" #include "SDL_timer.h"
#include "SDL_error.h" #include "SDL_error.h"
@ -83,5 +85,7 @@ void SDL_Delay(Uint32 ms)
sceKernelDelayThreadCB(ms * 1000); sceKernelDelayThreadCB(ms * 1000);
} }
#endif /* SDL_TIMERS_PSP */
/* vim: ts=4 sw=4 /* vim: ts=4 sw=4
*/ */

View file

@ -20,6 +20,8 @@
*/ */
#include "../../SDL_internal.h" #include "../../SDL_internal.h"
#if SDL_VIDEO_DRIVER_PSP
/* Being a null driver, there's no event stream. We just define stubs for /* Being a null driver, there's no event stream. We just define stubs for
most of the API. */ most of the API. */
@ -283,3 +285,6 @@ void PSP_EventQuit(_THIS)
/* end of SDL_pspevents.c ... */ /* end of SDL_pspevents.c ... */
#endif /* SDL_VIDEO_DRIVER_PSP */
/* vi: set ts=4 sw=4 expandtab: */

View file

@ -20,6 +20,8 @@
*/ */
#include "../../SDL_internal.h" #include "../../SDL_internal.h"
#if SDL_VIDEO_DRIVER_PSP
#include <stdlib.h> #include <stdlib.h>
#include <string.h> #include <string.h>
@ -204,3 +206,6 @@ PSP_GL_DeleteContext(_THIS, SDL_GLContext context)
return; return;
} }
#endif /* SDL_VIDEO_DRIVER_PSP */
/* vi: set ts=4 sw=4 expandtab: */

View file

@ -20,6 +20,7 @@
*/ */
#include "../../SDL_internal.h" #include "../../SDL_internal.h"
#if SDL_VIDEO_DRIVER_PSP
#include <stdio.h> #include <stdio.h>
@ -34,3 +35,7 @@
struct WMcursor { struct WMcursor {
int unused; int unused;
}; };
#endif /* SDL_VIDEO_DRIVER_PSP */
/* vi: set ts=4 sw=4 expandtab: */