From f43c62271266a10eee06700adedf4323bb3f0313 Mon Sep 17 00:00:00 2001
From: meep-eep <meep-eep@8092fc87-c524-0410-9efc-e669fe64eaf9>
Date: Sat, 7 Dec 2002 01:52:46 +0000
Subject: [PATCH] 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 +
 sc2/build/config_proginfo                    | 18 ++++--------------
 sc2/src/sc2code/libs/sound/sdl/modfuncs.c    |  6 +-----
 sc2/src/sc2code/libs/sound/sdl/play.c        |  6 ------
 sc2/src/sc2code/libs/sound/sdl/sound.c       |  6 +-----
 sc2/src/sc2code/libs/sound/sdl/trackplayer.c |  6 ------
 6 files changed, 7 insertions(+), 36 deletions(-)

diff --git a/sc2/ChangeLog b/sc2/ChangeLog
index 5b7328989..a66cba50f 100644
--- a/sc2/ChangeLog
+++ b/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.
diff --git a/sc2/build/config_proginfo b/sc2/build/config_proginfo
index a05bb281d..c6632af32 100644
--- a/sc2/build/config_proginfo
+++ b/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_LDFLAGS="$LIB_SDL_LDFLAGS -lSDL_mixer"
-else
-	LIB_SDL_mixer_CFLAGS=""
-	LIB_SDL_mixer_LDFLAGS="-lSDL_mixer"
-fi
+LIB_SDL_mixer_CFLAGS="$LIB_SDL_CFLAGS"
+LIB_SDL_mixer_LDFLAGS="$LIB_SDL_LDFLAGS -lSDL_mixer"
 LIB_SDL_mixer_VERSION=""
 
 LIB_SDL_image_NAME="SDL_image"
-if [ `uname` = 'FreeBSD' ]; then
-	LIB_SDL_image_CFLAGS="$LIB_SDL_CFLAGS"
-	LIB_SDL_image_LDFLAGS="$LIB_SDL_LDFLAGS -lSDL_image"
-else
-	LIB_SDL_image_CFLAGS=""
-	LIB_SDL_image_LDFLAGS="-lSDL_image"
-fi
+LIB_SDL_image_CFLAGS="$LIB_SDL_CFLAGS"
+LIB_SDL_image_LDFLAGS="$LIB_SDL_LDFLAGS -lSDL_image"
 LIB_SDL_image_VERSION=""
 
 LIB_openal_NAME="OpenAL"
diff --git a/sc2/src/sc2code/libs/sound/sdl/modfuncs.c b/sc2/src/sc2code/libs/sound/sdl/modfuncs.c
index c9d98e7df..b15ebd0bd 100644
--- a/sc2/src/sc2code/libs/sound/sdl/modfuncs.c
+++ b/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
diff --git a/sc2/src/sc2code/libs/sound/sdl/play.c b/sc2/src/sc2code/libs/sound/sdl/play.c
index b03941fa2..00ddeff75 100644
--- a/sc2/src/sc2code/libs/sound/sdl/play.c
+++ b/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;
 
diff --git a/sc2/src/sc2code/libs/sound/sdl/sound.c b/sc2/src/sc2code/libs/sound/sdl/sound.c
index 1805c6a48..2918edf29 100644
--- a/sc2/src/sc2code/libs/sound/sdl/sound.c
+++ b/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 
diff --git a/sc2/src/sc2code/libs/sound/sdl/trackplayer.c b/sc2/src/sc2code/libs/sound/sdl/trackplayer.c
index a30a50e8c..0ba9627e9 100644
--- a/sc2/src/sc2code/libs/sound/sdl/trackplayer.c
+++ b/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