From 973acd73857b50741985081865246f0d083e3fe7 Mon Sep 17 00:00:00 2001
From: deuce <>
Date: Wed, 1 Apr 2020 00:48:25 +0000
Subject: [PATCH] Fix Win32 SDL.
load_sdl_funcs() is no longer called from SDL_win32_main()
Further, the Handle thing doesn't exist anymore, so just remove it.
---
src/conio/Common.gmake | 9 +++++++++
src/conio/sdlfuncs.c | 10 ----------
src/conio/sdlfuncs.h | 1 -
3 files changed, 9 insertions(+), 11 deletions(-)
diff --git a/src/conio/Common.gmake b/src/conio/Common.gmake
index 37fa053f07..8f7525dedc 100644
--- a/src/conio/Common.gmake
+++ b/src/conio/Common.gmake
@@ -54,6 +54,9 @@ ifneq ($(os),win32)
else
NO_X := 1
CIOLIB-MT_CFLAGS += -DDISABLE_X11=1
+ ifdef USE_SDL
+ WITH_SDL := 1
+ endif
endif
# Find SDL headers!
@@ -129,6 +132,12 @@ ifdef WITH_SDL
CIOLIB_CFLAGS += -DWITH_SDL -DSTATIC_SDL
CIOLIB_CFLAGS += -I${SDL_FRAMEWORK_PATH}/SDL.framework/Headers
CIOLIB_LIBS += -F${SDL_FRAMEWORK_PATH} -framework SDL -framework Cocoa -framework Carbon -I${SDL_FRAMEWORK_PATH}/SDL.framework/Headers
+ else
+ ifeq ($(os),win32)
+ CIOLIB-MT_CFLAGS += -DWITH_SDL
+ WITH_SDL := 1
+ CIOLIB_CFLAGS += -DWITH_SDL
+ endif
endif
endif
endif
diff --git a/src/conio/sdlfuncs.c b/src/conio/sdlfuncs.c
index c4b26ad29a..e3beff023d 100644
--- a/src/conio/sdlfuncs.c
+++ b/src/conio/sdlfuncs.c
@@ -8,9 +8,7 @@
#include "sdl_con.h"
extern int sdl_video_initialized;
-#ifndef _WIN32
struct sdlfuncs sdl;
-#endif
/* Make xp_dl do static linking */
#ifdef STATIC_SDL
@@ -34,12 +32,6 @@ int load_sdl_funcs(struct sdlfuncs *sdlf)
if((sdl_dll=xp_dlopen(libnames,RTLD_LAZY|RTLD_GLOBAL,SDL_PATCHLEVEL))==NULL)
return(-1);
-#ifdef _WIN32
- if((sdlf->SetModuleHandle=xp_dlsym(sdl_dll, SDL_SetModuleHandle))==NULL) {
- xp_dlclose(sdl_dll);
- return(-1);
- }
-#endif
if((sdlf->Init=xp_dlsym(sdl_dll, SDL_Init))==NULL) {
xp_dlclose(sdl_dll);
return(-1);
@@ -262,9 +254,7 @@ int init_sdl_video(void)
if(sdl_video_initialized)
return(0);
-#ifndef _WIN32
load_sdl_funcs(&sdl);
-#endif
if (!sdl.gotfuncs)
return -1;
diff --git a/src/conio/sdlfuncs.h b/src/conio/sdlfuncs.h
index 635d389921..dd17cf0618 100644
--- a/src/conio/sdlfuncs.h
+++ b/src/conio/sdlfuncs.h
@@ -14,7 +14,6 @@
struct sdlfuncs {
int (HACK_HACK_HACK *Init) (Uint32 flags);
void (HACK_HACK_HACK *Quit) (void);
- void (HACK_HACK_HACK *SetModuleHandle) (void *hInst);
int (HACK_HACK_HACK *mutexP) (SDL_mutex *mutex);
int (HACK_HACK_HACK *mutexV) (SDL_mutex *mutex);
int (HACK_HACK_HACK *PeepEvents) (SDL_Event *events, int numevents,
--
GitLab