Skip to content
Snippets Groups Projects
Commit de1759ea authored by deuce's avatar deuce
Browse files

Move sdl_video_initialized into ciolib.c now since it's used there.

parent 4793f307
No related branches found
No related tags found
No related merge requests found
...@@ -119,6 +119,10 @@ CIOLIBEXPORT int CIOLIBCALL ciolib_get_window_info(int *width, int *height, int ...@@ -119,6 +119,10 @@ CIOLIBEXPORT int CIOLIBCALL ciolib_get_window_info(int *width, int *height, int
CIOLIBEXPORT void CIOLIBCALL ciolib_setscaling(int new_value); CIOLIBEXPORT void CIOLIBCALL ciolib_setscaling(int new_value);
CIOLIBEXPORT int CIOLIBCALL ciolib_getscaling(void); CIOLIBEXPORT int CIOLIBCALL ciolib_getscaling(void);
#if defined(WITH_SDL) || defined(WITH_SDL_AUDIO)
int sdl_video_initialized = 0;
#endif
#define CIOLIB_INIT() { if(initialized != 1) initciolib(CIOLIB_MODE_AUTO); } #define CIOLIB_INIT() { if(initialized != 1) initciolib(CIOLIB_MODE_AUTO); }
#if defined(WITH_SDL) || defined(WITH_SDL_AUDIO) #if defined(WITH_SDL) || defined(WITH_SDL_AUDIO)
......
...@@ -11,6 +11,7 @@ ...@@ -11,6 +11,7 @@
#undef main #undef main
#endif #endif
#include "sdlfuncs.h" #include "sdlfuncs.h"
extern int sdl_video_initialized;
#ifndef _WIN32 #ifndef _WIN32
struct sdlfuncs sdl; struct sdlfuncs sdl;
...@@ -25,7 +26,6 @@ struct sdlfuncs sdl; ...@@ -25,7 +26,6 @@ struct sdlfuncs sdl;
static int sdl_funcs_loaded=0; static int sdl_funcs_loaded=0;
static int sdl_initialized=0; static int sdl_initialized=0;
static int sdl_audio_initialized=0; static int sdl_audio_initialized=0;
int sdl_video_initialized=0;
static int (*sdl_drawing_thread)(void *data)=NULL; static int (*sdl_drawing_thread)(void *data)=NULL;
static void (*sdl_exit_drawing_thread)(void)=NULL; static void (*sdl_exit_drawing_thread)(void)=NULL;
static int main_returned=0; static int main_returned=0;
......
...@@ -79,7 +79,6 @@ struct sdlfuncs { ...@@ -79,7 +79,6 @@ struct sdlfuncs {
/* Defined in SDL_win32_main.c for Win32 */ /* Defined in SDL_win32_main.c for Win32 */
extern struct sdlfuncs sdl; extern struct sdlfuncs sdl;
extern SDL_sem *sdl_exit_sem; extern SDL_sem *sdl_exit_sem;
extern int sdl_video_initialized;
#ifdef __cplusplus #ifdef __cplusplus
extern "C" { extern "C" {
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment