Fixed normal linking with libmikmod and linking with earlier versions…

… of libmikmod.
libsdl-org · Jul 22, 2012 · 3188b77 · 3188b77
1 parent cfe60fd
commit 3188b77
Showing 1 changed file with 7 additions and 2 deletions.
diff --git a/dynamic_mod.c b/dynamic_mod.c
@@ -97,8 +97,8 @@ int Mix_InitMOD()
 			(void (*)(void*))
 			SDL_LoadFunction(mikmod.handle, "MikMod_free");
 		if ( mikmod.MikMod_free == NULL ) {
-			SDL_UnloadObject(mikmod.handle);
-			return -1;
+			/* libmikmod 3.1 and earlier doesn't have it */
+			mikmod.MikMod_free = free;
 		}
 		mikmod.Player_Active =
 			(BOOL (*)(void))
@@ -246,6 +246,11 @@ int Mix_InitMOD()
 		mikmod.MikMod_RegisterDriver = MikMod_RegisterDriver;
 		mikmod.MikMod_errno = &MikMod_errno;
 		mikmod.MikMod_strerror = MikMod_strerror;
+#if LIBMIKMOD_VERSION < ((3<<16)|(2<<8))
+		mikmod.MikMod_free = free;
+#else
+		mikmod.MikMod_free = MikMod_free;
+#endif
 		mikmod.Player_Active = Player_Active;
 		mikmod.Player_Free = Player_Free;
 		mikmod.Player_LoadGeneric = Player_LoadGeneric;