From 5d4bb6c0a4e81729bd14def38895a7d1630ee18c Mon Sep 17 00:00:00 2001 From: sezero Date: Wed, 1 Sep 2010 06:10:21 +0000 Subject: [PATCH] makefile comment tweaks git-svn-id: svn+ssh://svn.code.sf.net/p/quakespasm/code/trunk@321 af15c1b1-3010-417e-b628-4374ebc0bcbd --- quakespasm/Quake/Makefile | 12 ++++++------ quakespasm/Quake/Makefile.darwin | 18 +++++++++--------- quakespasm/Quake/Makefile.w32 | 13 ++++++------- quakespasm/Quake/Makefile.w64 | 13 ++++++------- 4 files changed, 27 insertions(+), 29 deletions(-) diff --git a/quakespasm/Quake/Makefile b/quakespasm/Quake/Makefile index 4773eb32..62db1e9c 100644 --- a/quakespasm/Quake/Makefile +++ b/quakespasm/Quake/Makefile @@ -1,10 +1,10 @@ -# GNU Makefile for QuakeSpasm unix targets, June 21, 2010 +# GNU Makefile for QuakeSpasm unix targets, Aug. 31, 2010 # -# You need SDL (and optionally SDL_net) fully installed. -# "make DEBUG=1" builds debug client -# "make SDLNET=1" to enable SDL_net. otherwise the socket api will be -# used directly. -# "make SDL_CONFIG=/path/to/sdl-config" for unusual SDL installations +# 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). diff --git a/quakespasm/Quake/Makefile.darwin b/quakespasm/Quake/Makefile.darwin index 5da06706..d1e01afd 100644 --- a/quakespasm/Quake/Makefile.darwin +++ b/quakespasm/Quake/Makefile.darwin @@ -1,10 +1,10 @@ -# GNU Makefile for QuakeSpasm for Darwin only, June 21, 2010 +# GNU Makefile for QuakeSpasm for Darwin only, Aug. 31, 2010 # -# You need SDL and SDL_net fully installed. -# "make DEBUG=1" builds debug client -# "make SDLNET=1" to enable SDL_net. otherwise the socket api will be -# used directly. -# "make SDL_CONFIG=/path/to/sdl-config" for unusual SDL installations +# 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). @@ -110,10 +110,10 @@ SDL_CFLAGS := $(shell $(SDL_CONFIG) --cflags) SDL_LFLAGS := $(shell $(SDL_CONFIG) --libs) ifeq ($(SDLNET),1) -NET_LIBS =-L/usr/local/lib -l SDL_net +NET_LIBS :=-L/usr/local/lib -l SDL_net CFLAGS +=-D_USE_SDLNET else -NET_LIBS = +NET_LIBS := endif COMMON_LIBS = -Wl,-framework,OpenGL @@ -229,7 +229,7 @@ debug: $(error Use "make DEBUG=1") install: quakespasm - mv quakespasm /usr/local/games/quake + cp quakespasm /usr/local/games/quake clean: rm -f $(shell find . \( -name '*~' -o -name '#*#' -o -name '*.o' -o -name '*.res' -o -name $(DEFAULT_TARGET) \) -print) diff --git a/quakespasm/Quake/Makefile.w32 b/quakespasm/Quake/Makefile.w32 index afaa30d7..3100db14 100644 --- a/quakespasm/Quake/Makefile.w32 +++ b/quakespasm/Quake/Makefile.w32 @@ -1,11 +1,10 @@ # GNU Makefile for cross-compiling quakespasm.exe (Win32 : MinGW) -# using cross-toolchains on a linux host / Aug. 17, 2010. -# "make DEBUG=1" builds debug client -# "make WINSOCK2=1" to use WinSock2 api when not using SDL_net. otherwise, -# WinSock 1.1 will be used. -# "make SDLNET=1" to enable SDL_net. otherwise, the WinSock api will be -# used directly. -# "make SDL_CONFIG=/path/to/sdl-config" for sdl-config from cross-compiled SDL +# using cross-toolchains on a linux host / Aug. 31, 2010. +# "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. +# "make SDLNET=1" to use SDL_net (not recommended) instead of platform +# specific code. # ============================================================================ # Helper functions diff --git a/quakespasm/Quake/Makefile.w64 b/quakespasm/Quake/Makefile.w64 index 82527ce8..a2764df3 100644 --- a/quakespasm/Quake/Makefile.w64 +++ b/quakespasm/Quake/Makefile.w64 @@ -1,11 +1,10 @@ # GNU Makefile for cross-compiling quakespasm.exe (Win64 : MinGW-w64) -# using cross-toolchains on a linux host / Aug. 17, 2010. -# "make DEBUG=1" builds debug client -# "make WINSOCK2=0" to use the old WinSock 1.1 api when not using SDL_net. -# otherwise, WinSock2 api will be used. -# "make SDLNET=1" to enable SDL_net. otherwise, the WinSock api will be -# used directly. -# "make SDL_CONFIG=/path/to/sdl-config" for sdl-config from cross-compiled SDL +# using cross-toolchains on a linux host / Aug. 31, 2010. +# "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). +# "make SDLNET=1" to use SDL_net (not recommended) instead of platform +# specific code. # ============================================================================ # Helper functions