[ Thread Index |
Date Index
| More lists.liballeg.org/allegro-developers Archives
]
Attached is a patch against Allegro which allows succesful compiling on
IRIX 6.5.
Stepan Roh
diff -U 3 -N --recursive allegro-3.9.32.i386.Linux/examples/excamera.c allegro-3.9.32.SGI.IRIX/examples/excamera.c
--- allegro-3.9.32.i386.Linux/examples/excamera.c Mon Mar 13 01:23:54 2000
+++ allegro-3.9.32.SGI.IRIX/examples/excamera.c Mon Apr 10 17:55:48 2000
@@ -6,8 +6,9 @@
*/
-#include <math.h>
#include <stdio.h>
+
+#define ALLEGRO_INCLUDE_MATH_H
#include "allegro.h"
diff -U 3 -N --recursive allegro-3.9.32.i386.Linux/examples/exshade.c allegro-3.9.32.SGI.IRIX/examples/exshade.c
--- allegro-3.9.32.i386.Linux/examples/exshade.c Mon Mar 13 01:23:54 2000
+++ allegro-3.9.32.SGI.IRIX/examples/exshade.c Mon Apr 10 17:55:49 2000
@@ -5,7 +5,7 @@
*/
-#include <math.h>
+#define ALLEGRO_INCLUDE_MATH_H
#include "allegro.h"
diff -U 3 -N --recursive allegro-3.9.32.i386.Linux/examples/exswitch.c allegro-3.9.32.SGI.IRIX/examples/exswitch.c
--- allegro-3.9.32.i386.Linux/examples/exswitch.c Mon Mar 13 01:23:54 2000
+++ allegro-3.9.32.SGI.IRIX/examples/exswitch.c Mon Apr 10 17:55:50 2000
@@ -12,7 +12,7 @@
*/
-#include <math.h>
+#define ALLEGRO_INCLUDE_MATH_H
#include "allegro.h"
diff -U 3 -N --recursive allegro-3.9.32.i386.Linux/include/allegro/alucfg.h allegro-3.9.32.SGI.IRIX/include/allegro/alucfg.h
--- allegro-3.9.32.i386.Linux/include/allegro/alucfg.h Mon Mar 13 01:23:56 2000
+++ allegro-3.9.32.SGI.IRIX/include/allegro/alucfg.h Mon Apr 10 12:56:36 2000
@@ -36,6 +36,9 @@
# define O_TEXT 0
#endif
+#ifdef __sgi__
+# define fhypot sgi_fhypot
+#endif
#include <math.h>
#ifdef __sgi__
/* SGI defines these macros in <math.h>. */
@@ -49,6 +52,7 @@
# undef fsqrt
# undef fhypot
#endif
+#undef ALLEGRO_INCLUDE_MATH_H
/* These defines will be provided by configure script. */
#undef ALLEGRO_COLOR8
diff -U 3 -N --recursive allegro-3.9.32.i386.Linux/include/allegro.h allegro-3.9.32.SGI.IRIX/include/allegro.h
--- allegro-3.9.32.i386.Linux/include/allegro.h Mon Mar 13 01:23:57 2000
+++ allegro-3.9.32.SGI.IRIX/include/allegro.h Mon Apr 10 17:42:25 2000
@@ -40,7 +40,9 @@
#include "allegro/alconfig.h"
-
+#ifdef ALLEGRO_INCLUDE_MATH_H
+ #include <math.h>
+#endif
/*******************************************/
/************ Some global stuff ************/
diff -U 3 -N --recursive allegro-3.9.32.i386.Linux/src/color.c allegro-3.9.32.SGI.IRIX/src/color.c
--- allegro-3.9.32.i386.Linux/src/color.c Mon Mar 13 01:23:52 2000
+++ allegro-3.9.32.SGI.IRIX/src/color.c Mon Apr 10 17:43:48 2000
@@ -27,7 +27,8 @@
#include <limits.h>
#include <string.h>
-#include <math.h>
+
+#define ALLEGRO_INCLUDE_MATH_H
#include "allegro.h"
diff -U 3 -N --recursive allegro-3.9.32.i386.Linux/src/math.c allegro-3.9.32.SGI.IRIX/src/math.c
--- allegro-3.9.32.i386.Linux/src/math.c Mon Mar 13 01:23:49 2000
+++ allegro-3.9.32.SGI.IRIX/src/math.c Mon Apr 10 12:52:12 2000
@@ -16,7 +16,7 @@
*/
-#include <math.h>
+#define ALLEGRO_INCLUDE_MATH_H
#include "allegro.h"
diff -U 3 -N --recursive allegro-3.9.32.i386.Linux/src/math3d.c allegro-3.9.32.SGI.IRIX/src/math3d.c
--- allegro-3.9.32.i386.Linux/src/math3d.c Mon Mar 13 01:23:51 2000
+++ allegro-3.9.32.SGI.IRIX/src/math3d.c Mon Apr 10 17:45:19 2000
@@ -16,7 +16,7 @@
*/
-#include <math.h>
+#define ALLEGRO_INCLUDE_MATH_H
#include "allegro.h"
diff -U 3 -N --recursive allegro-3.9.32.i386.Linux/src/quat.c allegro-3.9.32.SGI.IRIX/src/quat.c
--- allegro-3.9.32.i386.Linux/src/quat.c Mon Mar 13 01:23:49 2000
+++ allegro-3.9.32.SGI.IRIX/src/quat.c Mon Apr 10 17:45:20 2000
@@ -16,7 +16,7 @@
*/
-#include <math.h>
+#define ALLEGRO_INCLUDE_MATH_H
#include "allegro.h"
diff -U 3 -N --recursive allegro-3.9.32.i386.Linux/src/spline.c allegro-3.9.32.SGI.IRIX/src/spline.c
--- allegro-3.9.32.i386.Linux/src/spline.c Mon Mar 13 01:23:52 2000
+++ allegro-3.9.32.SGI.IRIX/src/spline.c Mon Apr 10 17:45:22 2000
@@ -31,7 +31,7 @@
*/
-#include <math.h>
+#define ALLEGRO_INCLUDE_MATH_H
#include "allegro.h"
#include "allegro/aintern.h"
diff -U 3 -N --recursive allegro-3.9.32.i386.Linux/tests/akaitest.c allegro-3.9.32.SGI.IRIX/tests/akaitest.c
--- allegro-3.9.32.i386.Linux/tests/akaitest.c Mon Mar 13 01:23:55 2000
+++ allegro-3.9.32.SGI.IRIX/tests/akaitest.c Mon Apr 10 17:54:29 2000
@@ -18,7 +18,8 @@
#include <stdio.h>
#include <string.h>
-#include <math.h>
+
+#define ALLEGRO_INCLUDE_MATH_H
#include "allegro.h"
diff -U 3 -N --recursive allegro-3.9.32.i386.Linux/tests/test.c allegro-3.9.32.SGI.IRIX/tests/test.c
--- allegro-3.9.32.i386.Linux/tests/test.c Mon Mar 13 01:23:55 2000
+++ allegro-3.9.32.SGI.IRIX/tests/test.c Mon Apr 10 17:55:03 2000
@@ -18,7 +18,8 @@
#include <stdio.h>
#include <string.h>
-#include <math.h>
+
+#define ALLEGRO_INCLUDE_MATH_H
#include "allegro.h"
diff -U 3 -N --recursive allegro-3.9.32.i386.Linux/tools/pat2dat.c allegro-3.9.32.SGI.IRIX/tools/pat2dat.c
--- allegro-3.9.32.i386.Linux/tools/pat2dat.c Mon Mar 13 01:23:48 2000
+++ allegro-3.9.32.SGI.IRIX/tools/pat2dat.c Mon Apr 10 17:55:01 2000
@@ -22,8 +22,9 @@
#include <stdio.h>
#include <string.h>
-#include <math.h>
#include <time.h>
+
+#define ALLEGRO_INCLUDE_MATH_H
#include "allegro.h"
#include "allegro/aintern.h"
--- allegro-3.9.32.i386.Linux/tools/digmid.c Mon Mar 13 01:23:48 2000
+++ allegro-3.9.32.SGI.IRIX/tools/digmid.c Mon Apr 10 17:55:01 2000
@@ -18,7 +18,8 @@
#include <string.h>
#include <limits.h>
-#include <math.h>
+
+#define ALLEGRO_INCLUDE_MATH_H
#include "allegro.h"
#include "allegro/aintern.h"