summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDarkvater <darkvater@openttd.org>2005-05-14 22:42:33 +0000
committerDarkvater <darkvater@openttd.org>2005-05-14 22:42:33 +0000
commit4c0c553a8f5c2c2ce17d41ff4485f408f8ceaae5 (patch)
tree59a6d14cf6229925dfeec03df0b7112f1827c2da
parent220e5be863b020dde8b40216d49e83f9de400ad7 (diff)
downloadopenttd-4c0c553a8f5c2c2ce17d41ff4485f408f8ceaae5.tar.xz
(svn r2314) - Feature: [ 1187490 ] Patches for building on IRIX (jgilje)
-rw-r--r--Makefile4
-rw-r--r--network_core.h2
-rw-r--r--sdl.c2
3 files changed, 7 insertions, 1 deletions
diff --git a/Makefile b/Makefile
index 453dc13d8..519392524 100644
--- a/Makefile
+++ b/Makefile
@@ -332,11 +332,13 @@ ifndef DEBUG
ifndef PROFILE
# Release mode
ifndef MORPHOS
+ifndef IRIX
# automatical strip breaks under morphos
BASECFLAGS += -s
LDFLAGS += -s
endif
endif
+endif
ifdef OSX
# these compilerflags makes the app run as fast as possible without making the app unstable. It works on G3 or newer
@@ -349,10 +351,12 @@ else
BASECFLAGS += -O2
endif
ifndef PROFILE
+ifndef IRIX
BASECFLAGS += -fomit-frame-pointer
endif
endif
endif
+endif
ifdef STATIC
ifndef OSX # OSX can't build static if -static flag is used
diff --git a/network_core.h b/network_core.h
index e442391fd..4c92be82b 100644
--- a/network_core.h
+++ b/network_core.h
@@ -57,7 +57,7 @@ typedef struct ifreq IFREQ;
# include <arpa/inet.h>
# include <net/if.h>
// According to glibc/NEWS, <ifaddrs.h> appeared in glibc-2.3.
-# if !defined(SUNOS) && !defined(__MORPHOS__) && !defined(__BEOS__) \
+# if !defined(__sgi__) && !defined(SUNOS) && !defined(__MORPHOS__) && !defined(__BEOS__) \
&& !(defined(__GLIBC__) && (__GLIBC__ <= 2) && (__GLIBC_MINOR__ <= 2)) && !defined(__dietlibc__)
// If for any reason ifaddrs.h does not exist on your system, comment out
// the following two lines and an alternative way will be used to fetch
diff --git a/sdl.c b/sdl.c
index e91063c7a..f6f5fe926 100644
--- a/sdl.c
+++ b/sdl.c
@@ -421,6 +421,8 @@ static uint32 ConvertSdlKeyIntoMy(SDL_keysym *sym)
#elif defined(__SVR4) && defined(__sun)
if (sym->scancode == 60) key |= WKC_BACKQUOTE;
if (sym->scancode == 49) key |= WKC_BACKSPACE;
+#elif defined(__sgi__)
+ if (sym->scancode == 22) key |= WKC_BACKQUOTE;
#else
if (sym->scancode == 41) key |= WKC_BACKQUOTE; // Linux console
if (sym->scancode == 49) key |= WKC_BACKQUOTE;