include SDL/SDL.h for all platforms and physfs/physfs.h for Mac OS X to avoid having to add some hard-coded include paths

2007-04-09 02:41:45 +00:00 · 2007-04-09 02:41:45 +00:00 · 4ff4ddd0a3
parent e89311954f
commit 4ff4ddd0a3
33 changed files with 73 additions and 24 deletions
--- a/arch/carbon/SDL_main.c
+++ b/arch/carbon/SDL_main.c
@ -50,7 +50,7 @@ static char rcsid =
 #endif

 /* Include the SDL main definition header */
-#include "SDL.h"
+#include <SDL/SDL.h>
 #include "SDL_main.h"
 #ifdef main
 #undef main
--- a/arch/cocoa/SDLMain.m
+++ b/arch/cocoa/SDLMain.m
@ -5,7 +5,7 @@
    Feel free to customize this file to suit your needs
 */

-#import "SDL.h"
+#import <SDL/SDL.h>
 #import "SDLMain.h"
 #import <sys/param.h> /* for MAXPATHLEN */
 #import <unistd.h>
--- a/arch/dos/digimm.c
+++ b/arch/dos/digimm.c
@ -7,7 +7,7 @@
 #include "mm_drv.h"
 #include "timer.h"

-//#include "SDL.h"
+//#include <SDL/SDL.h>
 //#include "SDL_audio.h"

 #include "error.h"
--- a/arch/include/gp2x.h
+++ b/arch/include/gp2x.h
@ -1,7 +1,7 @@
 #ifndef _GP2X_H_
 #define _GP2X_H_

-#include <SDL.h>
+#include <SDL/SDL.h>


 extern SDL_Joystick *gp2xJoystick;
--- a/arch/ogl/sdlgl.c
+++ b/arch/ogl/sdlgl.c
@ -10,7 +10,7 @@
 #include <conf.h>
 #endif

-#include <SDL.h>
+#include <SDL/SDL.h>
 #ifdef SDL_IMAGE
 #include <SDL_image.h>
 #endif
--- a/arch/sdl/digi.c
+++ b/arch/sdl/digi.c
@ -14,7 +14,7 @@
 #include <stdio.h>
 #include <string.h>

-#include <SDL.h>
+#include <SDL/SDL.h>

 #include "pstypes.h"
 #include "error.h"
--- a/arch/sdl/event.c
+++ b/arch/sdl/event.c
@ -13,7 +13,7 @@
 #include <stdio.h>
 #include <stdlib.h>

-#include <SDL.h>
+#include <SDL/SDL.h>

 #ifdef GP2X
 #include "gp2x.h"
--- a/arch/sdl/gr.c
+++ b/arch/sdl/gr.c
@ -13,7 +13,7 @@
 #include <stdlib.h>
 #include <string.h>
 #include <limits.h>
-#include <SDL.h>
+#include <SDL/SDL.h>
 #ifdef SDL_IMAGE
 #include <SDL_image.h>
 #endif
--- a/arch/sdl/init.c
+++ b/arch/sdl/init.c
@ -13,7 +13,7 @@
 #include <stdlib.h>
 #include <stdio.h>

-#include <SDL.h>
+#include <SDL/SDL.h>

 #include "text.h"
 #include "event.h"
--- a/arch/sdl/joy.c
+++ b/arch/sdl/joy.c
@ -11,7 +11,7 @@
 #endif

 #include <string.h>   // for memset
-#include <SDL.h>
+#include <SDL/SDL.h>

 #include "joy.h"
 #include "error.h"
--- a/arch/sdl/key.c
+++ b/arch/sdl/key.c
@ -13,7 +13,7 @@
 #include <stdio.h>
 #include <stdlib.h>

-#include <SDL.h>
+#include <SDL/SDL.h>

 #include "event.h"
 #include "error.h"
--- a/arch/sdl/mouse.c
+++ b/arch/sdl/mouse.c
@ -12,7 +12,7 @@

 #include <string.h>

-#include <SDL.h>
+#include <SDL/SDL.h>

 #include "fix.h"
 #include "timer.h"
--- a/arch/sdl/rbaudio.c
+++ b/arch/sdl/rbaudio.c
@ -13,7 +13,7 @@
 #include <stdio.h>
 #include <stdlib.h>

-#include <SDL.h>
+#include <SDL/SDL.h>

 #ifdef __linux__
 #include <sys/ioctl.h>
--- a/arch/sdl/timer.c
+++ b/arch/sdl/timer.c
@ -10,7 +10,7 @@
 #include <conf.h>
 #endif

-#include <SDL.h>
+#include <SDL/SDL.h>

 #include "maths.h"
 #include "timer.h"
--- a/dxx-changelog.txt
+++ b/dxx-changelog.txt
@ -3,6 +3,7 @@ D2X-Rebirth Changelog
 20070409
 --------
 arch/carbon/conf.h, include/pstypes.h: move determination of WORDS_BIG_ENDIAN to pstypes.h as SCons can't do it (as far as I know). SCons doesn't make conf.h
+arch/carbon/SDL_main.c, arch/cocoa/SDLMain.m, arch/dos/digimm.c, arch/include/gp2x.h, arch/ogl/sdlgl.c, arch/sdl/digi.c, arch/sdl/event.c, arch/sdl/gr.c, arch/sdl/init.c, arch/sdl/joy.c, arch/sdl/key.c, arch/sdl/mouse.c, arch/sdl/rbaudio.c, arch/sdl/timer.c, include/cfile.h, include/error.h, include/hmp2mid.h, include/physfsrwops.h, include/physfsx.h, libmve/mve_main.c, libmve/mveplay.c, main/config.c, main/console.c, main/gamecntl.c, main/inferno.c, main/newdemo.c, main/newmenu.c, main/newmenu.h, main/playsave.c, misc/hmp2mid.c, misc/ignorecase.c, ui/file.c: include SDL/SDL.h for all platforms and physfs/physfs.h for Mac OS X to avoid having to add some hard-coded include paths

 20070407
 --------
--- a/include/cfile.h
+++ b/include/cfile.h
@ -23,7 +23,11 @@ COPYRIGHT 1993-1999 PARALLAX SOFTWARE CORPORATION.  ALL RIGHTS RESERVED.

 #include <stdio.h>
 #include <string.h>
+#if !(defined(__APPLE__) && defined(__MACH__))
 #include <physfs.h>
+#else
+#include <physfs/physfs.h>
+#endif

 #include "pstypes.h"
 #include "maths.h"
--- a/include/error.h
+++ b/include/error.h
@ -56,7 +56,7 @@ extern void Debugger(void);	// Avoids some name clashes

 #ifdef __GNUC__
 #ifdef SDL_INPUT
-#include <SDL.h>
+#include <SDL/SDL.h>
 #endif
 #include "args.h"
 static inline void _Int3()
--- a/include/hmp2mid.h
+++ b/include/hmp2mid.h
@ -21,7 +21,11 @@
 #ifndef __HMP2MID_H
 #define __HMP2MID_H
 //#include <stdio.h>
+#if !(defined(__APPLE__) && defined(__MACH__))
 #include <physfs.h>
+#else
+#include <physfs/physfs.h>
+#endif

 //typedef size_t (*hmp2mid_read_func_t)(void *ptr, size_t size, size_t nmemb,
 //  void *stream);
--- a/include/physfsrwops.h
+++ b/include/physfsrwops.h
@ -23,8 +23,12 @@
 #ifndef _INCLUDE_PHYSFSRWOPS_H_
 #define _INCLUDE_PHYSFSRWOPS_H_

-#include "physfs.h"
-#include "SDL.h"
+#if !(defined(__APPLE__) && defined(__MACH__))
+#include <physfs.h>
+#else
+#include <physfs/physfs.h>
+#endif
+#include <SDL/SDL.h>

 #ifdef __cplusplus
 extern "C" {
--- a/include/physfsx.h
+++ b/include/physfsx.h
@ -24,7 +24,11 @@
 #include <string.h>
 #include <stdarg.h>

+#if !(defined(__APPLE__) && defined(__MACH__))
 #include <physfs.h>
+#else
+#include <physfs/physfs.h>
+#endif

 #include "pstypes.h"
 #include "error.h"
--- a/libmve/mve_main.c
+++ b/libmve/mve_main.c
@ -13,7 +13,7 @@
 # define LANDSCAPE
 #endif

-#include <SDL.h>
+#include <SDL/SDL.h>

 #include "libmve.h"

--- a/libmve/mveplay.c
+++ b/libmve/mveplay.c
@ -27,7 +27,7 @@
 #endif // _WIN32

 #if defined(AUDIO)
-#include <SDL.h>
+#include <SDL/SDL.h>
 #endif

 #include "mvelib.h"
--- a/main/config.c
+++ b/main/config.c
@ -38,7 +38,11 @@ COPYRIGHT 1993-1999 PARALLAX SOFTWARE CORPORATION.  ALL RIGHTS RESERVED.
 #include <string.h>
 #include <ctype.h>

+#if !(defined(__APPLE__) && defined(__MACH__))
 #include <physfs.h>
+#else
+#include <physfs/physfs.h>
+#endif

 #include "pstypes.h"
 #include "game.h"
--- a/main/console.c
+++ b/main/console.c
@ -19,7 +19,7 @@
 #endif
 #include <ctype.h>

-#include <SDL.h>
+#include <SDL/SDL.h>
 #ifdef CONSOLE
 #include "CON_console.h"
 #endif
--- a/main/gamecntl.c
+++ b/main/gamecntl.c
@ -123,7 +123,7 @@ COPYRIGHT 1993-1999 PARALLAX SOFTWARE CORPORATION.  ALL RIGHTS RESERVED.
 #endif

 #ifdef SDL_INPUT
-#include <SDL.h>
+#include <SDL/SDL.h>
 #endif

 extern void full_palette_save(void);
--- a/main/inferno.c
+++ b/main/inferno.c
@ -41,7 +41,11 @@ char copyright[] = "DESCENT II  COPYRIGHT (C) 1994-1996 PARALLAX SOFTWARE CORPOR
 #include <sys/types.h>
 #endif

+#if !(defined(__APPLE__) && defined(__MACH__))
 #include <physfs.h>
+#else
+#include <physfs/physfs.h>
+#endif

 #include "pstypes.h"
 #include "strutil.h"
@ -113,7 +117,7 @@ char copyright[] = "DESCENT II  COPYRIGHT (C) 1994-1996 PARALLAX SOFTWARE CORPOR
 #endif

 #ifndef __MSDOS__
-#include <SDL.h>
+#include <SDL/SDL.h>
 #endif

 #include "vers_id.h"
--- a/main/newdemo.c
+++ b/main/newdemo.c
@ -37,7 +37,11 @@ COPYRIGHT 1993-1999 PARALLAX SOFTWARE CORPORATION.  ALL RIGHTS RESERVED.
 #include <sys/types.h>
 #endif

+#if !(defined(__APPLE__) && defined(__MACH__))
 #include <physfs.h>
+#else
+#include <physfs/physfs.h>
+#endif

 #include "u_mem.h"
 #include "inferno.h"
--- a/main/newmenu.c
+++ b/main/newmenu.c
@ -32,7 +32,11 @@ COPYRIGHT 1993-1999 PARALLAX SOFTWARE CORPORATION.  ALL RIGHTS RESERVED.
 #include <unistd.h>
 #endif
 #include <limits.h>
+#if !(defined(__APPLE__) && defined(__MACH__))
 #include <physfs.h>
+#else
+#include <physfs/physfs.h>
+#endif

 #include "error.h"
 #include "pstypes.h"
--- a/main/newmenu.h
+++ b/main/newmenu.h
@ -155,7 +155,7 @@ extern void nm_remap_background(void);
 #  define newmenu_show_cursor() ShowCursorW()
 #  define newmenu_hide_cursor() HideCursorW()
 # elif defined(SDL_INPUT)
-#  include <SDL.h>
+#  include <SDL/SDL.h>
 #  define newmenu_show_cursor() SDL_ShowCursor(SDL_ENABLE)
 #  define newmenu_hide_cursor() SDL_ShowCursor(SDL_DISABLE)
 # else
--- a/main/playsave.c
+++ b/main/playsave.c
@ -36,7 +36,11 @@ COPYRIGHT 1993-1999 PARALLAX SOFTWARE CORPORATION.  ALL RIGHTS RESERVED.
 #include <errno.h>
 #endif

+#if !(defined(__APPLE__) && defined(__MACH__))
 #include <physfs.h>
+#else
+#include <physfs/physfs.h>
+#endif

 #include "error.h"

--- a/misc/hmp2mid.c
+++ b/misc/hmp2mid.c
@ -21,7 +21,11 @@
 #include <string.h>
 #include <stdlib.h>
 #include <stdio.h>
+#if !(defined(__APPLE__) && defined(__MACH__))
 #include <physfs.h>
+#else
+#include <physfs/physfs.h>
+#endif
 #include "hmp2mid.h"

 /* Some convience macros to keep the code below more readable */
--- a/misc/ignorecase.c
+++ b/misc/ignorecase.c
@ -5,7 +5,11 @@
 #include <string.h>
 #include <ctype.h>

-#include "physfs.h"
+#if !(defined(__APPLE__) && defined(__MACH__))
+#include <physfs.h>
+#else
+#include <physfs/physfs.h>
+#endif
 #include "ignorecase.h"

 /**
--- a/ui/file.c
+++ b/ui/file.c
@ -18,7 +18,11 @@ static char rcsid[] = "$Id: file.c,v 1.1.1.1 2006/03/17 19:52:17 zicodxx Exp $";

 #include <stdlib.h>
 #include <string.h>
+#if !(defined(__APPLE__) && defined(__MACH__))
 #include <physfs.h>
+#else
+#include <physfs/physfs.h>
+#endif

 #include "fix.h"
 #include "pstypes.h"