From e3fb2f11d92e7a1df9fc1a83ba5d8bd7a5ca18fc Mon Sep 17 00:00:00 2001 From: Sebastian Rasmussen Date: Mon, 10 Jul 2017 19:52:31 +0800 Subject: Make threading a compile-time option and propagate it to all tools. Also fix a typo causing the help message not to be shown when threading is enabled. --- Makefile | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) (limited to 'Makefile') diff --git a/Makefile b/Makefile index c8550a27..42416233 100644 --- a/Makefile +++ b/Makefile @@ -94,7 +94,10 @@ $(OUT)/%.exe: $(OUT)/%.o | $(ALL_DIR) $(LINK_CMD) $(OUT)/source/helpers/%.o : source/helpers/%.c | $(ALL_DIR) - $(CC_CMD) $(PTHREAD_CFLAGS) -DHAVE_PTHREAD + $(CC_CMD) $(THREADING_CFLAGS) + +$(OUT)/source/tools/%.o : source/tools/%.c | $(ALL_DIR) + $(CC_CMD) $(THREADING_CFLAGS) $(OUT)/generated/%.o : generated/%.c | $(ALL_DIR) $(CC_CMD) -O0 @@ -352,13 +355,13 @@ MUTOOL_SRC += $(sort $(wildcard source/tools/pdf*.c)) MUTOOL_OBJ := $(MUTOOL_SRC:%.c=$(OUT)/%.o) $(MUTOOL_OBJ) : $(FITZ_HDR) $(PDF_HDR) $(MUTOOL_EXE) : $(MUTOOL_OBJ) $(MUPDF_LIB) $(THIRD_LIB) $(THREAD_LIB) - $(LINK_CMD) $(PTHREAD_LIBS) + $(LINK_CMD) $(THREADING_LIBS) MURASTER_EXE := $(OUT)/muraster MURASTER_OBJ := $(OUT)/source/tools/muraster.o $(MURASTER_OBJ) : $(FITZ_HDR) $(MURASTER_EXE) : $(MURASTER_OBJ) $(MUPDF_LIB) $(THIRD_LIB) $(THREAD_LIB) - $(LINK_CMD) $(PTHREAD_LIBS) + $(LINK_CMD) $(THREADING_LIBS) MJSGEN_EXE := $(OUT)/mjsgen MJSGEN_OBJ := $(OUT)/source/tools/mjsgen.o -- cgit v1.2.3