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 1236ed252764287a
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
     1.1 --- a/src/SDL_loadso.c	Fri Jan 06 20:56:13 2006 +0000
     1.2 +++ b/src/SDL_loadso.c	Fri Jan 06 20:57:59 2006 +0000
     1.3 @@ -28,16 +28,25 @@
     1.4  /* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */
     1.5  /* System dependent library loading routines                           */
     1.6  
     1.7 +/*
     1.8 + * Mac OS X >= 10.3 are guaranteed to have dlopen support in a system
     1.9 + *  framework, which means we don't have to roll our own on non-PowerPC
    1.10 + *  systems to guarantee compatibility (x86 Macs started at 10.4).   --ryan.
    1.11 + */
    1.12 +#if ( (defined(MACOSX)) && (!defined(__POWERPC__)) )
    1.13 +#  define USE_DLOPEN 1
    1.14 +#endif
    1.15 +
    1.16  /* !!! FIXME: includes so I don't have to update all the project files... */
    1.17  #define SDL_INTERNAL_BUILDING_LOADSO 1
    1.18  #if defined(USE_DUMMY_LOADSO)
    1.19  # include "loadso/dummy/SDL_loadso.c"
    1.20 +#elif defined(USE_DLOPEN)
    1.21 +# include "loadso/dlopen/SDL_loadso.c"
    1.22  #elif defined(MACOSX)
    1.23  # include "loadso/macosx/SDL_loadso.c"
    1.24  #elif defined(macintosh)
    1.25  # include "loadso/macos/SDL_loadso.c"
    1.26 -#elif defined(USE_DLOPEN)
    1.27 -# include "loadso/dlopen/SDL_loadso.c"
    1.28  #elif defined(WIN32) || defined(_WIN32_WCE)
    1.29  # include "loadso/windows/SDL_loadso.c"
    1.30  #elif defined(__BEOS__)
     2.1 --- a/src/video/x11/SDL_x11dyn.c	Fri Jan 06 20:56:13 2006 +0000
     2.2 +++ b/src/video/x11/SDL_x11dyn.c	Fri Jan 06 20:57:59 2006 +0000
     2.3 @@ -56,7 +56,8 @@
     2.4  			if (fn != NULL)
     2.5  				printf("X11: Found '%s' in libXext (%p)\n", fnname, fn);
     2.6  			else
     2.7 -				printf("X11: Symbol '%s' NOT FOUND!\n", fnname);
     2.8 +				printf("X11: Symbol '%s' NOT FOUND!%s\n", fnname
     2.9 +				       required ? "" : " (...but not required!)");
    2.10  			#endif
    2.11  		}
    2.12  		*rc = ((fn != NULL) || (!required));