File fix_build.diff of Package d2x-rebirth
diff -ur d2x-rebirth_v0.58.1-src.old/3d/draw.c d2x-rebirth_v0.58.1-src/3d/draw.c
--- d2x-rebirth_v0.58.1-src.old/3d/draw.c 2013-07-18 12:33:35.000000000 +0200
+++ d2x-rebirth_v0.58.1-src/3d/draw.c 2013-08-06 23:52:21.000000000 +0200
@@ -65,7 +65,7 @@
}
//draws a line. takes two points. returns true if drew
-bool g3_draw_line(g3s_point *p0,g3s_point *p1)
+bool g3_draw_line(const g3s_point *p0,const g3s_point *p1)
{
ubyte codes_or;
@@ -194,7 +194,7 @@
#ifndef OGL
//draw a flat-shaded face.
//returns 1 if off screen, 0 if drew
-bool g3_draw_poly(int nv,g3s_point **pointlist)
+bool g3_draw_poly(int nv,const g3s_point **pointlist)
{
int i;
g3s_point **bufptr;
@@ -242,7 +242,7 @@
//draw a texture-mapped face.
//returns 1 if off screen, 0 if drew
-bool g3_draw_tmap(int nv,g3s_point **pointlist,g3s_uvl *uvl_list,g3s_lrgb *light_rgb,grs_bitmap *bm)
+bool g3_draw_tmap(int nv,const g3s_point **pointlist,g3s_uvl *uvl_list,g3s_lrgb *light_rgb,grs_bitmap *bm)
{
int i;
g3s_point **bufptr;
diff -ur d2x-rebirth_v0.58.1-src.old/arch/include/joy.h d2x-rebirth_v0.58.1-src/arch/include/joy.h
--- d2x-rebirth_v0.58.1-src.old/arch/include/joy.h 2013-04-22 11:36:35.000000000 +0200
+++ d2x-rebirth_v0.58.1-src/arch/include/joy.h 2013-11-01 15:55:42.000000000 +0200
@@ -9,7 +9,7 @@
#include "pstypes.h"
#include "fix.h"
-#include <SDL.h>
+#include <SDL/SDL.h>
struct d_event;
diff -ur d2x-rebirth_v0.58.1-src.old/arch/ogl/gr.c d2x-rebirth_v0.58.1-src/arch/ogl/gr.c
--- d2x-rebirth_v0.58.1-src.old/arch/ogl/gr.c 2013-04-22 11:36:35.000000000 +0200
+++ d2x-rebirth_v0.58.1-src/arch/ogl/gr.c 2013-11-01 15:55:42.000000000 +0200
@@ -28,7 +28,7 @@
#endif
#include <errno.h>
-#include <SDL.h>
+#include <SDL/SDL.h>
#include "hudmsg.h"
#include "game.h"
#include "text.h"
diff -ur d2x-rebirth_v0.58.1-src.old/arch/sdl/digi_audio.c d2x-rebirth_v0.58.1-src/arch/sdl/digi_audio.c
--- d2x-rebirth_v0.58.1-src.old/arch/sdl/digi_audio.c 2013-04-22 11:36:35.000000000 +0200
+++ d2x-rebirth_v0.58.1-src/arch/sdl/digi_audio.c 2013-11-01 15:55:42.000000000 +0200
@@ -8,7 +8,7 @@
#include <stdlib.h>
#include <stdio.h>
#include <string.h>
-#include <SDL.h>
+#include <SDL/SDL.h>
#include <digi_audio.h>
#include "pstypes.h"
#include "dxxerror.h"
diff -ur d2x-rebirth_v0.58.1-src.old/arch/sdl/digi_mixer.c d2x-rebirth_v0.58.1-src/arch/sdl/digi_mixer.c
--- d2x-rebirth_v0.58.1-src.old/arch/sdl/digi_mixer.c 2013-04-22 11:36:35.000000000 +0200
+++ d2x-rebirth_v0.58.1-src/arch/sdl/digi_mixer.c 2013-11-01 15:55:42.000000000 +0200
@@ -12,10 +12,10 @@
#include <stdio.h>
#include <string.h>
-#include <SDL.h>
-#include <SDL_audio.h>
+#include <SDL/SDL.h>
+#include <SDL/SDL_audio.h>
#if !(defined(__APPLE__) && defined(__MACH__))
-#include <SDL_mixer.h>
+#include <SDL/SDL_mixer.h>
#else
#include <SDL_mixer/SDL_mixer.h>
#endif
diff -ur d2x-rebirth_v0.58.1-src.old/arch/sdl/digi_mixer_music.c d2x-rebirth_v0.58.1-src/arch/sdl/digi_mixer_music.c
--- d2x-rebirth_v0.58.1-src.old/arch/sdl/digi_mixer_music.c 2013-04-22 11:36:35.000000000 +0200
+++ d2x-rebirth_v0.58.1-src/arch/sdl/digi_mixer_music.c 2013-11-01 15:55:42.000000000 +0200
@@ -6,9 +6,9 @@
* -- MD2211 (2006-04-24)
*/
-#include <SDL.h>
+#include <SDL/SDL.h>
#if !(defined(__APPLE__) && defined(__MACH__))
-#include <SDL_mixer.h>
+#include <SDL/SDL_mixer.h>
#else
#include <SDL_mixer/SDL_mixer.h>
#endif
diff -ur d2x-rebirth_v0.58.1-src.old/arch/sdl/gr.c d2x-rebirth_v0.58.1-src/arch/sdl/gr.c
--- d2x-rebirth_v0.58.1-src.old/arch/sdl/gr.c 2013-04-22 11:36:35.000000000 +0200
+++ d2x-rebirth_v0.58.1-src/arch/sdl/gr.c 2013-11-01 15:55:42.000000000 +0200
@@ -8,7 +8,7 @@
#include <string.h>
#include <limits.h>
#include <math.h>
-#include <SDL.h>
+#include <SDL/SDL.h>
#include "gr.h"
#include "grdef.h"
#include "palette.h"
diff -ur d2x-rebirth_v0.58.1-src.old/arch/sdl/init.c d2x-rebirth_v0.58.1-src/arch/sdl/init.c
--- d2x-rebirth_v0.58.1-src.old/arch/sdl/init.c 2013-04-22 11:36:35.000000000 +0200
+++ d2x-rebirth_v0.58.1-src/arch/sdl/init.c 2013-11-01 15:55:42.000000000 +0200
@@ -1,6 +1,6 @@
// Holds the main init and de-init functions for arch-related program parts
-#include <SDL.h>
+#include <SDL/SDL.h>
#include "songs.h"
#include "key.h"
#include "digi.h"
diff -ur d2x-rebirth_v0.58.1-src.old/arch/sdl/key.c d2x-rebirth_v0.58.1-src/arch/sdl/key.c
--- d2x-rebirth_v0.58.1-src.old/arch/sdl/key.c 2013-04-22 11:36:35.000000000 +0200
+++ d2x-rebirth_v0.58.1-src/arch/sdl/key.c 2013-11-01 15:55:42.000000000 +0200
@@ -8,7 +8,7 @@
#include <stdio.h>
#include <stdlib.h>
-#include <SDL.h>
+#include <SDL/SDL.h>
#include "event.h"
#include "dxxerror.h"
diff -ur d2x-rebirth_v0.58.1-src.old/arch/sdl/mouse.c d2x-rebirth_v0.58.1-src/arch/sdl/mouse.c
--- d2x-rebirth_v0.58.1-src.old/arch/sdl/mouse.c 2013-04-22 11:36:35.000000000 +0200
+++ d2x-rebirth_v0.58.1-src/arch/sdl/mouse.c 2013-11-01 15:55:42.000000000 +0200
@@ -5,7 +5,7 @@
*/
#include <string.h>
-#include <SDL.h>
+#include <SDL/SDL.h>
#include "fix.h"
#include "timer.h"
diff -ur d2x-rebirth_v0.58.1-src.old/arch/sdl/rbaudio.c d2x-rebirth_v0.58.1-src/arch/sdl/rbaudio.c
--- d2x-rebirth_v0.58.1-src.old/arch/sdl/rbaudio.c 2013-04-22 11:36:35.000000000 +0200
+++ d2x-rebirth_v0.58.1-src/arch/sdl/rbaudio.c 2013-11-01 15:55:42.000000000 +0200
@@ -8,7 +8,7 @@
#include <stdio.h>
#include <stdlib.h>
-#include <SDL.h>
+#include <SDL/SDL.h>
#ifdef __linux__
#include <sys/ioctl.h>
diff -ur d2x-rebirth_v0.58.1-src.old/arch/sdl/timer.c d2x-rebirth_v0.58.1-src/arch/sdl/timer.c
--- d2x-rebirth_v0.58.1-src.old/arch/sdl/timer.c 2013-04-22 11:36:35.000000000 +0200
+++ d2x-rebirth_v0.58.1-src/arch/sdl/timer.c 2013-11-01 15:55:42.000000000 +0200
@@ -4,7 +4,7 @@
*
*/
-#include <SDL.h>
+#include <SDL/SDL.h>
#include "maths.h"
#include "timer.h"
diff -ur d2x-rebirth_v0.58.1-src.old/include/physfsrwops.h d2x-rebirth_v0.58.1-src/include/physfsrwops.h
--- d2x-rebirth_v0.58.1-src.old/include/physfsrwops.h 2013-04-22 11:36:35.000000000 +0200
+++ d2x-rebirth_v0.58.1-src/include/physfsrwops.h 2013-11-01 15:55:42.000000000 +0200
@@ -4,7 +4,7 @@
#else
#include <physfs/physfs.h>
#endif
-#include <SDL.h>
+#include <SDL/SDL.h>
#ifdef __cplusplus
extern "C" {
diff -ur d2x-rebirth_v0.58.1-src.old/libmve/mveplay.c d2x-rebirth_v0.58.1-src/libmve/mveplay.c
--- d2x-rebirth_v0.58.1-src.old/libmve/mveplay.c 2013-04-22 11:36:35.000000000 +0200
+++ d2x-rebirth_v0.58.1-src/libmve/mveplay.c 2013-11-01 15:55:42.000000000 +0200
@@ -18,10 +18,10 @@
# endif // macintosh
#endif // _WIN32
-#include <SDL.h>
+#include <SDL/SDL.h>
#ifdef USE_SDLMIXER
#if !(defined(__APPLE__) && defined(__MACH__))
-#include <SDL_mixer.h>
+#include <SDL/SDL_mixer.h>
#else
#include <SDL_mixer/SDL_mixer.h>
#endif
diff -ur d2x-rebirth_v0.58.1-src.old/main/console.c d2x-rebirth_v0.58.1-src/main/console.c
--- d2x-rebirth_v0.58.1-src.old/main/console.c 2013-04-22 11:36:35.000000000 +0200
+++ d2x-rebirth_v0.58.1-src/main/console.c 2013-11-01 15:55:42.000000000 +0200
@@ -9,7 +9,7 @@
#include <stdarg.h>
#include <string.h>
#include <time.h>
-#include <SDL.h>
+#include <SDL/SDL.h>
#include "window.h"
#include "console.h"
#include "args.h"
diff -ur d2x-rebirth_v0.58.1-src.old/main/game.c d2x-rebirth_v0.58.1-src/main/game.c
--- d2x-rebirth_v0.58.1-src.old/main/game.c 2013-04-22 11:36:35.000000000 +0200
+++ d2x-rebirth_v0.58.1-src/main/game.c 2013-11-01 15:55:42.000000000 +0200
@@ -21,7 +21,7 @@
#include <stdlib.h>
#include <string.h>
#include <stdarg.h>
-#include <SDL.h>
+#include <SDL/SDL.h>
#include <setjmp.h>
#ifdef OGL
diff -ur d2x-rebirth_v0.58.1-src.old/main/inferno.c d2x-rebirth_v0.58.1-src/main/inferno.c
--- d2x-rebirth_v0.58.1-src.old/main/inferno.c 2013-04-22 11:36:35.000000000 +0200
+++ d2x-rebirth_v0.58.1-src/main/inferno.c 2013-11-01 15:55:42.000000000 +0200
@@ -29,7 +29,7 @@
#include <stdlib.h>
#include <string.h>
#include <limits.h>
-#include <SDL.h>
+#include <SDL/SDL.h>
#ifdef __unix__
#include <unistd.h>
