diff options
| author | Tor Andersson <tor@ccxvii.net> | 2018-07-16 16:24:48 +0200 |
|---|---|---|
| committer | Tor Andersson <tor.andersson@artifex.com> | 2018-08-10 14:09:46 +0200 |
| commit | d97b6bb79759db3a33f63792b235f1a161fa7a6b (patch) | |
| tree | 2bf3f3656004cc8d832137631a2c27780e38b56d /Makefile | |
| parent | 08e9dc67fd34f7dbcc5ce1ab877c3c42f9f75b05 (diff) | |
| download | mupdf-d97b6bb79759db3a33f63792b235f1a161fa7a6b.tar.xz | |
Tweak hexdumped data to increase build portability.
Follow bin2coff layout for hexdumped data instead of trying to emulate
the objcopy layout (which seems to break for the android tools).
Only use the basename of the resource in hexdump / bin2coff.
Ifdef on HAVE_OBJCOPY instead of _WIN32.
Diffstat (limited to 'Makefile')
| -rw-r--r-- | Makefile | 7 |
1 files changed, 6 insertions, 1 deletions
@@ -92,6 +92,11 @@ $(OUT)/platform/x11/curl/%.o : platform/x11/%.c $(OUT)/platform/gl/%.o : platform/gl/%.c $(CC_CMD) -Wall $(GLUT_CFLAGS) +ifeq ($(HAVE_OBJCOPY),yes) + $(OUT)/source/fitz/noto.o : source/fitz/noto.c + $(CC_CMD) -Wall -Wdeclaration-after-statement -DHAVE_OBJCOPY $(THIRD_CFLAGS) +endif + $(OUT)/source/%.o : source/%.c $(CC_CMD) -Wall -Wdeclaration-after-statement $(THIRD_CFLAGS) @@ -144,7 +149,7 @@ generated/%.otf.c : %.otf $(HEXDUMP_EXE) ; $(QUIET_GEN) $(MKTGTDIR) ; $(HEXDUMP_ generated/%.ttf.c : %.ttf $(HEXDUMP_EXE) ; $(QUIET_GEN) $(MKTGTDIR) ; $(HEXDUMP_EXE) -s $@ $< generated/%.ttc.c : %.ttc $(HEXDUMP_EXE) ; $(QUIET_GEN) $(MKTGTDIR) ; $(HEXDUMP_EXE) -s $@ $< -ifeq ($(OS),Linux) +ifeq ($(HAVE_OBJCOPY),yes) MUPDF_OBJ += $(FONT_BIN:%=$(OUT)/%.o) $(OUT)/%.cff.o : %.cff ; $(OBJCOPY_CMD) $(OUT)/%.otf.o : %.otf ; $(OBJCOPY_CMD) |