Changeset 950Tweet

Timestamp:

Sep 13, 2011, 7:19:11 PM (11 years ago)

Author:

sam

Message:

build: fix Win64 compilation with mingw64, using an updated SDL build.

Location:

trunk

Files:

• configure.ac (modified) (1 diff)
• contrib/sdl-1.2.14/lib/x86_64-w64-mingw32/SDL.dll (deleted)
• contrib/sdl-1.2.14/lib/x86_64-w64-mingw32/SDL.lib (deleted)
• contrib/sdl-1.2.14/lib/x86_64-w64-mingw32/SDLmain.lib (deleted)
• contrib/sdl-1.2.14/lib/x86_64-w64-mingw32/libSDL.a (added)
• contrib/sdl-1.2.14/lib/x86_64-w64-mingw32/libSDL.dll.a (added)
• contrib/sdl-1.2.14/lib/x86_64-w64-mingw32/libSDLmain.a (added)
• src/audio.cpp (modified) (2 diffs)
• src/image/image.cpp (modified) (5 diffs)
• src/sample.cpp (modified) (5 diffs)

trunk/configure.ac

@@ -220 +220 @@
 if test "${ac_cv_my_have_sdl_mixer}" = "no"; then
   AC_MSG_WARN([SDL_mixer not found])
+else
+  AC_DEFINE(USE_SDL_MIXER, 1, Define to 1 to use SDL_mixer)
 fi
 if test "${ac_cv_my_have_sdl_image}" = "no"; then
   AC_MSG_WARN([SDL_image not found])
+else
+  AC_DEFINE(USE_SDL_IMAGE, 1, Define to 1 to use SDL_image)
 fi
 AM_CONDITIONAL(USE_SDL, test "${ac_cv_my_have_sdl}" = "yes")

trunk/src/audio.cpp

@@ -15 +15 @@
 #include <cmath>
 
-#if defined USE_SDL
+#if defined USE_SDL_MIXER
 #   include <SDL.h>
 #   include <SDL_mixer.h>
@@ -31 +31 @@
 void Audio::Setup(int channels)
 {
-#if defined USE_SDL
+#if defined USE_SDL_MIXER
     Mix_OpenAudio(22050, AUDIO_S16, channels, 1024);
 #endif

trunk/src/image/image.cpp

@@ -17 +17 @@
 #if defined __APPLE__ && defined __MACH__
 #   import <UIKit/UIKit.h>
-#elif defined USE_SDL
+#elif defined USE_SDL_IMAGE
 #   include <SDL.h>
 #   include <SDL_image.h>
@@ -54 +54 @@
 #if defined __APPLE__ && defined __MACH__
     uint8_t *pixels;
-#elif defined USE_SDL
+#elif defined USE_SDL_IMAGE
     SDL_Surface *img;
 #elif defined __ANDROID__
@@ -110 +110 @@
     [image release];
     [pngdata release];
-#elif defined USE_SDL
+#elif defined USE_SDL_IMAGE
     for (char const *name = path; *name; name++)
         if ((data->img = IMG_Load(name)))
@@ -335 +335 @@
 #if defined __APPLE__ && defined __MACH__
     return data->pixels;
-#elif defined USE_SDL
+#elif defined USE_SDL_IMAGE
     return data->img->pixels;
 #elif defined __ANDROID__
@@ -350 +350 @@
 #if defined __APPLE__ && defined __MACH__
     free(data->pixels);
-#elif defined USE_SDL
+#elif defined USE_SDL_IMAGE
     SDL_FreeSurface(data->img);
 #elif defined __ANDROID__

trunk/src/sample.cpp

@@ -18 +18 @@
 #include <cstring>
 
-#if defined USE_SDL
+#if defined USE_SDL_MIXER
 #   include <SDL.h>
 #   include <SDL_mixer.h>
@@ -40 +40 @@
 private:
     char *name, *path;
-#if defined USE_SDL
+#if defined USE_SDL_MIXER
     Mix_Chunk *chunk;
 #endif
@@ -56 +56 @@
     sprintf(data->name, "<sample> %s", path);
 
-#if defined USE_SDL
+#if defined USE_SDL_MIXER
     data->chunk = Mix_LoadWAV(path);
     if (!data->chunk)
@@ -71 +71 @@
 Sample::~Sample()
 {
-#if defined USE_SDL
+#if defined USE_SDL_MIXER
     Mix_FreeChunk(data->chunk);
 #endif
@@ -90 +90 @@
 void Sample::Play()
 {
-#if defined USE_SDL
+#if defined USE_SDL_MIXER
     Mix_PlayChannel(-1, data->chunk, 0);
 #endif