diff options
| author | Sebastian Rasmussen <sebras@gmail.com> | 2017-07-10 19:52:31 +0800 |
|---|---|---|
| committer | Sebastian Rasmussen <sebras@gmail.com> | 2017-07-10 21:59:13 +0800 |
| commit | e3fb2f11d92e7a1df9fc1a83ba5d8bd7a5ca18fc (patch) | |
| tree | 743cdbf9a594bae74b5e28c149f3b199bafd6443 /Makefile | |
| parent | cca0f6ff702cfd9d78b538d190068d82e52f23a6 (diff) | |
| download | mupdf-e3fb2f11d92e7a1df9fc1a83ba5d8bd7a5ca18fc.tar.xz | |
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.
Diffstat (limited to 'Makefile')
| -rw-r--r-- | Makefile | 9 |
1 files changed, 6 insertions, 3 deletions
@@ -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 |