Index: code/sdl/sdl_glimp.c =================================================================== --- code/sdl/sdl_glimp.c (revision 1212) +++ code/sdl/sdl_glimp.c (working copy) @@ -62,6 +62,13 @@ #define GLimp_SetCurrentContext(ctx) #endif +/* SGI IRIX needs definitions for multitexture types */ +#ifdef __sgi +typedef void (*PFNGLMULTITEXCOORD2FARBPROC)(GLenum target, GLfloat s, GLfloat t); +typedef void (*PFNGLACTIVETEXTUREARBPROC)(GLenum target); +typedef void (*PFNGLCLIENTACTIVETEXTUREARBPROC)(GLenum target); +#endif + static QGLContext opengl_context; typedef enum Index: code/qcommon/q_platform.h =================================================================== --- code/qcommon/q_platform.h (revision 1212) +++ code/qcommon/q_platform.h (working copy) @@ -274,6 +274,15 @@ #endif +//================================================================== IRIX === +#ifdef __sgi +#define OS_STRING "irix" +#define ID_INLINE __inline +#define PATH_SEP '/' +#define ARCH_STRING "mips" +#define Q3_BIG_ENDIAN /* SGI's MIPS are always big endian */ +#define DLL_EXT ".so" +#endif //================================================================== Q3VM === #ifdef Q3_VM Index: code/qcommon/net_ip.c =================================================================== --- code/qcommon/net_ip.c (revision 1212) +++ code/qcommon/net_ip.c (working copy) @@ -63,6 +63,10 @@ #include #endif +#ifdef __sgi +#include /* struct timeval */ +#endif + typedef int SOCKET; #define INVALID_SOCKET -1 #define SOCKET_ERROR -1 Index: code/sys/con_tty.c =================================================================== --- code/sys/con_tty.c (revision 1212) +++ code/sys/con_tty.c (working copy) @@ -28,6 +28,10 @@ #include #include +#ifdef __sgi +#include /* struct timeval */ +#endif + /* ============================================================= tty console routines Index: Makefile =================================================================== --- Makefile (revision 1212) +++ Makefile (working copy) @@ -636,12 +636,15 @@ # SETUP AND BUILD -- IRIX ############################################################################# -ifeq ($(PLATFORM),irix) +ifeq ($(PLATFORM),irix64) ARCH=mips #default to MIPS + + CC=c99 + MKDIR=mkdir -p - BASE_CFLAGS=-Dstricmp=strcasecmp -Xcpluscomm -woff 1185 -mips3 \ - -nostdinc -I. -I$(ROOT)/usr/include -DNO_VM_COMPILED + BASE_CFLAGS=-Dstricmp=strcasecmp -Xcpluscomm -woff 1185 \ + -I. $(shell sdl-config --cflags) -I$(ROOT)/usr/include -DNO_VM_COMPILED RELEASE_CFLAGS=$(BASE_CFLAGS) -O3 DEBUG_CFLAGS=$(BASE_CFLAGS) -g @@ -649,8 +652,8 @@ SHLIBCFLAGS= SHLIBLDFLAGS=-shared - LDFLAGS=-ldl -lm - CLIENT_LDFLAGS=-L/usr/X11/$(LIB) -lGL -lX11 -lXext -lm + LDFLAGS=-ldl -lm -lgen + CLIENT_LDFLAGS=-L/usr/X11/$(LIB) $(shell sdl-config --libs) -lGL -lX11 -lXext -lm else # ifeq IRIX