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 /source/fitz | |
| 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 'source/fitz')
| -rw-r--r-- | source/fitz/noto.c | 18 |
1 files changed, 10 insertions, 8 deletions
diff --git a/source/fitz/noto.c b/source/fitz/noto.c index b01614d4..8301929f 100644 --- a/source/fitz/noto.c +++ b/source/fitz/noto.c @@ -45,20 +45,22 @@ #define TOFU_EMOJI #endif -#ifdef _WIN32 +#ifdef HAVE_OBJCOPY #define RETURN(FORGE,NAME) \ do { \ - extern unsigned char _binary_resources_fonts_##NAME[]; \ - extern unsigned int _binary_resources_fonts_##NAME##_size; \ - return *size = _binary_resources_fonts_##NAME##_size, _binary_resources_fonts_##NAME; \ + extern unsigned char _binary_resources_fonts_##FORGE##_##NAME##_start; \ + extern unsigned char _binary_resources_fonts_##FORGE##_##NAME##_end; \ + return *size = \ + &_binary_resources_fonts_##FORGE##_##NAME##_end - \ + &_binary_resources_fonts_##FORGE##_##NAME##_start, \ + &_binary_resources_fonts_##FORGE##_##NAME##_start; \ } while (0) #else #define RETURN(FORGE,NAME) \ do { \ - extern const unsigned char _binary_resources_fonts_##FORGE##_##NAME##_start[]; \ - extern const unsigned char _binary_resources_fonts_##FORGE##_##NAME##_end; \ - return *size = &_binary_resources_fonts_##FORGE##_##NAME##_end - _binary_resources_fonts_##FORGE##_##NAME##_start, \ - _binary_resources_fonts_##FORGE##_##NAME##_start; \ + extern unsigned char _binary_##NAME[]; \ + extern unsigned int _binary_##NAME##_size; \ + return *size = _binary_##NAME##_size, _binary_##NAME; \ } while (0) #endif |