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

Run-time detection of SDL capability in ciolib isn't reliable enough to

actually use.
parent 470c92dc
No related branches found
No related tags found
No related merge requests found
...@@ -490,11 +490,6 @@ int SDL_main_env(int argc, char **argv, char **env) ...@@ -490,11 +490,6 @@ int SDL_main_env(int argc, char **argv, char **env)
SDL_Thread *main_thread; SDL_Thread *main_thread;
int main_ret; int main_ret;
int use_sdl_video=FALSE; int use_sdl_video=FALSE;
#ifdef _WIN32
HMODULE ciolib_dll;
#else
void *mainexe;
#endif
ma.argc=argc; ma.argc=argc;
ma.argv=argv; ma.argv=argv;
...@@ -504,20 +499,9 @@ int SDL_main_env(int argc, char **argv, char **env) ...@@ -504,20 +499,9 @@ int SDL_main_env(int argc, char **argv, char **env)
#endif #endif
if(sdl.gotfuncs) { if(sdl.gotfuncs) {
#ifdef _WIN32 use_sdl_video=TRUE;
/*
* Run-time detection of SDL-capable conio library
* ToDo: This probobly won't work if ciolib is a DLL
*/
if(GetProcAddress(GetModuleHandle(NULL),"sdl_video_event_thread"))
use_sdl_video=TRUE;
else {
if((ciolib_dll=GetModuleHandle("ciolib_mt"))!=NULL) {
if(GetProcAddress(ciolib_dll,"sdl_video_event_thread"))
use_sdl_video=TRUE;
}
}
#ifdef _WIN32
/* Fail to windib (ie: No mouse attached) */ /* Fail to windib (ie: No mouse attached) */
if(sdl.Init(SDL_INIT_VIDEO)) { if(sdl.Init(SDL_INIT_VIDEO)) {
if(getenv("SDL_VIDEODRIVER")==NULL) { if(getenv("SDL_VIDEODRIVER")==NULL) {
...@@ -534,17 +518,6 @@ int SDL_main_env(int argc, char **argv, char **env) ...@@ -534,17 +518,6 @@ int SDL_main_env(int argc, char **argv, char **env)
sdl_initialized=TRUE; sdl_initialized=TRUE;
} }
#else #else
/*
* Run-time detection of SDL-capable conio library
*/
mainexe=dlopen(NULL,RTLD_NOW);
if(mainexe) {
if(dlsym(mainexe, "sdl_video_event_thread"))
use_sdl_video=TRUE;
dlclose(mainexe);
}
/* /*
* On Linux, SDL doesn't properly detect availability of the * On Linux, SDL doesn't properly detect availability of the
* framebuffer apparently. This results in remote connections * framebuffer apparently. This results in remote connections
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment