diff options
| author | Robin Watts <Robin.Watts@artifex.com> | 2018-06-12 13:50:47 +0100 |
|---|---|---|
| committer | Robin Watts <Robin.Watts@artifex.com> | 2018-06-12 15:31:55 +0100 |
| commit | d79c0afbc850f4bb818096ac3fc7159a39ede4a8 (patch) | |
| tree | 32f83c110e6c123ef0209f07be8b2af5a19bb092 /platform | |
| parent | 52bd350ee5ebed94416968714618d9604299f143 (diff) | |
| download | mupdf-d79c0afbc850f4bb818096ac3fc7159a39ede4a8.tar.xz | |
Fix MSVC build issues.
When updating from VS2005 to VS2017, the .rules mechanism is
converted to a .props based scheme. This is not entirely
equivalent, and so causes problems with our "build both
32 and 64bit resources" scheme.
Instead, we amend the flag handling in bin2coff so that it
will accept "Win32" and "x64" as flags. These can then be driven
easily from the project files, giving us a "more standard"
way of working.
Also, remove some stray fonts that had crept into the resources
build.
Diffstat (limited to 'platform')
| -rw-r--r-- | platform/win32/bin2coff.rules | 8 | ||||
| -rw-r--r-- | platform/win32/libresources.vcproj | 16 |
2 files changed, 4 insertions, 20 deletions
diff --git a/platform/win32/bin2coff.rules b/platform/win32/bin2coff.rules index d2ae45a3..955c9726 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) Release\libresources\$(InputName)_ttf.obj _binary_resources_fonts_$(InputName)_ttf
Release\bin2coff.exe $(InputPath) x64\Release\libresources\$(InputName)_ttf.obj _binary_resources_fonts_$(InputName)_ttf 64bit

" + CommandLine="Release\bin2coff.exe $(InputPath) $(IntDir)\$(InputName)_ttf.obj _binary_resources_fonts_$(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) Release\libresources\$(InputName)_otf.obj _binary_resources_fonts_$(InputName)_otf
Release\bin2coff.exe $(InputPath) x64\Release\libresources\$(InputName)_otf.obj _binary_resources_fonts_$(InputName)_otf 64bit


" + CommandLine="Release\bin2coff.exe $(InputPath) $(IntDir)\$(InputName)_otf.obj _binary_resources_fonts_$(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) Release\libresources\$(InputName)_cff.obj _binary_resources_fonts_$(InputName)_cff
Release\bin2coff.exe $(InputPath) x64\Release\libresources\$(InputName)_cff.obj _binary_resources_fonts_$(InputName)_cff 64bit


" + CommandLine="Release\bin2coff.exe $(InputPath) $(IntDir)\$(InputName)_cff.obj _binary_resources_fonts_$(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) Release\libresources\$(InputName)_ttc.obj _binary_resources_fonts_$(InputName)_ttc
Release\bin2coff.exe $(InputPath) x64\Release\libresources\$(InputName)_ttc.obj _binary_resources_fonts_$(InputName)_ttc 64bit


" + CommandLine="Release\bin2coff.exe $(InputPath) $(IntDir)\$(InputName)_ttc.obj _binary_resources_fonts_$(InputName)_ttc $(PlatformName)" Outputs="$(IntDir)\$(InputName)_ttc.obj" FileExtensions="*.ttc" ExecutionDescription="Embedding TTC" diff --git a/platform/win32/libresources.vcproj b/platform/win32/libresources.vcproj index f28a51a7..30f2e36e 100644 --- a/platform/win32/libresources.vcproj +++ b/platform/win32/libresources.vcproj @@ -755,22 +755,6 @@ > </File> <File - RelativePath="..\..\resources\fonts\urw\NimbusSansNarrow-BdOblique.cff" - > - </File> - <File - RelativePath="..\..\resources\fonts\urw\NimbusSansNarrow-Bold.cff" - > - </File> - <File - RelativePath="..\..\resources\fonts\urw\NimbusSansNarrow-Oblique.cff" - > - </File> - <File - RelativePath="..\..\resources\fonts\urw\NimbusSansNarrow-Regular.cff" - > - </File> - <File RelativePath="..\..\resources\fonts\urw\StandardSymbolsPS.cff" > </File> |