Skip to content
Permalink
Browse files

build fixes for IRIX 6.5 - dynamic X11 loading works! :)

  • Loading branch information
slouken committed Feb 20, 2006
1 parent 556bc15 commit 20bc81de5a1bc7a9d488e17d4f611e9dc39a38ea
@@ -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
@@ -14,15 +14,15 @@
#define NEED_EVENTS
#define NEED_REPLIES

#include <X11/Xlibint.h>
#include "../../x11/SDL_x11dyn.h"

/*#include <X11/Xlibint.h>*/
#include <X11/Xthreads.h>
#include <X11/Xmd.h>
#include <X11/Xproto.h>
#include <X11/extensions/Xext.h>
#include "../extensions/extutil.h"

#include "../../x11/SDL_x11dyn.h"

/*****************************************************************************/


@@ -27,16 +27,17 @@ Equipment Corporation.

#define NEED_EVENTS
#define NEED_REPLIES
#include <X11/Xlibint.h>

#include "../../x11/SDL_x11dyn.h"

/*#include <X11/Xlibint.h>*/
#include <X11/Xutil.h>
#include <X11/extensions/Xext.h> /* in ../include */
#include "../extensions/extutil.h" /* in ../include */
#include "../extensions/panoramiXext.h"
#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;
@@ -56,8 +56,6 @@ SOFTWARE.
#include <X11/extensions/XShm.h>
#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;
@@ -43,7 +43,9 @@ SOFTWARE.

#define NEED_REPLIES

#include <X11/Xlibint.h>
#include "../../x11/SDL_x11dyn.h"

/*#include <X11/Xlibint.h>*/
#include "../extensions/Xvproto.h"
#include "../extensions/Xvlib.h"

@@ -58,14 +58,15 @@ Copyright (c) 1995,1996 The XFree86 Project, Inc

#define NEED_EVENTS
#define NEED_REPLIES
#include <X11/Xlibint.h>

#include "../../x11/SDL_x11dyn.h"

/*#include <X11/Xlibint.h>*/
#include "../extensions/xf86dga.h"
#include "../extensions/xf86dgastr.h"
#include <X11/extensions/Xext.h>
#include "../extensions/extutil.h"

#include "../../x11/SDL_x11dyn.h"

extern XExtDisplayInfo* SDL_NAME(xdga_find_display)(Display*);
extern char *SDL_NAME(xdga_extension_name);

@@ -16,7 +16,10 @@ Copyright (c) 1995,1996 The XFree86 Project, Inc

#define NEED_EVENTS
#define NEED_REPLIES
#include <X11/Xlibint.h>

#include "../../x11/SDL_x11dyn.h"

/*#include <X11/Xlibint.h>*/
#include "../extensions/xf86dga.h"
#include "../extensions/xf86dgastr.h"
#include <X11/extensions/Xext.h>
@@ -28,8 +31,6 @@ Copyright (c) 1995,1996 The XFree86 Project, Inc
#include <linux/fb.h>
#endif

#include "../../x11/SDL_x11dyn.h"

/* If you change this, change the Bases[] array below as well */
#define MAX_HEADS 16

@@ -35,8 +35,11 @@ from Kaleb S. KEITHLEY.

#define NEED_EVENTS
#define NEED_REPLIES

#include "../../x11/SDL_x11dyn.h"

#ifndef XBUILD_IN_CLIENT
#include <X11/Xlibint.h>
/*#include <X11/Xlibint.h>*/
#include "../extensions/xf86vmstr.h"
#include <X11/extensions/Xext.h>
#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 <stdio.h>
#endif

0 comments on commit 20bc81d

Please sign in to comment.