Build fixes for FreeBSD, from Max Horn.

git-svn-id: svn://svn.code.sf.net/p/sc2/code/trunk@363 8092fc87-c524-0410-9efc-e669fe64eaf9

sc2/ChangeLog

@@ -1,4 +1,5 @@
 0.2:
+- Build fixes for FreeBSD, from Max Horn.
 - Fixed typo in Thraddash text, from Dan Plimak.
 - Make HMalloc abort when no memory available, from Abaddon.
 - Replace malloc() calls by HMalloc, from Abaddon.

sc2/build/config_proginfo

@@ -61,23 +61,13 @@ else
 fi
 
 LIB_SDL_mixer_NAME="SDL_mixer"
-if [ `uname` = 'FreeBSD' ]; then
+LIB_SDL_mixer_CFLAGS="$LIB_SDL_CFLAGS"
-	LIB_SDL_mixer_CFLAGS="$LIB_SDL_CFLAGS"
+LIB_SDL_mixer_LDFLAGS="$LIB_SDL_LDFLAGS -lSDL_mixer"
-	LIB_SDL_mixer_LDFLAGS="$LIB_SDL_LDFLAGS -lSDL_mixer"
-else
-	LIB_SDL_mixer_CFLAGS=""
-	LIB_SDL_mixer_LDFLAGS="-lSDL_mixer"
-fi
 LIB_SDL_mixer_VERSION=""
 
 LIB_SDL_image_NAME="SDL_image"
-if [ `uname` = 'FreeBSD' ]; then
+LIB_SDL_image_CFLAGS="$LIB_SDL_CFLAGS"
-	LIB_SDL_image_CFLAGS="$LIB_SDL_CFLAGS"
+LIB_SDL_image_LDFLAGS="$LIB_SDL_LDFLAGS -lSDL_image"
-	LIB_SDL_image_LDFLAGS="$LIB_SDL_LDFLAGS -lSDL_image"
-else
-	LIB_SDL_image_CFLAGS=""
-	LIB_SDL_image_LDFLAGS="-lSDL_image"
-fi
 LIB_SDL_image_VERSION=""
 
 LIB_openal_NAME="OpenAL"

sc2/src/sc2code/libs/sound/sdl/modfuncs.c

@@ -27,12 +27,8 @@
 
 #ifdef WIN32
 #include <io.h>
-#include <SDL_mixer.h>
-#elif defined __FreeBSD__
-#include <SDL_mixer.h>
-#else
-#include <SDL/SDL_mixer.h>
 #endif
+#include <SDL_mixer.h>
 
 
 MEM_HANDLE

sc2/src/sc2code/libs/sound/sdl/play.c

@@ -22,13 +22,7 @@
 #include "libs/graphics/sdl/sdl_common.h"
 #include "libs/sound/sound_common.h"
 
-#ifdef WIN32
 #include <SDL_mixer.h>
-#elif defined __FreeBSD__
-#include <SDL_mixer.h>
-#else
-#include <SDL/SDL_mixer.h>
-#endif
 
 static MUSIC_REF curMusicRef;
 

sc2/src/sc2code/libs/sound/sdl/sound.c

@@ -21,13 +21,9 @@
 #include "libs/graphics/sdl/sdl_common.h"
 #include "libs/sound/sound_common.h"
 
+#include <SDL_mixer.h>
 #ifdef WIN32
-#include <SDL_mixer.h>
 #pragma comment (lib, "SDL_mixer.lib")
-#elif defined __FreeBSD__
-#include <SDL_mixer.h>
-#else
-#include <SDL/SDL_mixer.h>
 #endif
 
 int 

sc2/src/sc2code/libs/sound/sdl/trackplayer.c

@@ -22,13 +22,7 @@
 #include "libs/sound/sound_common.h"
 #include "libs/sound/trackplayer.h"
 
-#ifdef WIN32
 #include <SDL_mixer.h>
-#elif defined __FreeBSD__
-#include <SDL_mixer.h>
-#else
-#include <SDL/SDL_mixer.h>
-#endif
 
 
 #define VOICE_CHANNEL 0