diff options
| author | Kris Kennaway <kris@FreeBSD.org> | 2000-02-07 00:53:21 +0000 |
|---|---|---|
| committer | Kris Kennaway <kris@FreeBSD.org> | 2000-02-07 00:53:21 +0000 |
| commit | a4ae2537d548838aac93f97a02dfb99cf72df1e6 (patch) | |
| tree | 392203ff69e0656dea6d12aa112e38179ccded20 /games/doom | |
| parent | Respect CC, CFLAGS (diff) | |
Respect CC and CFLAGS
Notes
Notes:
svn path=/head/; revision=25537
Diffstat (limited to 'games/doom')
| -rw-r--r-- | games/doom/files/patch-ab | 18 | ||||
| -rw-r--r-- | games/doom/files/patch-aj | 14 |
2 files changed, 27 insertions, 5 deletions
diff --git a/games/doom/files/patch-ab b/games/doom/files/patch-ab index 55f3865ba76c..ceed95110731 100644 --- a/games/doom/files/patch-ab +++ b/games/doom/files/patch-ab @@ -1,14 +1,22 @@ ---- linuxdoom-1.10/Makefile~ Mon Dec 22 20:55:36 1997 -+++ linuxdoom-1.10/Makefile Mon Dec 14 03:20:27 1998 -@@ -6,9 +6,9 @@ +--- linuxdoom-1.10/Makefile.orig Mon Dec 22 11:55:36 1997 ++++ linuxdoom-1.10/Makefile Sun Feb 6 16:26:51 2000 +@@ -4,11 +4,12 @@ # - CC= gcc # gcc or g++ + # $Log:$ + # +-CC= gcc # gcc or g++ ++CC?= gcc # gcc or g++ -CFLAGS=-g -Wall -DNORMALUNIX -DLINUX # -DUSEASM -+CFLAGS=-g -O -I/usr/X11R6/include -Wall -DNORMALUNIX -DSNDSERV -DSNDSRV # -DUSEASM ++CFLAGS?= -O ++CFLAGS+=-g -I/usr/X11R6/include -Wall -DNORMALUNIX -DSNDSERV -DSNDSRV # -DUSEASM LDFLAGS=-L/usr/X11R6/lib -LIBS=-lXext -lX11 -lnsl -lm +LIBS=-lXext -lX11 -lm # subdirectory for objects O=linux +@@ -92,4 +93,4 @@ + + ############################################################# + # diff --git a/games/doom/files/patch-aj b/games/doom/files/patch-aj new file mode 100644 index 000000000000..180c311c18e9 --- /dev/null +++ b/games/doom/files/patch-aj @@ -0,0 +1,14 @@ +--- sndserv/Makefile.orig Sun Feb 6 16:36:56 2000 ++++ sndserv/Makefile Sun Feb 6 16:37:13 2000 +@@ -6,8 +6,9 @@ + # + # + +-CC=gcc +-CFLAGS=-O -DNORMALUNIX -DLINUX ++CC?=gcc ++CFLAGS?=-O ++CFLAGS+=-DNORMALUNIX -DLINUX + LDFLAGS= + LIBS=-lm + |