teambeef/raze
0
0
Fork 0
mirror of https://github.com/DrBeef/Raze.git synced 2024-11-15 08:52:00 +00:00
Code Issues Projects Releases Packages Wiki Activity

This probably fixes building with SDL on Windows

Browse source 
git-svn-id: https://svn.eduke32.com/eduke32@346 1a8010ca-5511-0410-912e-c29ae57300e0
This commit is contained in:
terminx 2006-11-18 08:46:58 +00:00
parent 44e32d9300
commit 1b91c1bae3
3 changed files with 20 additions and 25 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
polymer/eduke32/Makefile
View file

@ -66,6 +66,9 @@ JMACTOBJ=$(OBJ)/util_lib.$o \
$(OBJ)/mathutil.$o \
$(OBJ)/scriplib.$o
AUDIOLIB_FX_STUB=$(OBJ)/audiolib_fxstub.$o
AUDIOLIB_MUSIC_STUB=$(OBJ)/audiolib_musicstub.$o
AUDIOLIB_FX_SDL=$(OBJ)/mv_mix.$o \
$(OBJ)/mv_mix16.$o \
$(OBJ)/mvreverb.$o \
@ -74,7 +77,6 @@ AUDIOLIB_FX_SDL=$(OBJ)/mv_mix.$o \
$(OBJ)/dsl.$o \
$(OBJ)/pitch.$o \
$(OBJ)/multivoc.$o
AUDIOLIB_MUSIC_SDL=$(OBJ)/sdlmusic.$o \
$(OBJ)/unixglob.$o
@ -124,12 +126,16 @@ endif
ifeq ($(RENDERTYPE),SDL)
OURCFLAGS+= $(subst -Dmain=SDL_main,,$(shell sdl-config --cflags))
LIBS+= -lSDL_mixer
ifneq (0,$(JFAUD))
AUDIOLIBOBJ=$(AUDIOLIB_JFAUD)
else
ifneq ($(PLATFORM),WINDOWS)
AUDIOLIBOBJ=$(AUDIOLIB_MUSIC_SDL) $(AUDIOLIB_FX_SDL) $(OBJ)/sounds.$o
LIBS+= -lSDL_mixer
else
AUDIOLIBOBJ=$(AUDIOLIB_MUSIC_STUB) $(AUDIOLIB_FX_STUB) $(OBJ)/sounds.$o
endif
endif
ifeq (1,$(HAVE_GTK2))

4
polymer/eduke32/source/game.c
View file

@ -7001,9 +7001,7 @@ PALONLY:
#pragma optimize("",on)
#endif
static char terminx[64] =
{ "Undead TC still sucks."
};
static char terminx[64] = { "Undead TC still sucks." };
char cheatquotes[][MAXCHEATLEN] =
{

21
polymer/eduke32/source/jaudiolib/sdlmusic.c
View file

@ -71,16 +71,8 @@ int MUSIC_ErrorCode = MUSIC_Ok;
static char warningMessage[80];
static char errorMessage[80];
static int fx_initialized = 0;
static int numChannels = MIX_CHANNELS;
static void(*callback)(unsigned long);
static int reverseStereo = 0;
static int reverbDelay = 256;
static int reverbLevel = 0;
static int fastReverb = 0;
static FILE *debug_file = NULL;
static int initialized_debugging = 0;
static int mixerIsStereo = 1;
// This gets called all over the place for information and debugging messages.
// If the user set the DUKESND_DEBUG environment variable, the messages
@ -126,6 +118,7 @@ static void init_debugging(void)
initialized_debugging = 1;
} // init_debugging
#if 0
static void setWarningMessage(const char *msg)
{
strncpy(warningMessage, msg, sizeof(warningMessage));
@ -133,7 +126,7 @@ static void setWarningMessage(const char *msg)
warningMessage[sizeof(warningMessage) - 1] = '\0';
musdebug("Warning message set to [%s].", warningMessage);
} // setErrorMessage
#endif
static void setErrorMessage(const char *msg)
{
@ -278,7 +271,7 @@ void MUSIC_Continue(void)
if (Mix_PausedMusic())
Mix_ResumeMusic();
else if (music_songdata)
MUSIC_PlaySong(music_songdata, MUSIC_PlayOnce);
MUSIC_PlaySong((unsigned char *)music_songdata, MUSIC_PlayOnce);
} // MUSIC_Continue
@ -315,7 +308,7 @@ int MUSIC_PlaySong(unsigned char *song, int loopflag)
MUSIC_StopSong();
music_songdata = song;
music_songdata = (char *)song;
// !!! FIXME: This could be a problem...SDL/SDL_mixer wants a RWops, which
// !!! FIXME: is an i/o abstraction. Since we already have the MIDI data
@ -335,8 +328,6 @@ int MUSIC_PlaySong(unsigned char *song, int loopflag)
} // MUSIC_PlaySong
extern char ApogeePath[256] = "/tmp/";
// Duke3D-specific. --ryan.
void PlayMusic(char *_filename)
{
@ -344,7 +335,7 @@ void PlayMusic(char *_filename)
//strcpy(filename, _filename);
//FixFilePath(filename);
char filename[MAX_PATH];
char filename[BMAX_PATH];
long handle;
long size;
void *song;
@ -381,7 +372,7 @@ void PlayMusic(char *_filename)
} // if
// save the file somewhere, so SDL_mixer can load it
GetUnixPathFromEnvironment(filename, MAX_PATH, "tmpsong.mid");
GetUnixPathFromEnvironment(filename, BMAX_PATH, "tmpsong.mid");
handle = SafeOpenWrite(filename, filetype_binary);
SafeWrite(handle, song, size);