diff options
| author | Alexey Dokuchaev <danfe@FreeBSD.org> | 2019-12-08 12:15:29 +0000 |
|---|---|---|
| committer | Alexey Dokuchaev <danfe@FreeBSD.org> | 2019-12-08 12:15:29 +0000 |
| commit | 94108af78bab9a7002d363b35421bf1f6ac69205 (patch) | |
| tree | 4a7a73f964e45ade81f35bbe9d455db5c7fb1583 /games/doomlegacy/files/patch-src_Makefile | |
| parent | devel/libosinfo: update to 1.7.1 (diff) | |
Belatedly update Doom Legacy to version 1.47.2 (r1412) and unbreak.
The new features include MBF (Marine's Best Friend) compatibility, support
for sprites with 16 rotation positions, the possibility of multiple clients
and the server running on the same computer, plus many bug fixes.
While here, move ${DMDIR} up in WAD search list (DEFWADS20 -> DEFWADS04),
add ASM_BROKEN and missing `gl' to USE_GL, improve diagnostics and fix
potential segmentation fault in the owner_wad_search_order() function.
Diffstat (limited to 'games/doomlegacy/files/patch-src_Makefile')
| -rw-r--r-- | games/doomlegacy/files/patch-src_Makefile | 27 |
1 files changed, 15 insertions, 12 deletions
diff --git a/games/doomlegacy/files/patch-src_Makefile b/games/doomlegacy/files/patch-src_Makefile index ff23210c1b91..14bb6221d117 100644 --- a/games/doomlegacy/files/patch-src_Makefile +++ b/games/doomlegacy/files/patch-src_Makefile @@ -1,6 +1,18 @@ ---- src/Makefile.orig 2017-01-01 23:32:38 UTC +--- src/Makefile.orig 2018-07-16 09:17:06 UTC +++ src/Makefile -@@ -577,7 +577,7 @@ ifeq ($(SMIF), SDL) +@@ -554,8 +554,10 @@ LIBS:= + LDFLAGS:= + INSTALL_SUPPL:= + +-CFLAGS:= ++#CFLAGS:= + # Machine architecture. ++# (Ab)using ARCH is very bad idea and can easily break things! ++override undefine ARCH + ifdef ARCH + # if does not have leading -march, -mcpu, -mtune, or similar. + ifeq ($(filter -march% -mcpu% -mtune% -m%, $(strip $(ARCH))),) +@@ -598,7 +600,7 @@ ifeq ($(SMIF), SDL) # default is Linux, for all unix SDL EXENAME:=doomlegacy LDFLAGS=-L/usr/X11R6/lib @@ -9,16 +21,7 @@ # -L/usr/X11R6/lib is needed by Linux 2.4 and others that still have # the GLU libraries in an X11 directory. # -lm is needed for pow, powf, and other MATH1 functions. -@@ -963,7 +963,7 @@ ifdef CDMUS - endif - - # compiler and linker flags --CFLAGS:=$(WFLAGS) -+#CFLAGS:=$(WFLAGS) - - ifdef PROFILEMODE - # build with gprof profiling information -@@ -980,11 +980,11 @@ ifdef DEBUG +@@ -1001,11 +1003,11 @@ ifdef DEBUG else # build a normal optimized version #CFLAGS+=-O3 |