summaryrefslogtreecommitdiff
path: root/platform
diff options
context:
space:
mode:
authorTor Andersson <tor@ccxvii.net>2018-07-16 16:24:48 +0200
committerTor Andersson <tor.andersson@artifex.com>2018-08-10 14:09:46 +0200
commitd97b6bb79759db3a33f63792b235f1a161fa7a6b (patch)
tree2bf3f3656004cc8d832137631a2c27780e38b56d /platform
parent08e9dc67fd34f7dbcc5ce1ab877c3c42f9f75b05 (diff)
downloadmupdf-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 'platform')
-rw-r--r--platform/win32/bin2coff.rules8
1 files changed, 4 insertions, 4 deletions
diff --git a/platform/win32/bin2coff.rules b/platform/win32/bin2coff.rules
index 955c9726..55986ff0 100644
--- a/platform/win32/bin2coff.rules
+++ b/platform/win32/bin2coff.rules
@@ -7,7 +7,7 @@
<CustomBuildRule
Name="bin2coff (ttf)"
DisplayName="bin2coff (ttf)"
- CommandLine="Release\bin2coff.exe $(InputPath) $(IntDir)\$(InputName)_ttf.obj _binary_resources_fonts_$(InputName)_ttf $(PlatformName)"
+ CommandLine="Release\bin2coff.exe $(InputPath) $(IntDir)\$(InputName)_ttf.obj _binary_$(InputName)_ttf $(PlatformName)"
Outputs="$(IntDir)\$(InputName)_ttf.obj"
FileExtensions="*.ttf"
ExecutionDescription="Embedding TTF"
@@ -18,7 +18,7 @@
<CustomBuildRule
Name="bin2coff (otf)"
DisplayName="bin2coff (otf)"
- CommandLine="Release\bin2coff.exe $(InputPath) $(IntDir)\$(InputName)_otf.obj _binary_resources_fonts_$(InputName)_otf $(PlatformName)"
+ CommandLine="Release\bin2coff.exe $(InputPath) $(IntDir)\$(InputName)_otf.obj _binary_$(InputName)_otf $(PlatformName)"
Outputs="$(IntDir)\$(InputName)_otf.obj"
FileExtensions="*.otf"
ExecutionDescription="Embedding OTF"
@@ -29,7 +29,7 @@
<CustomBuildRule
Name="bin2coff (cff)"
DisplayName="bin2coff (cff)"
- CommandLine="Release\bin2coff.exe $(InputPath) $(IntDir)\$(InputName)_cff.obj _binary_resources_fonts_$(InputName)_cff $(PlatformName)"
+ CommandLine="Release\bin2coff.exe $(InputPath) $(IntDir)\$(InputName)_cff.obj _binary_$(InputName)_cff $(PlatformName)"
Outputs="$(IntDir)\$(InputName)_cff.obj"
FileExtensions="*.cff"
ExecutionDescription="Embedding CFF"
@@ -40,7 +40,7 @@
<CustomBuildRule
Name="bin2coff (ttc)"
DisplayName="bin2coff (ttc)"
- CommandLine="Release\bin2coff.exe $(InputPath) $(IntDir)\$(InputName)_ttc.obj _binary_resources_fonts_$(InputName)_ttc $(PlatformName)"
+ CommandLine="Release\bin2coff.exe $(InputPath) $(IntDir)\$(InputName)_ttc.obj _binary_$(InputName)_ttc $(PlatformName)"
Outputs="$(IntDir)\$(InputName)_ttc.obj"
FileExtensions="*.ttc"
ExecutionDescription="Embedding TTC"