From fff9cfd07cf6b9da38359a460bb3d459ee4fd228 Mon Sep 17 00:00:00 2001
From: deuce <>
Date: Wed, 4 Oct 2006 05:27:24 +0000
Subject: [PATCH] Run-time detection of SDL capability in ciolib isn't reliable
enough to actually use.
---
src/xpdev/sdlfuncs.c | 31 ++-----------------------------
1 file changed, 2 insertions(+), 29 deletions(-)
diff --git a/src/xpdev/sdlfuncs.c b/src/xpdev/sdlfuncs.c
index be93d96299..b90ba8e938 100644
--- a/src/xpdev/sdlfuncs.c
+++ b/src/xpdev/sdlfuncs.c
@@ -490,11 +490,6 @@ int SDL_main_env(int argc, char **argv, char **env)
SDL_Thread *main_thread;
int main_ret;
int use_sdl_video=FALSE;
-#ifdef _WIN32
- HMODULE ciolib_dll;
-#else
- void *mainexe;
-#endif
ma.argc=argc;
ma.argv=argv;
@@ -504,20 +499,9 @@ int SDL_main_env(int argc, char **argv, char **env)
#endif
if(sdl.gotfuncs) {
-#ifdef _WIN32
- /*
- * 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;
- }
- }
+ use_sdl_video=TRUE;
+#ifdef _WIN32
/* Fail to windib (ie: No mouse attached) */
if(sdl.Init(SDL_INIT_VIDEO)) {
if(getenv("SDL_VIDEODRIVER")==NULL) {
@@ -534,17 +518,6 @@ int SDL_main_env(int argc, char **argv, char **env)
sdl_initialized=TRUE;
}
#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
* framebuffer apparently. This results in remote connections
--
GitLab