Removed symlinks to SDL 1.3 files that were changed, nad added the files themselves to SDL 1.2

alienblaster/project/sdl/sdl-1.3/include/SDL_pixels.h

@@ -29,14 +29,6 @@
 #ifndef _SDL_pixels_h
 #define _SDL_pixels_h
 
-#include "SDL_version.h"
-
-#if SDL_VERSION_ATLEAST(1,3,0)
-#include "SDL_video.h"
-#else
-#include "SDL_video-1.3.h"
-#endif
-
 #include "begin_code.h"
 /* Set up for C function definitions, even when using C++ */
 #ifdef __cplusplus
@@ -227,7 +219,6 @@ enum
         SDL_DEFINE_PIXELFORMAT(SDL_PIXELTYPE_PACKED32, SDL_PACKEDORDER_ARGB,
                                SDL_PACKEDLAYOUT_2101010, 32, 4),
 
-#if SDL_VERSION_ATLEAST(1,3,0)
     SDL_PIXELFORMAT_YV12 =      /**< Planar mode: Y + V + U  (3 planes) */
         SDL_DEFINE_PIXELFOURCC('Y', 'V', '1', '2'),
     SDL_PIXELFORMAT_IYUV =      /**< Planar mode: Y + U + V  (3 planes) */
@@ -238,10 +229,8 @@ enum
         SDL_DEFINE_PIXELFOURCC('U', 'Y', 'V', 'Y'),
     SDL_PIXELFORMAT_YVYU =      /**< Packed mode: Y0+V0+Y1+U0 (1 plane) */
         SDL_DEFINE_PIXELFOURCC('Y', 'V', 'Y', 'U')
-#endif
 };
 
-#if SDL_VERSION_ATLEAST(1,3,0)
 typedef struct SDL_Color
 {
     Uint8 r;
@@ -285,7 +274,6 @@ typedef struct SDL_PixelFormat
     Uint32 Bmask;
     Uint32 Amask;
 } SDL_PixelFormat;
-#endif
 
 /**
  *  \brief Convert one of the enumerated pixel formats to a bpp and RGBA masks.
@@ -332,7 +320,6 @@ extern DECLSPEC SDL_Palette *SDLCALL SDL_AllocPalette(int ncolors);
  *  
  *  \sa SDL_DelPaletteWatch()
  */
-#if SDL_VERSION_ATLEAST(1,3,0)
 extern DECLSPEC int SDLCALL SDL_AddPaletteWatch(SDL_Palette * palette,
                                                 SDL_PaletteChangedFunc
                                                 callback, void *userdata);
@@ -346,7 +333,7 @@ extern DECLSPEC int SDLCALL SDL_AddPaletteWatch(SDL_Palette * palette,
 extern DECLSPEC void SDLCALL SDL_DelPaletteWatch(SDL_Palette * palette,
                                                  SDL_PaletteChangedFunc
                                                  callback, void *userdata);
-#endif
+
 /**
  *  \brief Set a range of colors in a palette.
  *  

alienblaster/project/sdl/sdl-1.3/include/SDL_rect.h

@@ -31,11 +31,8 @@
 
 #include "SDL_stdinc.h"
 #include "SDL_error.h"
+#include "SDL_pixels.h"
 #include "SDL_rwops.h"
-#include "SDL_version.h"
-#if ! SDL_VERSION_ATLEAST(1,3,0)
-#include "SDL_video.h"
-#endif
 
 #include "begin_code.h"
 /* Set up for C function definitions, even when using C++ */
@@ -66,13 +63,11 @@ typedef struct
  *  \sa SDL_UnionRect
  *  \sa SDL_EnclosePoints
  */
-#if SDL_VERSION_ATLEAST(1,3,0)
 typedef struct SDL_Rect
 {
     int x, y;
     int w, h;
 } SDL_Rect;
-#endif
 
 /**
  *  \brief Returns true if the rectangle has no area.

alienblaster/project/sdl/sdl-1.3/include/SDL_video.h

@@ -26,17 +26,13 @@
  *  Header file for SDL video functions.
  */
 
-#ifndef _SDL_video_1_3_h
-#define _SDL_video_1_3_h
+#ifndef _SDL_video_h
+#define _SDL_video_h
 
 #include "SDL_stdinc.h"
-#include "SDL_rect.h"
 #include "SDL_pixels.h"
+#include "SDL_rect.h"
 #include "SDL_surface.h"
-#include "SDL_version.h"
-#if ! SDL_VERSION_ATLEAST(1,3,0)
-#include "SDL_video.h"
-#endif
 
 #include "begin_code.h"
 /* Set up for C function definitions, even when using C++ */
@@ -260,7 +256,6 @@ typedef struct SDL_Texture SDL_Texture;
  */
 typedef void *SDL_GLContext;
 
-#if SDL_VERSION_ATLEAST(1,3,0)
 /**
  *  \brief OpenGL configuration attributes
  */
@@ -286,7 +281,7 @@ typedef enum
     SDL_GL_CONTEXT_MAJOR_VERSION,
     SDL_GL_CONTEXT_MINOR_VERSION
 } SDL_GLattr;
-#endif
+
 
 /* Function prototypes */
 
@@ -323,13 +318,8 @@ extern DECLSPEC const char *SDLCALL SDL_GetVideoDriver(int index);
  *  
  *  \sa SDL_VideoQuit()
  */
-extern DECLSPEC int SDLCALL 
-#if SDL_VERSION_ATLEAST(1,3,0)
-SDL_VideoInit
-#else
-SDL_VideoInit_1_3
-#endif
-(const char *driver_name, Uint32 flags);
+extern DECLSPEC int SDLCALL SDL_VideoInit(const char *driver_name,
+                                          Uint32 flags);
 
 /**
  *  \brief Shuts down the video subsystem.