Skip to content

Instantly share code, notes, and snippets.

@hdon

hdon/gist:46355

Created January 13, 2009 06:47
Show Gist options
  • Star 0 You must be signed in to star a gist
  • Fork 0 You must be signed in to fork a gist
  • Save hdon/46355 to your computer and use it in GitHub Desktop.
Save hdon/46355 to your computer and use it in GitHub Desktop.
Download ZIP
Raw
gistfile1.txt
Index: include/physfsrwops.h
===================================================================
--- include/physfsrwops.h (revision 889)
+++ include/physfsrwops.h (working copy)
@@ -28,7 +28,7 @@
#else
#include <physfs/physfs.h>
#endif
-#include <SDL/SDL.h>
+#include <SDL.h>
#ifdef __cplusplus
extern "C" {
Index: include/error.h
===================================================================
--- include/error.h (revision 889)
+++ include/error.h (working copy)
@@ -56,7 +56,7 @@
#else // NO_ASM
#ifdef __GNUC__
-#include <SDL/SDL.h>
+#include <SDL.h>
#include "args.h"
static inline void _Int3()
{
Index: main/console.c
===================================================================
--- main/console.c (revision 889)
+++ main/console.c (working copy)
@@ -13,7 +13,7 @@
#include <stdarg.h>
#include <string.h>
#include <time.h>
-#include <SDL/SDL.h>
+#include <SDL.h>
#include "console.h"
#include "args.h"
#include "gr.h"
Index: main/newmenu.h
===================================================================
--- main/newmenu.h (revision 889)
+++ main/newmenu.h (working copy)
@@ -140,7 +140,7 @@
# define NEWMENU_MOUSE
-# include <SDL/SDL.h>
+# include <SDL.h>
# define newmenu_show_cursor() if (!GameArg.CtlNoMouse) SDL_ShowCursor(SDL_ENABLE)
# define newmenu_hide_cursor() SDL_ShowCursor(SDL_DISABLE)
Index: main/inferno.c
===================================================================
--- main/inferno.c (revision 889)
+++ main/inferno.c (working copy)
@@ -105,7 +105,7 @@
#include "ui.h"
#endif
-#include <SDL/SDL.h>
+#include <SDL.h>
#include "vers_id.h"
Index: main/vers_id.h
===================================================================
--- main/vers_id.h (revision 889)
+++ main/vers_id.h (working copy)
@@ -10,11 +10,17 @@
#define VERSION_TYPE "Full Version"
+#ifndef VERSION
+#ifdef D2XMAJOR
#ifdef D2XMICRO
#define VERSION D2XMAJOR "." D2XMINOR "." D2XMICRO
#else
#define VERSION D2XMAJOR "." D2XMINOR
#endif
+#else /* D2XMAJOR */
+#define VERSION "?.?.?"
+#endif
+#endif
#define DESCENT_VERSION "D2X-Rebirth v" VERSION
// #define D2X_IVER (D2XMAJOR*10000+D2XMINOR*100+D2XMICRO)
Index: main/gamecntl.c
===================================================================
--- main/gamecntl.c (revision 889)
+++ main/gamecntl.c (working copy)
@@ -113,7 +113,7 @@
#endif
#endif
-#include <SDL/SDL.h>
+#include <SDL.h>
extern void full_palette_save(void);
extern void object_goto_prev_viewer(void);
Index: arch/linux/netdrv_ipx.c
===================================================================
--- arch/linux/netdrv_ipx.c (revision 889)
+++ arch/linux/netdrv_ipx.c (working copy)
@@ -7,6 +7,7 @@
#ifdef HAVE_NETIPX_IPX_H
#include <netipx/ipx.h>
#else
+# include <types.h>
# include <linux/ipx.h>
# ifndef IPX_TYPE
# define IPX_TYPE 1
Index: arch/ogl/gr.c
===================================================================
--- arch/ogl/gr.c (revision 889)
+++ arch/ogl/gr.c (working copy)
@@ -28,7 +28,7 @@
#endif
#include <errno.h>
-#include <SDL/SDL.h>
+#include <SDL.h>
#include "hudmsg.h"
#include "game.h"
#include "text.h"
Index: arch/sdl/digi_mixer.c
===================================================================
--- arch/sdl/digi_mixer.c (revision 889)
+++ arch/sdl/digi_mixer.c (working copy)
@@ -16,9 +16,9 @@
#include <stdio.h>
#include <string.h>
-#include <SDL/SDL.h>
-#include <SDL/SDL_audio.h>
-#include <SDL/SDL_mixer.h>
+#include <SDL.h>
+#include <SDL_audio.h>
+#include <SDL_mixer.h>
#include "pstypes.h"
#include "error.h"
Index: arch/sdl/digi_mixer_music.c
===================================================================
--- arch/sdl/digi_mixer_music.c (revision 889)
+++ arch/sdl/digi_mixer_music.c (working copy)
@@ -6,8 +6,8 @@
* -- MD2211 (2006-04-24)
*/
-#include <SDL/SDL.h>
-#include <SDL/SDL_mixer.h>
+#include <SDL.h>
+#include <SDL_mixer.h>
#include <string.h>
#include <stdlib.h>
Index: arch/sdl/timer.c
===================================================================
--- arch/sdl/timer.c (revision 889)
+++ arch/sdl/timer.c (working copy)
@@ -8,7 +8,7 @@
#include <conf.h>
#endif
-#include <SDL/SDL.h>
+#include <SDL.h>
#include "maths.h"
#include "timer.h"
Index: arch/sdl/event.c
===================================================================
--- arch/sdl/event.c (revision 889)
+++ arch/sdl/event.c (working copy)
@@ -14,7 +14,7 @@
#include <stdlib.h>
#include "key.h"
-#include <SDL/SDL.h>
+#include <SDL.h>
extern void key_handler(SDL_KeyboardEvent *event);
extern void mouse_button_handler(SDL_MouseButtonEvent *mbe);
Index: arch/sdl/joy.c
===================================================================
--- arch/sdl/joy.c (revision 889)
+++ arch/sdl/joy.c (working copy)
@@ -11,7 +11,7 @@
#endif
#include <string.h> // for memset
-#include <SDL/SDL.h>
+#include <SDL.h>
#include "joy.h"
#include "error.h"
Index: arch/sdl/init.c
===================================================================
--- arch/sdl/init.c (revision 889)
+++ arch/sdl/init.c (working copy)
@@ -1,6 +1,6 @@
// Holds the main init and de-init functions for arch-related program parts
-#include <SDL/SDL.h>
+#include <SDL.h>
#include "rbaudio.h"
#include "key.h"
#include "digi.h"
Index: arch/sdl/rbaudio.c
===================================================================
--- arch/sdl/rbaudio.c (revision 889)
+++ arch/sdl/rbaudio.c (working copy)
@@ -13,7 +13,7 @@
#include <stdio.h>
#include <stdlib.h>
-#include <SDL/SDL.h>
+#include <SDL.h>
#ifdef __linux__
#include <sys/ioctl.h>
Index: arch/sdl/jukebox.c
===================================================================
--- arch/sdl/jukebox.c (revision 889)
+++ arch/sdl/jukebox.c (working copy)
@@ -5,7 +5,7 @@
#include <stdlib.h>
#include <string.h>
-#include <SDL/SDL_mixer.h>
+#include <SDL_mixer.h>
#include "physfsx.h"
#include "args.h"
#include "dl_list.h"
Index: arch/sdl/gr.c
===================================================================
--- arch/sdl/gr.c (revision 889)
+++ arch/sdl/gr.c (working copy)
@@ -12,7 +12,7 @@
#include <string.h>
#include <limits.h>
#include <math.h>
-#include <SDL/SDL.h>
+#include <SDL.h>
#include "gr.h"
#include "grdef.h"
#include "palette.h"
Index: arch/sdl/key.c
===================================================================
--- arch/sdl/key.c (revision 889)
+++ arch/sdl/key.c (working copy)
@@ -13,7 +13,7 @@
#include <stdio.h>
#include <stdlib.h>
-#include <SDL/SDL.h>
+#include <SDL.h>
#include "event.h"
#include "error.h"
Index: arch/sdl/mouse.c
===================================================================
--- arch/sdl/mouse.c (revision 889)
+++ arch/sdl/mouse.c (working copy)
@@ -9,7 +9,7 @@
#endif
#include <string.h>
-#include <SDL/SDL.h>
+#include <SDL.h>
#include "fix.h"
#include "timer.h"
Index: arch/sdl/digi_audio.c
===================================================================
--- arch/sdl/digi_audio.c (revision 889)
+++ arch/sdl/digi_audio.c (working copy)
@@ -14,7 +14,7 @@
#include <stdio.h>
#include <string.h>
-#include <SDL/SDL.h>
+#include <SDL.h>
#include <digi_audio.h>
#ifdef _WIN32
Index: libmve/mveplay.c
===================================================================
--- libmve/mveplay.c (revision 889)
+++ libmve/mveplay.c (working copy)
@@ -23,9 +23,9 @@
# endif // macintosh
#endif // _WIN32
-#include <SDL/SDL.h>
+#include <SDL.h>
#ifdef USE_SDLMIXER
-#include <SDL/SDL_mixer.h>
+#include <SDL_mixer.h>
#endif
#include "digi.h"
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment