Minor bit of debug output added to dynamic X11 code.
authorRyan C. Gordon <icculus@icculus.org>
Fri, 06 Jan 2006 20:57:59 +0000
changeset 1236 ed252764287a
parent 1235 f60f6f4ffc6f
child 1237 a8068adf156b
Minor bit of debug output added to dynamic X11 code.
src/SDL_loadso.c
src/video/x11/SDL_x11dyn.c
--- a/src/SDL_loadso.c	Fri Jan 06 20:56:13 2006 +0000
+++ b/src/SDL_loadso.c	Fri Jan 06 20:57:59 2006 +0000
@@ -28,16 +28,25 @@
 /* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */
 /* 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__)
--- a/src/video/x11/SDL_x11dyn.c	Fri Jan 06 20:56:13 2006 +0000
+++ b/src/video/x11/SDL_x11dyn.c	Fri Jan 06 20:57:59 2006 +0000
@@ -56,7 +56,8 @@
 			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));