Merge branch 'master' into next

This commit is contained in:
Alam Ed Arias 2018-07-20 17:35:53 -04:00
commit 79e4c3760a
1 changed files with 3 additions and 1 deletions

View File

@ -1,3 +1,4 @@
# GNU Make makefile for SRB2
#############################################################################
# Copyright (C) 1998-2000 by DooM Legacy Team.
@ -421,7 +422,8 @@ endif
ifdef PROFILEMODE
# build with profiling information
CFLAGS:=-pg $(CFLAGS)
CFLAGS+=-pg
LDFLAGS+=-pg
endif
ifdef ZDEBUG