diff options
| -rw-r--r-- | Makefile | 18 | ||||
| -rw-r--r-- | code/qcommon/net_ip.c | 1 | ||||
| -rw-r--r-- | code/qcommon/q_platform.h | 79 | ||||
| -rw-r--r-- | code/sys/con_tty.c | 1 | ||||
| -rw-r--r-- | code/sys/sys_local.h | 5 | ||||
| -rw-r--r-- | misc/msvc/quake3.vcproj | 2 |
6 files changed, 43 insertions, 63 deletions
@@ -636,12 +636,15 @@ else # ifeq netbsd # SETUP AND BUILD -- IRIX ############################################################################# -ifeq ($(PLATFORM),irix) +ifeq ($(PLATFORM),irix64) ARCH=mips #default to MIPS - BASE_CFLAGS=-Dstricmp=strcasecmp -Xcpluscomm -woff 1185 -mips3 \ - -nostdinc -I. -I$(ROOT)/usr/include -DNO_VM_COMPILED + CC = c99 + MKDIR = mkdir -p + + 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,10 @@ ifeq ($(PLATFORM),irix) SHLIBCFLAGS= SHLIBLDFLAGS=-shared - LDFLAGS=-ldl -lm - CLIENT_LDFLAGS=-L/usr/X11/$(LIB) -lGL -lX11 -lXext -lm + LDFLAGS=-ldl -lm -lgen + # FIXME: The X libraries probably aren't necessary? + CLIENT_LDFLAGS=-L/usr/X11/$(LIB) $(shell sdl-config --libs) -lGL \ + -lX11 -lXext -lm else # ifeq IRIX @@ -794,9 +799,6 @@ ifeq ($(USE_SVN),1) BASE_CFLAGS += -DSVN_VERSION=\\\"$(SVN_VERSION)\\\" endif -# Require a minimum version of SDL -BASE_CFLAGS += -DMINSDL_MAJOR=1 -DMINSDL_MINOR=2 -DMINSDL_PATCH=7 - ifeq ($(V),1) echo_cmd=@: Q= diff --git a/code/qcommon/net_ip.c b/code/qcommon/net_ip.c index 8b56b30..e8bf397 100644 --- a/code/qcommon/net_ip.c +++ b/code/qcommon/net_ip.c @@ -50,6 +50,7 @@ static qboolean winsockInitialized = qfalse; #include <sys/ioctl.h> #include <sys/socket.h> #include <sys/types.h> +#include <sys/time.h> #include <unistd.h> #ifdef MACOS_X diff --git a/code/qcommon/q_platform.h b/code/qcommon/q_platform.h index a10ae9b..be57ef7 100644 --- a/code/qcommon/q_platform.h +++ b/code/qcommon/q_platform.h @@ -19,7 +19,7 @@ along with Quake III Arena source code; if not, write to the Free Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA =========================================================================== */ -// + #ifndef __Q_PLATFORM_H #define __Q_PLATFORM_H @@ -168,73 +168,28 @@ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA #endif -//=============================================================== FreeBSD === +//=================================================================== BSD === -#ifdef __FreeBSD__ +#if defined(__FreeBSD__) || defined(__OpenBSD__) || defined(__NetBSD__) #include <sys/types.h> #include <machine/endian.h> +#if defined(__FreeBSD__) #define OS_STRING "freebsd" -#define ID_INLINE inline -#define PATH_SEP '/' - -#ifdef __i386__ -#define ARCH_STRING "i386" -#elif defined __axp__ -#define ARCH_STRING "alpha" -#endif - -#if BYTE_ORDER == BIG_ENDIAN -#define Q3_BIG_ENDIAN -#else -#define Q3_LITTLE_ENDIAN -#endif - -#define DLL_EXT ".so" - -#endif - -//=============================================================== OpenBSD === - -#ifdef __OpenBSD__ - -#include <sys/types.h> -#include <machine/endian.h> - +#elif defined(__OpenBSD__) #define OS_STRING "openbsd" -#define ID_INLINE inline -#define PATH_SEP '/' - -#ifdef __i386__ -#define ARCH_STRING "i386" -#endif - -#if BYTE_ORDER == BIG_ENDIAN -#define Q3_BIG_ENDIAN -#else -#define Q3_LITTLE_ENDIAN -#endif - -#define DLL_EXT ".so" - +#elif defined(__NetBSD__) +#define OS_STRING "netbsd" #endif -//================================================================ NetBSD === - -// This is very much like the FreeBSD one and can probably be merged -#ifdef __NetBSD__ - -#include <sys/types.h> -#include <machine/endian.h> - -#define OS_STRING "netbsd" #define ID_INLINE inline #define PATH_SEP '/' #ifdef __i386__ #define ARCH_STRING "i386" -// Netbsd has alot of platforms +#elif defined __axp__ +#define ARCH_STRING "alpha" #endif #if BYTE_ORDER == BIG_ENDIAN @@ -274,6 +229,22 @@ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA #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 diff --git a/code/sys/con_tty.c b/code/sys/con_tty.c index 5e499eb..ee729da 100644 --- a/code/sys/con_tty.c +++ b/code/sys/con_tty.c @@ -27,6 +27,7 @@ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA #include <signal.h> #include <termios.h> #include <fcntl.h> +#include <sys/time.h> /* ============================================================= diff --git a/code/sys/sys_local.h b/code/sys/sys_local.h index 815852f..af0ed7c 100644 --- a/code/sys/sys_local.h +++ b/code/sys/sys_local.h @@ -23,6 +23,11 @@ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA #include "../qcommon/q_shared.h" #include "../qcommon/qcommon.h" +// Require a minimum version of SDL +#define MINSDL_MAJOR 1 +#define MINSDL_MINOR 2 +#define MINSDL_PATCH 7 + // Input subsystem void IN_Init (void); void IN_Frame (void); diff --git a/misc/msvc/quake3.vcproj b/misc/msvc/quake3.vcproj index d23bee0..702d175 100644 --- a/misc/msvc/quake3.vcproj +++ b/misc/msvc/quake3.vcproj @@ -46,7 +46,7 @@ Name="VCCLCompilerTool" Optimization="2" InlineFunctionExpansion="2" - PreprocessorDefinitions="_WIN32;WIN32;NDEBUG;_WINDOWS;USE_OPENAL;_CRT_SECURE_NO_DEPRECATE;MINSDL_MAJOR=1;MINSDL_MINOR=2;MINSDL_PATCH=7;BOTLIB;USE_ICON;USE_CURL" + PreprocessorDefinitions="_WIN32;WIN32;NDEBUG;_WINDOWS;USE_OPENAL;_CRT_SECURE_NO_DEPRECATE;BOTLIB;USE_ICON;USE_CURL" StringPooling="true" RuntimeLibrary="2" EnableFunctionLevelLinking="true" |