From 3723fc3935d460a76fee735732b29edeaafa3628 Mon Sep 17 00:00:00 2001 From: stevenaaus Date: Tue, 11 Jan 2011 08:19:22 +0000 Subject: [PATCH] Make Makefile.darwin consistent with Makefile git-svn-id: http://svn.code.sf.net/p/quakespasm/code/trunk/quakespasm@390 af15c1b1-3010-417e-b628-4374ebc0bcbd --- Quake/Makefile.darwin | 24 +++++++++++------------- 1 file changed, 11 insertions(+), 13 deletions(-) diff --git a/Quake/Makefile.darwin b/Quake/Makefile.darwin index f4b03c9d..47015958 100644 --- a/Quake/Makefile.darwin +++ b/Quake/Makefile.darwin @@ -3,13 +3,18 @@ # You need the SDL library fully installed. # "make DEBUG=1" to build a debug client. # "make SDL_CONFIG=/path/to/sdl-config" for unusual SDL installations. -# "make SDLNET=1" to use SDL_net (not recommended) instead of platform -# specific code. -# -# Build objects are separate from those of codeblocks for now -# (we aren't using codeblocks). +# "make SDLNET=1" to use SDL_net (not recommended) +# instead of platform specific code. +# Build objects are separate from those of codeblocks -# ============================================================================ +### Enable/Disable codecs for streaming music support +# +# OGG (vorbis) playback requires libvorbis and libogg +# MP3 playback requires libmad + +USE_CODEC_WAVE=yes +USE_CODEC_MP3=yes +USE_CODEC_VORBIS=yes # ============================================================================ # Helper functions @@ -17,13 +22,6 @@ check_gcc = $(shell if echo | $(CC) $(1) -S -o /dev/null -xc - > /dev/null 2>&1; then echo "$(1)"; else echo "$(2)"; fi;) -# ============================================================================ - -# Enable/disable codecs for streaming music support: -USE_CODEC_WAVE=yes -USE_CODEC_MP3=yes -USE_CODEC_VORBIS=yes - DEBUG ?= 0 SDLNET ?= 0