Skip to content

Commit 6baceea

Browse files
committed
minor update to makefiles, remove the unnecessary use of -std=gnu11 flag
1 parent 7d0f41a commit 6baceea

6 files changed

Lines changed: 21 additions & 20 deletions

File tree

Quake/Makefile

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -16,15 +16,15 @@ USE_CODEC_FLAC=0
1616
USE_CODEC_MP3=1
1717
USE_CODEC_VORBIS=1
1818
USE_CODEC_OPUS=0
19-
# either xmp or mikmod (or modplug)
19+
# either of xmp (preferred), mikmod or modplug
2020
USE_CODEC_MIKMOD=0
2121
USE_CODEC_XMP=0
2222
USE_CODEC_MODPLUG=0
2323
USE_CODEC_UMX=0
2424

2525
# which library to use for mp3 decoding: mad or mpg123
2626
MP3LIB=mad
27-
# which library to use for ogg decoding: vorbis or tremor
27+
# which library to use for ogg/vorbis decoding: vorbis or tremor
2828
VORBISLIB=vorbis
2929

3030
# ---------------------------
@@ -53,7 +53,7 @@ CPUFLAGS=
5353
LDFLAGS?=
5454
DFLAGS ?=
5555
CFLAGS ?= -Wall -Wno-trigraphs -MMD
56-
CFLAGS += $(call check_gcc,-std=gnu11,)
56+
#CFLAGS += $(call check_gcc,-std=gnu11,)
5757
CFLAGS += $(CPUFLAGS)
5858
ifneq ($(DEBUG),0)
5959
DFLAGS += -DDEBUG

Quake/Makefile.darwin

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -18,15 +18,15 @@ USE_CODEC_FLAC=1
1818
USE_CODEC_MP3=1
1919
USE_CODEC_VORBIS=1
2020
USE_CODEC_OPUS=1
21-
# either xmp or mikmod (or modplug)
21+
# either of xmp (preferred), mikmod or modplug
2222
USE_CODEC_MIKMOD=0
2323
USE_CODEC_XMP=1
2424
USE_CODEC_MODPLUG=0
2525
USE_CODEC_UMX=1
2626

2727
# which library to use for mp3 decoding: mad or mpg123
2828
MP3LIB=mad
29-
# which library to use for ogg decoding: vorbis or tremor
29+
# which library to use for ogg/vorbis decoding: vorbis or tremor
3030
VORBISLIB=vorbis
3131

3232
# ---------------------------
@@ -84,7 +84,7 @@ CFLAGS +=-mmacosx-version-min=11.0
8484
LDFLAGS +=-mmacosx-version-min=11.0
8585
USE_RPATH=1
8686
endif
87-
CFLAGS += $(call check_gcc,-std=gnu11,)
87+
#CFLAGS += $(call check_gcc,-std=gnu11,)
8888
CFLAGS += $(CPUFLAGS)
8989
ifeq ($(USE_RPATH),1)
9090
LDFLAGS+=-Wl,-rpath,@executable_path/../Frameworks

Quake/Makefile.emscripten

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
# GNU Makefile for QuakeSpasm WASM (Emscripten)
22
# Contributed by Roman Turchin
3+
# Edit this makefile, if necessary, to suit your environment.
34
#
45
# Build depends on external library gl4es:
56
# https://github.com/ptitSeb/gl4es
@@ -10,15 +11,15 @@ USE_CODEC_FLAC=0
1011
USE_CODEC_MP3=0
1112
USE_CODEC_VORBIS=1
1213
USE_CODEC_OPUS=0
13-
# either xmp or mikmod (or modplug)
14+
# either of xmp (preferred), mikmod or modplug
1415
USE_CODEC_MIKMOD=0
1516
USE_CODEC_XMP=0
1617
USE_CODEC_MODPLUG=0
1718
USE_CODEC_UMX=0
1819

1920
# which library to use for mp3 decoding: mad or mpg123
2021
MP3LIB=mad
21-
# which library to use for ogg decoding: vorbis or tremor
22+
# which library to use for ogg/vorbis decoding: vorbis or tremor
2223
VORBISLIB=vorbis
2324

2425
# ---------------------------
@@ -47,7 +48,7 @@ CPUFLAGS=
4748
LDFLAGS?=
4849
DFLAGS ?=
4950
CFLAGS ?= -Wall -Wno-trigraphs -MMD
50-
CFLAGS += $(call check_gcc,-std=gnu11,)
51+
#CFLAGS += $(call check_gcc,-std=gnu11,)
5152
CFLAGS += $(CPUFLAGS)
5253
ifneq ($(DEBUG),0)
5354
DFLAGS += -DDEBUG

Quake/Makefile.w32

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -2,8 +2,8 @@
22
# Usage: "make -f Makefile.w32"
33
# To cross-compile on Linux hosts, see the build_cross_win32*.sh scripts.
44
# "make DEBUG=1" to build a debug client.
5-
# "make SDL_CONFIG=/path/to/sdl-config" to override the locally included SDL versions.
6-
# "make WINSOCK2=1" to use WinSock2 api instead of the old WinSock 1.1.
5+
# "make SDL_CONFIG=/path/to/sdl-config" to override the included SDL versions.
6+
# "make WINSOCK2=1" to use WinSock2 api instead of old WinSock 1.1.
77

88
### Enable/disable SDL2
99
USE_SDL2=0
@@ -14,15 +14,15 @@ USE_CODEC_FLAC=1
1414
USE_CODEC_MP3=1
1515
USE_CODEC_VORBIS=1
1616
USE_CODEC_OPUS=1
17-
# either xmp or mikmod (or modplug)
17+
# either of xmp (preferred), mikmod or modplug
1818
USE_CODEC_MIKMOD=0
1919
USE_CODEC_XMP=1
2020
USE_CODEC_MODPLUG=0
2121
USE_CODEC_UMX=1
2222

2323
# which library to use for mp3 decoding: mad or mpg123
2424
MP3LIB=mad
25-
# which library to use for ogg decoding: vorbis or tremor
25+
# which library to use for ogg/vorbis decoding: vorbis or tremor
2626
VORBISLIB=vorbis
2727

2828
# ---------------------------
@@ -50,7 +50,7 @@ CPUFLAGS=
5050
LDFLAGS?= -m32 -mwindows -static-libgcc
5151
DFLAGS ?=
5252
CFLAGS ?= -m32 -Wall -Wno-trigraphs -MMD
53-
CFLAGS += $(call check_gcc,-std=gnu11,)
53+
#CFLAGS += $(call check_gcc,-std=gnu11,)
5454
CFLAGS += $(CPUFLAGS)
5555
ifneq ($(DEBUG),0)
5656
DFLAGS += -DDEBUG

Quake/Makefile.w64

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
# Usage: "make -f Makefile.w64"
33
# To cross-compile on Linux hosts, see the build_cross_win32*.sh scripts.
44
# "make DEBUG=1" to build a debug client.
5-
# "make SDL_CONFIG=/path/to/sdl-config" to override the locally included SDL versions.
5+
# "make SDL_CONFIG=/path/to/sdl-config" to override the included SDL versions.
66

77
### Enable/disable SDL2
88
USE_SDL2=0
@@ -13,15 +13,15 @@ USE_CODEC_FLAC=1
1313
USE_CODEC_MP3=1
1414
USE_CODEC_VORBIS=1
1515
USE_CODEC_OPUS=1
16-
# either xmp or mikmod (or modplug)
16+
# either of xmp (preferred), mikmod or modplug
1717
USE_CODEC_MIKMOD=0
1818
USE_CODEC_XMP=1
1919
USE_CODEC_MODPLUG=0
2020
USE_CODEC_UMX=1
2121

2222
# which library to use for mp3 decoding: mad or mpg123
2323
MP3LIB=mad
24-
# which library to use for ogg decoding: vorbis or tremor
24+
# which library to use for ogg/vorbis decoding: vorbis or tremor
2525
VORBISLIB=vorbis
2626

2727
# ---------------------------
@@ -48,7 +48,7 @@ CPUFLAGS=
4848
LDFLAGS?= -m64 -mwindows -static-libgcc
4949
DFLAGS ?=
5050
CFLAGS ?= -m64 -Wall -Wno-trigraphs -MMD
51-
CFLAGS += $(call check_gcc,-std=gnu11,)
51+
#CFLAGS += $(call check_gcc,-std=gnu11,)
5252
CFLAGS += $(CPUFLAGS)
5353
ifneq ($(DEBUG),0)
5454
DFLAGS += -DDEBUG

Quake/Makefile.wat

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,15 +10,15 @@ USE_CODEC_FLAC=0
1010
USE_CODEC_MP3=1
1111
USE_CODEC_VORBIS=1
1212
USE_CODEC_OPUS=0
13-
# either xmp or mikmod (or modplug)
13+
# either of xmp (preferred), mikmod or modplug
1414
USE_CODEC_MIKMOD=0
1515
USE_CODEC_XMP=0
1616
USE_CODEC_MODPLUG=0
1717
USE_CODEC_UMX=0
1818

1919
# which library to use for mp3 decoding: mad or mpg123
2020
MP3LIB=mad
21-
# which library to use for ogg decoding: vorbis or tremor
21+
# which library to use for ogg/vorbis decoding: vorbis or tremor
2222
VORBISLIB=vorbis
2323

2424
WINSOCK2= 0

0 commit comments

Comments
 (0)