diff options
| -rw-r--r-- | Makefile | 9 | ||||
| -rw-r--r-- | Makethird | 10 | ||||
| -rw-r--r-- | source/tools/mudraw.c | 2 |
3 files changed, 13 insertions, 8 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 @@ -763,7 +763,9 @@ endif # --- pthread --- -#ifeq "$(HAVE_PTHREAD)" "yes" -PTHREAD_CFLAGS := $(SYS_PTHREAD_CFLAGS) -PTHREAD_LIBS := $(SYS_PTHREAD_LIBS) -#endif +ifneq "$(threading)" "no" +ifeq "$(HAVE_PTHREAD)" "yes" +THREADING_CFLAGS := $(SYS_PTHREAD_CFLAGS) -DHAVE_PTHREAD +THREADING_LIBS := $(SYS_PTHREAD_LIBS) +endif +endif diff --git a/source/tools/mudraw.c b/source/tools/mudraw.c index d9b68571..b138714b 100644 --- a/source/tools/mudraw.c +++ b/source/tools/mudraw.c @@ -314,7 +314,7 @@ static void usage(void) "\t-h -\theight (in pixels) (maximum height if -r is specified)\n" "\t-f -\tfit width and/or height exactly; ignore original aspect ratio\n" "\t-B -\tmaximum band_height (pgm, ppm, pam, png output only)\n" -#ifdef MUDRAW_THREADS +#ifndef DISABLE_MUTHREADS "\t-T -\tnumber of threads to use for rendering (banded mode only)\n" #endif "\n" |