Minor bit of debug output added to dynamic X11 code.

libsdl-org · Jan 6, 2006 · dc689b2 · dc689b2
1 parent e7ef8df
commit dc689b2
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 3 deletions.
diff --git a/src/SDL_loadso.c b/src/SDL_loadso.c
@@ -28,16 +28,25 @@ static char rcsid =
 /* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */
 /* System dependent library loading routines                           */
 
+/*
+ * Mac OS X >= 10.3 are guaranteed to have dlopen support in a system
+ *  framework, which means we don't have to roll our own on non-PowerPC
+ *  systems to guarantee compatibility (x86 Macs started at 10.4).   --ryan.
+ */
+#if ( (defined(MACOSX)) && (!defined(__POWERPC__)) )
+#  define USE_DLOPEN 1
+#endif
+
 /* !!! FIXME: includes so I don't have to update all the project files... */
 #define SDL_INTERNAL_BUILDING_LOADSO 1
 #if defined(USE_DUMMY_LOADSO)
 # include "loadso/dummy/SDL_loadso.c"
+#elif defined(USE_DLOPEN)
+# include "loadso/dlopen/SDL_loadso.c"
 #elif defined(MACOSX)
 # include "loadso/macosx/SDL_loadso.c"
 #elif defined(macintosh)
 # include "loadso/macos/SDL_loadso.c"
-#elif defined(USE_DLOPEN)
-# include "loadso/dlopen/SDL_loadso.c"
 #elif defined(WIN32) || defined(_WIN32_WCE)
 # include "loadso/windows/SDL_loadso.c"
 #elif defined(__BEOS__)

diff --git a/src/video/x11/SDL_x11dyn.c b/src/video/x11/SDL_x11dyn.c
@@ -56,7 +56,8 @@ static void *X11_GetSym(int required, const char *fnname, int *rc)
 			if (fn != NULL)
 				printf("X11: Found '%s' in libXext (%p)\n", fnname, fn);
 			else
-				printf("X11: Symbol '%s' NOT FOUND!\n", fnname);
+				printf("X11: Symbol '%s' NOT FOUND!%s\n", fnname
+				       required ? "" : " (...but not required!)");
 			#endif
 		}
 		*rc = ((fn != NULL) || (!required));