From 3c1010e6b037ea8a9a0c0f7eafd89366626a6244 Mon Sep 17 00:00:00 2001 From: stevenaaus Date: Sun, 24 Apr 2011 03:01:40 +0000 Subject: [PATCH] Update Makefile.darwin (OSX) and doco. git-svn-id: svn+ssh://svn.code.sf.net/p/quakespasm/code/trunk@448 af15c1b1-3010-417e-b628-4374ebc0bcbd --- quakespasm/Quake/Makefile.darwin | 39 ++++++++++++------- quakespasm/README.html | 23 ++++++++++- quakespasm/README.sgml | 15 ++++++- quakespasm/README.txt | 67 ++++++++++++++++---------------- 4 files changed, 92 insertions(+), 52 deletions(-) diff --git a/quakespasm/Quake/Makefile.darwin b/quakespasm/Quake/Makefile.darwin index 5b95bc89..b8110c85 100644 --- a/quakespasm/Quake/Makefile.darwin +++ b/quakespasm/Quake/Makefile.darwin @@ -1,5 +1,26 @@ -# GNU Makefile for QuakeSpasm for Darwin only, Mar. 27, 2011 +# GNU Makefile for QuakeSpasm for Darwin only, April 22, 2011 + +# Usage: "make -f Makefile.darwin" + +# COMPILING Quakespasm on OSX with Music enabled # +# Because of difficulties of compiling the CODEC libs on OSX (especially G4), +# this makefile has been tweaked to link against the includes and libraries in ../MacOSX +# If you already have libogg/libvorbis/libmpg123 installed, please remove the +# "-I../MacOSX/include" and "-L../MacOSX" found below. +# +# STARTING GAME +# To install the CODEC libraries, copy ../MacOSX/*dylib to your Quake folder, then +# DYLD_FALLBACK_LIBRARY_PATH=. ./quakespasm +# Or copy ./MacOSX/*dylib to /usr/local/lib and use +# DYLD_FALLBACK_LIBRARY_PATH=/usr/local/lib ./quakespasm + +# Enable/Disable codecs for streaming music support +USE_CODEC_WAVE=1 +USE_CODEC_MP3=1 +USE_CODEC_VORBIS=1 +MP3LIB=mpg123 + # 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. @@ -9,18 +30,6 @@ ### Embed custom Quakespasm console background picture USE_QS_CONBACK=1 -### Enable/Disable codecs for streaming music support -# -# OGG (vorbis) playback requires libvorbis and libogg -# MP3 playback requires libmad or libmpg123 (see MP3LIB below) - -USE_CODEC_WAVE=1 -USE_CODEC_MP3=1 -USE_CODEC_VORBIS=1 - -# which library to use for mp3 decoding: mad or mpg123 -MP3LIB=mad - # ============================================================================ # Helper functions # ============================================================================ @@ -174,6 +183,8 @@ DEFAULT_TARGET := quakespasm # --------------------------- %.o: %.c + $(CC) $(DFLAGS) -I../MacOSX/include -c $(CFLAGS) $(X11_CFLAGS) $(SDL_CFLAGS) -o $@ $^ +%.o: %.m $(CC) $(DFLAGS) -c $(CFLAGS) $(X11_CFLAGS) $(SDL_CFLAGS) -o $@ $^ # ---------------------------------------------------------------------------- @@ -266,7 +277,7 @@ OBJS := \ # ------------------------ quakespasm: $(OBJS) - $(CC) $(CFLAGS) -o quakespasm $(OBJS) $(X11_LFLAGS) $(SDL_LFLAGS) $(LIBS) + $(CC) $(CFLAGS) -o quakespasm $(OBJS) $(X11_LFLAGS) $(SDL_LFLAGS) -L../MacOSX $(LIBS) $(call do_strip,$@) release: quakespasm diff --git a/quakespasm/README.html b/quakespasm/README.html index baf5d4cb..01180124 100644 --- a/quakespasm/README.html +++ b/quakespasm/README.html @@ -28,6 +28,11 @@

4. Compiling

+

5. Changes

@@ -99,6 +104,11 @@ It includes 64bit CPU support, a new sound driver, several networking fixes and

4. Compiling

+ +

To check-out the latest version of QuakeSpasm, use : svn co https://quakespasm.svn.sourceforge.net/svnroot/quakespasm/trunk

+

4.1 Linux/Unix +

+

After extracting the source tarball, browse the Makefile and edit the music streaming options, then


@@ -116,8 +126,17 @@ Compile time options include
 

Streaming music playback requires "libmad" or "libmpg123" for MP3, and "libogg" and "libvorbis" for OGG files.

HOME directory support can be enabled via Misc/homedir_0.patch

The project can also be built with Codeblocks (project files included).

-

Windows developers can also build using Visual Studio 2005 or newer.

-. +

4.2 Windows +

+ +

The QS developers cross-compile win32 binaries using +Minimal GNU for Windows (Mingw).

+

The project can also build using Visual Studio 2005 (or newer).

+

4.3 Mac OS X +

+ +

A Quakespasm App (including program launcher and update framework) can be made using the Xcode template found in the MacOSX directory.

+

Alternatively, have a look at Quake/Makefile.darwin for more instructions on building with GCC.

5. Changes

diff --git a/quakespasm/README.sgml b/quakespasm/README.sgml index 6ea54ec3..f2ddfcdb 100644 --- a/quakespasm/README.sgml +++ b/quakespasm/README.sgml @@ -55,6 +55,8 @@ Since version 0.85.4, Quakespasm can play back external MP3, OGG and Wave music Compiling

+

To check-out the latest version of QuakeSpasm, use : svn co https://quakespasm.svn.sourceforge.net/svnroot/quakespasm/trunk

+ Linux/Unix

After extracting the source tarball, browse the Makefile and edit the music streaming options, then make @@ -68,8 +70,17 @@ Compile time options include

Streaming music playback requires "libmad" or "libmpg123" for MP3, and "libogg" and "libvorbis" for OGG files.

HOME directory support can be enabled via Misc/homedir_0.patch -

The project can also be built with Codeblocks (project files included).

. -

Windows developers can also build using Visual Studio 2005 or newer.

. +

The project can also be built with Codeblocks (project files included).

+ Windows

+The QS developers cross-compile win32 binaries using (Mingw). + +The project can also build using Visual Studio 2005 (or newer).

+

+ Mac OS X

+A Quakespasm App (including program launcher and update framework) can be made using the Xcode template found in the MacOSX directory. + +Alternatively, have a look at Quake/Makefile.darwin for more instructions on building with GCC. +

Changes

0.85.4

diff --git a/quakespasm/README.txt b/quakespasm/README.txt index 40e4b367..8b8dc180 100644 --- a/quakespasm/README.txt +++ b/quakespasm/README.txt @@ -4,29 +4,32 @@ Table of Contents + 1. About 2. Downloads 3. Hints - 3.1 Music Playback + 3.1 Music Playback 4. Compiling 5. Changes - 5.1 0.85.4 - 5.2 0.85.3 - 5.3 0.85.2 - 5.4 0.85.1 + 5.1 0.85.4 + 5.2 0.85.3 + 5.3 0.85.2 + 5.4 0.85.1 6. Todo 7. Links + ______________________________________________________________________ - QuakeSpasm 0.85.4 (27 March 2011) + QuakeSpasm 0.85.4 (19 February 2011) 1. About + QuakeSpasm is a Quake 1 engine based on the SDL port of FitzQuake. It includes 64bit CPU support, a new sound driver, several networking fixes and a few graphical niceities. @@ -36,30 +39,28 @@ 2. Downloads + Source - Linux (x86) - Windows (x86) - OSX universal binary 3. Hints - Visit the FitzQuake Homepage for + + Visit the FitzQuake Homepage for a full run-down of the engine's commands and variables. + o To disable some changes, use "quakespasm -fitz" - o For different sound drivers use - "SDL_AUDIODRIVER=DRIVER ./quakespasm" , where DRIVER may be alsa, - dsp, pulse, esd ... - + o For different sound drivers use "SDL_AUDIODRIVER=DRIVER + ./quakespasm" , where DRIVER may be alsa, dsp, pulse, esd ... o Shift+Escape draws the Console. o From the console, use UP to browse the command line history and TAB @@ -87,23 +88,26 @@ o Use the "-noextmusic" option to disable this feature. - o See README.music for more details, if necessary. - 4. Compiling After extracting the source tarball, browse the Makefile and edit the music streaming options, then + ______________________________________________________________________ make cp quakespasm /usr/local/games/quake (for example) ______________________________________________________________________ + Compile time options include - o make DEBUG=1 for debugging + o make DEBUG=1 for debugging - o make SDL_CONFIG=/PATH/TO/SDL-CONFIG for unusual SDL installations + o make SDLNET=1 to enable SDL_net (Otherwise the socket api will be + used directly) + + o make SDL_CONFIG=/PATH/TO/SDL-CONFIG for unusual SDL installations Streaming music playback requires "libmad" or "libmpg123" for MP3, and "libogg" and "libvorbis" for OGG files. @@ -111,16 +115,14 @@ HOME directory support can be enabled via Misc/homedir_0.patch The project can also be built with Codeblocks (project files - included). - - Windows developers can also build using Visual Studio 2005 or newer. - + included).. 5. Changes 5.1. 0.85.4 + o Implement music (OGG, MP3, WAV) playback o A better fix for the infamous SV_TouchLinks problem, no more hard @@ -146,9 +148,9 @@ o Other minor sound and cdaudio updates - 5.2. 0.85.3 + o Fix the "-dedicated" option (thanks Oz) and add platform specific networking code (default) rather than SDL_net @@ -186,6 +188,7 @@ 5.3. 0.85.2 + o Replace the old "Screen size" slider with a "Scale" slider o Don't constantly open and close condebug log @@ -203,9 +206,8 @@ o SDLNet_ResolveHost bug-fix allowing connection to ports other than 26000 - o Bumped array size of sv_main.c::localmodels from 5 to 6 fixing an - old fitzquake-0.85 bug which used to cause segfaults depending on - the compiler. + o sv_main.c (localmodels) Bumped array size from 5 to 6 in order for + it to operate correctly with the raised limits of fitzquake-0.85 o Accept commandline options like "+connect ip:port" @@ -214,6 +216,7 @@ 5.4. 0.85.1 + o 64 bit CPU support o Restructured SDL sound driver @@ -252,7 +255,8 @@ 6. Todo - o Add uHexen2's first person camera (and menu item) + + o Add HoT's first person camera (and menu item) o Native CD audio support (if desired). cd_sdl.c doesn't have proper volume controls @@ -272,25 +276,20 @@ 7. Links + QuakeSpasm Homepage - QuakeSpasm Project page - FitzQuake Homepage - Sleepwalkr's Original SDL Port - Baker's 0.85 Source Code - Func Quakespasm forum - Func SDL Fitzquake forum - Ozkan's email Stevenaaus email Kristian's email +