File tree Expand file tree Collapse file tree
Expand file tree Collapse file tree Original file line number Diff line number Diff line change @@ -16,15 +16,15 @@ USE_CODEC_FLAC=0
1616USE_CODEC_MP3 =1
1717USE_CODEC_VORBIS =1
1818USE_CODEC_OPUS =0
19- # either xmp or mikmod ( or modplug)
19+ # either of xmp (preferred), mikmod or modplug
2020USE_CODEC_MIKMOD =0
2121USE_CODEC_XMP =0
2222USE_CODEC_MODPLUG =0
2323USE_CODEC_UMX =0
2424
2525# which library to use for mp3 decoding: mad or mpg123
2626MP3LIB =mad
27- # which library to use for ogg decoding: vorbis or tremor
27+ # which library to use for ogg/vorbis decoding: vorbis or tremor
2828VORBISLIB =vorbis
2929
3030# ---------------------------
@@ -53,7 +53,7 @@ CPUFLAGS=
5353LDFLAGS? =
5454DFLAGS ?=
5555CFLAGS ?= -Wall -Wno-trigraphs -MMD
56- CFLAGS += $(call check_gcc,-std=gnu11,)
56+ # CFLAGS += $(call check_gcc,-std=gnu11,)
5757CFLAGS += $(CPUFLAGS )
5858ifneq ($(DEBUG ) ,0)
5959DFLAGS += -DDEBUG
Original file line number Diff line number Diff line change @@ -18,15 +18,15 @@ USE_CODEC_FLAC=1
1818USE_CODEC_MP3=1
1919USE_CODEC_VORBIS=1
2020USE_CODEC_OPUS=1
21- # either xmp or mikmod ( or modplug)
21+ # either of xmp (preferred), mikmod or modplug
2222USE_CODEC_MIKMOD=0
2323USE_CODEC_XMP=1
2424USE_CODEC_MODPLUG=0
2525USE_CODEC_UMX=1
2626
2727# which library to use for mp3 decoding: mad or mpg123
2828MP3LIB=mad
29- # which library to use for ogg decoding: vorbis or tremor
29+ # which library to use for ogg/vorbis decoding: vorbis or tremor
3030VORBISLIB=vorbis
3131
3232# ---------------------------
@@ -84,7 +84,7 @@ CFLAGS +=-mmacosx-version-min=11.0
8484LDFLAGS +=-mmacosx-version-min=11.0
8585USE_RPATH=1
8686endif
87- CFLAGS += $(call check_gcc,-std=gnu11,)
87+ # CFLAGS += $(call check_gcc,-std=gnu11,)
8888CFLAGS += $(CPUFLAGS)
8989ifeq ($(USE_RPATH),1)
9090LDFLAGS+=-Wl,-rpath,@executable_path/../Frameworks
Original file line number Diff line number Diff line change 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
1011USE_CODEC_MP3=0
1112USE_CODEC_VORBIS=1
1213USE_CODEC_OPUS=0
13- # either xmp or mikmod ( or modplug)
14+ # either of xmp (preferred), mikmod or modplug
1415USE_CODEC_MIKMOD=0
1516USE_CODEC_XMP=0
1617USE_CODEC_MODPLUG=0
1718USE_CODEC_UMX=0
1819
1920# which library to use for mp3 decoding: mad or mpg123
2021MP3LIB=mad
21- # which library to use for ogg decoding: vorbis or tremor
22+ # which library to use for ogg/vorbis decoding: vorbis or tremor
2223VORBISLIB=vorbis
2324
2425# ---------------------------
@@ -47,7 +48,7 @@ CPUFLAGS=
4748LDFLAGS?=
4849DFLAGS ?=
4950CFLAGS ?= -Wall -Wno-trigraphs -MMD
50- CFLAGS += $(call check_gcc,-std=gnu11,)
51+ # CFLAGS += $(call check_gcc,-std=gnu11,)
5152CFLAGS += $(CPUFLAGS)
5253ifneq ($(DEBUG),0)
5354DFLAGS += -DDEBUG
Original file line number Diff line number Diff line change 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
99USE_SDL2=0
@@ -14,15 +14,15 @@ USE_CODEC_FLAC=1
1414USE_CODEC_MP3=1
1515USE_CODEC_VORBIS=1
1616USE_CODEC_OPUS=1
17- # either xmp or mikmod ( or modplug)
17+ # either of xmp (preferred), mikmod or modplug
1818USE_CODEC_MIKMOD=0
1919USE_CODEC_XMP=1
2020USE_CODEC_MODPLUG=0
2121USE_CODEC_UMX=1
2222
2323# which library to use for mp3 decoding: mad or mpg123
2424MP3LIB=mad
25- # which library to use for ogg decoding: vorbis or tremor
25+ # which library to use for ogg/vorbis decoding: vorbis or tremor
2626VORBISLIB=vorbis
2727
2828# ---------------------------
@@ -50,7 +50,7 @@ CPUFLAGS=
5050LDFLAGS?= -m32 -mwindows -static-libgcc
5151DFLAGS ?=
5252CFLAGS ?= -m32 -Wall -Wno-trigraphs -MMD
53- CFLAGS += $(call check_gcc,-std=gnu11,)
53+ # CFLAGS += $(call check_gcc,-std=gnu11,)
5454CFLAGS += $(CPUFLAGS)
5555ifneq ($(DEBUG),0)
5656DFLAGS += -DDEBUG
Original file line number Diff line number Diff line change 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
88USE_SDL2=0
@@ -13,15 +13,15 @@ USE_CODEC_FLAC=1
1313USE_CODEC_MP3=1
1414USE_CODEC_VORBIS=1
1515USE_CODEC_OPUS=1
16- # either xmp or mikmod ( or modplug)
16+ # either of xmp (preferred), mikmod or modplug
1717USE_CODEC_MIKMOD=0
1818USE_CODEC_XMP=1
1919USE_CODEC_MODPLUG=0
2020USE_CODEC_UMX=1
2121
2222# which library to use for mp3 decoding: mad or mpg123
2323MP3LIB=mad
24- # which library to use for ogg decoding: vorbis or tremor
24+ # which library to use for ogg/vorbis decoding: vorbis or tremor
2525VORBISLIB=vorbis
2626
2727# ---------------------------
@@ -48,7 +48,7 @@ CPUFLAGS=
4848LDFLAGS?= -m64 -mwindows -static-libgcc
4949DFLAGS ?=
5050CFLAGS ?= -m64 -Wall -Wno-trigraphs -MMD
51- CFLAGS += $(call check_gcc,-std=gnu11,)
51+ # CFLAGS += $(call check_gcc,-std=gnu11,)
5252CFLAGS += $(CPUFLAGS)
5353ifneq ($(DEBUG),0)
5454DFLAGS += -DDEBUG
Original file line number Diff line number Diff line change @@ -10,15 +10,15 @@ USE_CODEC_FLAC=0
1010USE_CODEC_MP3 =1
1111USE_CODEC_VORBIS =1
1212USE_CODEC_OPUS =0
13- # either xmp or mikmod ( or modplug)
13+ # either of xmp (preferred), mikmod or modplug
1414USE_CODEC_MIKMOD =0
1515USE_CODEC_XMP =0
1616USE_CODEC_MODPLUG =0
1717USE_CODEC_UMX =0
1818
1919# which library to use for mp3 decoding: mad or mpg123
2020MP3LIB =mad
21- # which library to use for ogg decoding: vorbis or tremor
21+ # which library to use for ogg/vorbis decoding: vorbis or tremor
2222VORBISLIB =vorbis
2323
2424WINSOCK2 = 0
You can’t perform that action at this time.
0 commit comments