From 1d7a0409396fdff43ecca7e472a6126d593cea08 Mon Sep 17 00:00:00 2001 From: Sam Lantinga Date: Mon, 20 Feb 2006 08:49:00 +0000 Subject: [PATCH] build fixes for IRIX 6.5 - dynamic X11 loading works! :) --HG-- extra : convert_revision : svn%3Ac70aab31-4412-0410-b14c-859654838e24/trunk%401388 --- configure.in | 18 +++++++++++------- src/video/Xext/XME/xme.c | 6 +++--- src/video/Xext/Xinerama/Xinerama.c | 7 ++++--- src/video/Xext/Xv/Xv.c | 2 -- src/video/Xext/Xv/Xvlibint.h | 4 +++- src/video/Xext/Xxf86dga/XF86DGA.c | 7 ++++--- src/video/Xext/Xxf86dga/XF86DGA2.c | 7 ++++--- src/video/Xext/Xxf86vm/XF86VMode.c | 7 ++++--- 8 files changed, 33 insertions(+), 25 deletions(-) diff --git a/configure.in b/configure.in index ed2836944..d697236b6 100644 --- a/configure.in +++ b/configure.in @@ -737,20 +737,24 @@ AC_HELP_STRING([--enable-x11-shared], [dynamically load X11 support [default=yes , enable_x11_shared=yes) case "$target" in - *-*-darwin* ) + *-*-darwin*) x11_lib='/usr/X11R6/lib/libX11.6.dylib' x11ext_lib='/usr/X11R6/lib/libXext.6.dylib' ;; - *-*-osf* ) + *-*-osf*) + x11_lib='libX11.so' + x11ext_lib='libXext.so' + ;; + *-*-irix*) # IRIX 6.5 requires that we use /usr/lib32 x11_lib='libX11.so' x11ext_lib='libXext.so' ;; *) if test x$X_LIBS = x; then X_LIBS="-L/usr/lib"; fi - x11_lib_spec=`echo $X_LIBS | sed 's/.*-L\([[^ ]]*\).*/\1\/libX11.so.*/'` - x11_lib=`ls $x11_lib_spec | sed 's/.*\/\(.*\)/\1/; q'` - x11ext_lib_spec=`echo $X_LIBS | sed 's/.*-L\([[^ ]]*\).*/\1\/libXext.so.*/'` - x11ext_lib=`ls $x11ext_lib_spec | sed 's/.*\/\(.*\)/\1/; q'` + x11_lib_spec=`echo $X_LIBS | sed 's/.*-L\([[^ ]]*\).*/\1\/libX11.so*/'` + x11_lib=`ls $x11_lib_spec 2>/dev/null | sort -r | sed 's/.*\/\(.*\)/\1/; q'` + x11ext_lib_spec=`echo $X_LIBS | sed 's/.*-L\([[^ ]]*\).*/\1\/libXext.so*/'` + x11ext_lib=`ls $x11ext_lib_spec 2>/dev/null | sort -r | sed 's/.*\/\(.*\)/\1/; q'` ;; esac @@ -2352,7 +2356,7 @@ OBJECTS=`echo $OBJECTS | sed 's,[[^ ]]*/\([[^ ]]*\)\.c,$(objects)/\1.lo,g'` # Set runtime shared library paths as needed if test "x$enable_rpath" = "xyes"; then - if test $ARCH = linux -o $ARCH = freebsd -o $ARCH = bsdi; then + if test $ARCH = linux -o $ARCH = freebsd -o $ARCH = bsdi -o $ARCH = irix; then SDL_RLD_FLAGS="-Wl,-rpath,\${exec_prefix}/lib" fi if test $ARCH = solaris; then diff --git a/src/video/Xext/XME/xme.c b/src/video/Xext/XME/xme.c index be6869dc9..539f578f9 100644 --- a/src/video/Xext/XME/xme.c +++ b/src/video/Xext/XME/xme.c @@ -14,15 +14,15 @@ #define NEED_EVENTS #define NEED_REPLIES -#include +#include "../../x11/SDL_x11dyn.h" + +/*#include */ #include #include #include #include #include "../extensions/extutil.h" -#include "../../x11/SDL_x11dyn.h" - /*****************************************************************************/ diff --git a/src/video/Xext/Xinerama/Xinerama.c b/src/video/Xext/Xinerama/Xinerama.c index dca8adcab..c348978f9 100644 --- a/src/video/Xext/Xinerama/Xinerama.c +++ b/src/video/Xext/Xinerama/Xinerama.c @@ -27,7 +27,10 @@ Equipment Corporation. #define NEED_EVENTS #define NEED_REPLIES -#include + +#include "../../x11/SDL_x11dyn.h" + +/*#include */ #include #include /* in ../include */ #include "../extensions/extutil.h" /* in ../include */ @@ -35,8 +38,6 @@ Equipment Corporation. #include "../extensions/panoramiXproto.h" /* in ../include */ #include "../extensions/Xinerama.h" -#include "../../x11/SDL_x11dyn.h" - static XExtensionInfo _panoramiX_ext_info_data; static XExtensionInfo *panoramiX_ext_info = &_panoramiX_ext_info_data; static /* const */ char *panoramiX_extension_name = PANORAMIX_PROTOCOL_NAME; diff --git a/src/video/Xext/Xv/Xv.c b/src/video/Xext/Xv/Xv.c index bf6e5c77a..1b41bc0ae 100644 --- a/src/video/Xext/Xv/Xv.c +++ b/src/video/Xext/Xv/Xv.c @@ -56,8 +56,6 @@ SOFTWARE. #include #include "../extensions/extutil.h" -#include "../../x11/SDL_x11dyn.h" - static XExtensionInfo _xv_info_data; static XExtensionInfo *xv_info = &_xv_info_data; static char *xv_extension_name = XvName; diff --git a/src/video/Xext/Xv/Xvlibint.h b/src/video/Xext/Xv/Xvlibint.h index 9d0cb239e..78d2599e3 100644 --- a/src/video/Xext/Xv/Xvlibint.h +++ b/src/video/Xext/Xv/Xvlibint.h @@ -43,7 +43,9 @@ SOFTWARE. #define NEED_REPLIES -#include +#include "../../x11/SDL_x11dyn.h" + +/*#include */ #include "../extensions/Xvproto.h" #include "../extensions/Xvlib.h" diff --git a/src/video/Xext/Xxf86dga/XF86DGA.c b/src/video/Xext/Xxf86dga/XF86DGA.c index b31625423..3d94b01f1 100644 --- a/src/video/Xext/Xxf86dga/XF86DGA.c +++ b/src/video/Xext/Xxf86dga/XF86DGA.c @@ -58,14 +58,15 @@ Copyright (c) 1995,1996 The XFree86 Project, Inc #define NEED_EVENTS #define NEED_REPLIES -#include + +#include "../../x11/SDL_x11dyn.h" + +/*#include */ #include "../extensions/xf86dga.h" #include "../extensions/xf86dgastr.h" #include #include "../extensions/extutil.h" -#include "../../x11/SDL_x11dyn.h" - extern XExtDisplayInfo* SDL_NAME(xdga_find_display)(Display*); extern char *SDL_NAME(xdga_extension_name); diff --git a/src/video/Xext/Xxf86dga/XF86DGA2.c b/src/video/Xext/Xxf86dga/XF86DGA2.c index f792242de..b278ed3e2 100644 --- a/src/video/Xext/Xxf86dga/XF86DGA2.c +++ b/src/video/Xext/Xxf86dga/XF86DGA2.c @@ -16,7 +16,10 @@ Copyright (c) 1995,1996 The XFree86 Project, Inc #define NEED_EVENTS #define NEED_REPLIES -#include + +#include "../../x11/SDL_x11dyn.h" + +/*#include */ #include "../extensions/xf86dga.h" #include "../extensions/xf86dgastr.h" #include @@ -28,8 +31,6 @@ Copyright (c) 1995,1996 The XFree86 Project, Inc #include #endif -#include "../../x11/SDL_x11dyn.h" - /* If you change this, change the Bases[] array below as well */ #define MAX_HEADS 16 diff --git a/src/video/Xext/Xxf86vm/XF86VMode.c b/src/video/Xext/Xxf86vm/XF86VMode.c index c81b1f714..fdcf00f43 100644 --- a/src/video/Xext/Xxf86vm/XF86VMode.c +++ b/src/video/Xext/Xxf86vm/XF86VMode.c @@ -35,8 +35,11 @@ from Kaleb S. KEITHLEY. #define NEED_EVENTS #define NEED_REPLIES + +#include "../../x11/SDL_x11dyn.h" + #ifndef XBUILD_IN_CLIENT -#include +/*#include */ #include "../extensions/xf86vmstr.h" #include #include "../extensions/extutil.h" @@ -47,8 +50,6 @@ from Kaleb S. KEITHLEY. #include "include/extensions/extutil.h" #endif -#include "../../x11/SDL_x11dyn.h" - #ifdef DEBUG #include #endif