diff --git a/Quake/Makefile b/Quake/Makefile index 8f3b9490..c58a37a7 100644 --- a/Quake/Makefile +++ b/Quake/Makefile @@ -1,4 +1,4 @@ -### GNU Makefile for QuakeSpasm unix targets, Jan. 12, 2011 +### GNU Makefile for QuakeSpasm unix targets, Mar. 27, 2011 # # You need the SDL library fully installed. # "make DEBUG=1" to build a debug client. @@ -13,7 +13,7 @@ USE_QS_CONBACK=1 ### Enable/Disable codecs for streaming music support # # OGG (vorbis) playback requires libvorbis and libogg -# MP3 playback requires libmad or libmpg123 +# MP3 playback requires libmad or libmpg123 (see MP3LIB below) USE_CODEC_WAVE=1 USE_CODEC_MP3=1 diff --git a/Quake/Makefile.darwin b/Quake/Makefile.darwin index cea016b5..5b95bc89 100644 --- a/Quake/Makefile.darwin +++ b/Quake/Makefile.darwin @@ -1,4 +1,4 @@ -# GNU Makefile for QuakeSpasm for Darwin only, Jan. 12, 2011 +# GNU Makefile for QuakeSpasm for Darwin only, Mar. 27, 2011 # # You need the SDL library fully installed. # "make DEBUG=1" to build a debug client. @@ -12,7 +12,7 @@ USE_QS_CONBACK=1 ### Enable/Disable codecs for streaming music support # # OGG (vorbis) playback requires libvorbis and libogg -# MP3 playback requires libmad +# MP3 playback requires libmad or libmpg123 (see MP3LIB below) USE_CODEC_WAVE=1 USE_CODEC_MP3=1 diff --git a/Quake/Makefile.w32 b/Quake/Makefile.w32 index 8cb20a3d..ff34b495 100644 --- a/Quake/Makefile.w32 +++ b/Quake/Makefile.w32 @@ -1,5 +1,5 @@ # GNU Makefile for cross-compiling quakespasm.exe (Win32 : MinGW) -# using cross-toolchains on a linux host / Jan. 12, 2011. +# using cross-toolchains on a linux host / Mar. 27, 2011. # "make DEBUG=1" to build a debug client. # "make SDL_CONFIG=/path/to/sdl-config" for unusual SDL installations. # "make WINSOCK2=1" to use WinSock2 api instead of old WinSock 1.1. diff --git a/Quake/Makefile.w64 b/Quake/Makefile.w64 index ea9b3ffc..f59a96f8 100644 --- a/Quake/Makefile.w64 +++ b/Quake/Makefile.w64 @@ -1,5 +1,5 @@ # GNU Makefile for cross-compiling quakespasm.exe (Win64 : MinGW-w64) -# using cross-toolchains on a linux host / Jan. 12, 2011. +# using cross-toolchains on a linux host / Mar. 27, 2011. # "make DEBUG=1" to build a debug client. # "make SDL_CONFIG=/path/to/sdl-config" for unusual SDL installations. # "make WINSOCK2=0" to use the old WinSock 1.1 api (not recommended). diff --git a/README.html b/README.html index db703b80..2b753450 100644 --- a/README.html +++ b/README.html @@ -11,7 +11,7 @@

-

QuakeSpasm 0.85.4 (19 February 2011)

+

QuakeSpasm 0.85.4 (27 March 2011)

1. About

@@ -89,7 +89,7 @@ It includes 64bit CPU support, a new sound driver, several networking fixes and

Since version 0.85.4, Quakespasm can play back external MP3, OGG and Wave music files.

diff --git a/README.sgml b/README.sgml index b542ec9d..573a4bc5 100644 --- a/README.sgml +++ b/README.sgml @@ -4,7 +4,7 @@ -QuakeSpasm 0.85.4 (19 February 2011) +QuakeSpasm 0.85.4 (27 March 2011) About

@@ -47,7 +47,7 @@ It includes 64bit CPU support, a new sound driver, several networking fixes and Since version 0.85.4, Quakespasm can play back external MP3, OGG and Wave music files. Tracks should be named like "track02.ogg", "track03.ogg" ... (there is no track01) and placed into "Quake/id1/music". -Unix users may need some extra libraries installed: "libmad" for MP3, and "libogg" and "libvorbis" for OGG. +Unix users may need some extra libraries installed: "libmad" or "libmpg123" for MP3, and "libogg" and "libvorbis" for OGG. Use the "-noextmusic" option to disable this feature. diff --git a/README.txt b/README.txt index 8b8dc180..d6ba85b5 100644 --- a/README.txt +++ b/README.txt @@ -4,32 +4,29 @@ 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 (19 February 2011) + QuakeSpasm 0.85.4 (27 March 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. @@ -39,28 +36,30 @@ 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 @@ -93,21 +92,19 @@ 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 SDLNET=1 to enable SDL_net (Otherwise the socket api will be + 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 + 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. @@ -115,14 +112,14 @@ HOME directory support can be enabled via Misc/homedir_0.patch The project can also be built with Codeblocks (project files - included).. + 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 @@ -148,8 +145,8 @@ o Other minor sound and cdaudio updates - 5.2. 0.85.3 + 5.2. 0.85.3 o Fix the "-dedicated" option (thanks Oz) and add platform specific networking code (default) rather than SDL_net @@ -188,7 +185,6 @@ 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 @@ -216,7 +212,6 @@ 5.4. 0.85.1 - o 64 bit CPU support o Restructured SDL sound driver @@ -255,7 +250,6 @@ 6. Todo - o Add HoT's first person camera (and menu item) o Native CD audio support (if desired). cd_sdl.c doesn't have proper @@ -276,20 +270,25 @@ 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 -