summaryrefslogtreecommitdiff
path: root/Makerules
diff options
context:
space:
mode:
authorRobin Watts <Robin.Watts@artifex.com>2012-04-09 12:08:48 +0100
committerRobin Watts <Robin.Watts@artifex.com>2012-04-09 12:14:57 +0100
commit3f89d1b6d1d28018f8706faefbbac040e4188e1a (patch)
treedbeca90634e89e1df67319a95d12ff969769473c /Makerules
parent10c3dc0da2d157723c6bfcdc81dd797430063366 (diff)
downloadmupdf-3f89d1b6d1d28018f8706faefbbac040e4188e1a.tar.xz
Bug 692976: Fix spurious thread lock debug warnings on context clones
When cloning, ensure the locks are done on the new context, not the old one; this makes no difference except to suppress some spurious debugging messages. Also ensure that DEBUG is predefined for Makefile based debug and memento builds. Thanks to Bas Weelinck.
Diffstat (limited to 'Makerules')
-rw-r--r--Makerules4
1 files changed, 2 insertions, 2 deletions
diff --git a/Makerules b/Makerules
index 98fe9168..98210904 100644
--- a/Makerules
+++ b/Makerules
@@ -6,7 +6,7 @@ OS := $(OS:MINGW%=MINGW)
CFLAGS += -Wall
ifeq "$(build)" "debug"
-CFLAGS += -pipe -g
+CFLAGS += -pipe -g -DDEBUG
else ifeq "$(build)" "profile"
CFLAGS += -pipe -O2 -DNDEBUG -pg
LDFLAGS += -pg
@@ -15,7 +15,7 @@ CFLAGS += -pipe -O2 -DNDEBUG -fomit-frame-pointer
else ifeq "$(build)" "native"
CFLAGS += -pipe -O2 -DNDEBUG -fomit-frame-pointer -march=native -mfpmath=sse
else ifeq "$(build)" "memento"
-CFLAGS += -pipe -g -DMEMENTO
+CFLAGS += -pipe -g -DMEMENTO -DDEBUG
else
$(error unknown build setting: '$(build)')
endif