Update Makefile.darwin (OSX) and doco.

git-svn-id: svn://svn.code.sf.net/p/quakespasm/code/trunk/quakespasm@448 af15c1b1-3010-417e-b628-4374ebc0bcbd
This commit is contained in:
Steven 2011-04-24 03:01:40 +00:00
parent c33eb7e1e0
commit 24aa8ca6f8
4 changed files with 92 additions and 52 deletions

View file

@ -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

View file

@ -28,6 +28,11 @@
<P>
<H2><A NAME="toc4">4.</A> <A HREF="README.html#s4">Compiling </A></H2>
<UL>
<LI><A NAME="toc4.1">4.1</A> <A HREF="README.html#ss4.1">Linux/Unix </A>
<LI><A NAME="toc4.2">4.2</A> <A HREF="README.html#ss4.2">Windows </A>
<LI><A NAME="toc4.3">4.3</A> <A HREF="README.html#ss4.3">Mac OS X </A>
</UL>
<P>
<H2><A NAME="toc5">5.</A> <A HREF="README.html#s5">Changes</A></H2>
@ -99,6 +104,11 @@ It includes 64bit CPU support, a new sound driver, several networking fixes and
<H2><A NAME="s4">4.</A> <A HREF="#toc4">Compiling </A></H2>
<P><EM>To check-out the latest version of QuakeSpasm, use :</EM> svn co https://quakespasm.svn.sourceforge.net/svnroot/quakespasm/trunk</P>
<H2><A NAME="ss4.1">4.1</A> <A HREF="#toc4.1">Linux/Unix </A>
</H2>
<P>After extracting the source tarball, browse the Makefile and edit the music streaming options, then
<HR>
<PRE>
@ -116,8 +126,17 @@ Compile time options include
<P>Streaming music playback requires "libmad" or "libmpg123" for MP3, and "libogg" and "libvorbis" for OGG files.</P>
<P>HOME directory support can be enabled via <B>Misc/homedir_0.patch</B></P>
<P>The project can also be built with Codeblocks (project files included).</P>
<P>Windows developers can also build using Visual Studio 2005 or newer.</P>
.
<H2><A NAME="ss4.2">4.2</A> <A HREF="#toc4.2">Windows </A>
</H2>
<P>The QS developers cross-compile win32 binaries using
<A HREF="http://www.mingw.org">Minimal GNU for Windows</A> (Mingw).</P>
<P>The project can also build using Visual Studio 2005 (or newer).</P>
<H2><A NAME="ss4.3">4.3</A> <A HREF="#toc4.3">Mac OS X </A>
</H2>
<P>A Quakespasm App (including program launcher and update framework) can be made using the <B>Xcode</B> template found in the MacOSX directory.</P>
<P>Alternatively, have a look at <B>Quake/Makefile.darwin</B> for more instructions on building with GCC.</P>
<H2><A NAME="s5">5.</A> <A HREF="#toc5">Changes</A></H2>

View file

@ -55,6 +55,8 @@ Since version 0.85.4, Quakespasm can play back external MP3, OGG and Wave music
<sect> Compiling <p>
<p><em>To check-out the latest version of QuakeSpasm, use :</em> <b>svn co https://quakespasm.svn.sourceforge.net/svnroot/quakespasm/trunk</b></p>
<sect1> Linux/Unix <p>
After extracting the source tarball, browse the Makefile and edit the music streaming options, then
<code>
make
@ -68,8 +70,17 @@ Compile time options include
</itemize>
<p>Streaming music playback requires "libmad" or "libmpg123" for MP3, and "libogg" and "libvorbis" for OGG files.
<p>HOME directory support can be enabled via <bf>Misc/homedir_0.patch</bf>
<p>The project can also be built with Codeblocks (project files included).</p>.
<p>Windows developers can also build using Visual Studio 2005 or newer.</p>.
<p>The project can also be built with Codeblocks (project files included).</p>
<sect1> Windows <p>
The QS developers cross-compile win32 binaries using <url url="http://www.mingw.org" name="Minimal GNU for Windows"> (Mingw).
The project can also build using Visual Studio 2005 (or newer).</p>
</p>
<sect1> Mac OS X <p>
A Quakespasm App (including program launcher and update framework) can be made using the <bf>Xcode</bf> template found in the MacOSX directory.
Alternatively, have a look at <bf>Quake/Makefile.darwin</bf> for more instructions on building with GCC.
</p>
<sect> Changes<p>
<sect1> 0.85.4<p>

View file

@ -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
<http://sourceforge.net/projects/quakespasm/files/quakespasm-0.85.4.tgz/download>
Linux (x86)
<http://sourceforge.net/projects/quakespasm/files/quakespasm-0.85.4_linux.tgz/download>
Windows (x86)
<http://sourceforge.net/projects/quakespasm/files/quakespasm-0.85.4_windows.zip/download>
OSX universal binary
<http://sourceforge.net/projects/quakespasm/files/quakespasm-0.85.4_osx.zip/download>
3. Hints
Visit the FitzQuake Homepage <http://www.celephais.net/fitzquake> for
Visit the FitzQuake Homepage <http://www.celephais.net/fitzquake> 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 <http://quakespasm.sourceforge.net>
QuakeSpasm Project page <http://sourceforge.net/projects/quakespasm>
FitzQuake Homepage <http://www.celephais.net/fitzquake>
Sleepwalkr's Original SDL Port
<http://www.kristianduske.com/fitzquake>
Baker's 0.85 Source Code
<http://quakeone.com/proquake/src_other/fitzquake_sdl_20090510_src_beta_1.zip>
Func Quakespasm forum
<http://www.celephais.net/board/view_thread.php?id=60452>
Func SDL Fitzquake forum
<http://www.celephais.net/board/view_thread.php?id=60172>
Ozkan's email <mailto:gmail - dot - com - username - sezeroz>
Stevenaaus email <mailto:yahoo - dot - com - username - stevenaaus>
Kristian's email <mailto:gmail - dot - com - username - inveigle>