diff options
author | Robin Watts <robin.watts@artifex.com> | 2012-02-07 20:39:36 +0000 |
---|---|---|
committer | Robin Watts <robin.watts@artifex.com> | 2012-02-07 20:39:36 +0000 |
commit | 3e4cd0765ca1080d2b23c83076cc248310b5b2a2 (patch) | |
tree | 59e7d7a113fda40aeced6a628d87548deafa2d51 /win32 | |
parent | af7f17d4b497a1cb9920112079e7170195cca5e3 (diff) | |
download | mupdf-3e4cd0765ca1080d2b23c83076cc248310b5b2a2.tar.xz |
Updated Visual Studio Project; generated tweaks.
Rather than having a custom build step that generates the font
and cmap "generated" files, have it as a separate project.
This enables us to nuke the generated directory as part of the
clean step, and to list the files in the solution explorer.
Diffstat (limited to 'win32')
-rw-r--r-- | win32/generated.vcproj | 822 | ||||
-rw-r--r-- | win32/libmupdf.vcproj | 4 | ||||
-rw-r--r-- | win32/mupdf.sln | 12 |
3 files changed, 836 insertions, 2 deletions
diff --git a/win32/generated.vcproj b/win32/generated.vcproj new file mode 100644 index 00000000..e5c06f0b --- /dev/null +++ b/win32/generated.vcproj @@ -0,0 +1,822 @@ +<?xml version="1.0" encoding="Windows-1252"?> +<VisualStudioProject + ProjectType="Visual C++" + Version="8.00" + Name="generated" + ProjectGUID="{A5053AA7-02E5-4903-B596-04F17AEB1526}" + Keyword="MakeFileProj" + > + <Platforms> + <Platform + Name="Win32" + /> + </Platforms> + <ToolFiles> + </ToolFiles> + <Configurations> + <Configuration + Name="Debug|Win32" + OutputDirectory="$(ConfigurationName)" + IntermediateDirectory="$(ConfigurationName)" + ConfigurationType="0" + > + <Tool + Name="VCNMakeTool" + BuildCommandLine="generate.bat" + ReBuildCommandLine="del /q ..\generated && generate.bat" + CleanCommandLine="del /q ..\generated" + Output="" + PreprocessorDefinitions="WIN32;_DEBUG" + IncludeSearchPath="" + ForcedIncludes="" + AssemblySearchPath="" + ForcedUsingAssemblies="" + CompileAsManaged="" + /> + </Configuration> + <Configuration + Name="Release|Win32" + OutputDirectory="$(ConfigurationName)" + IntermediateDirectory="$(ConfigurationName)" + ConfigurationType="0" + > + <Tool + Name="VCNMakeTool" + BuildCommandLine="generate.bat" + ReBuildCommandLine="del /q ..\generated && generate.bat" + CleanCommandLine="del /q ..\generated" + Output="generated\cmap_cns.h" + PreprocessorDefinitions="WIN32;NDEBUG" + IncludeSearchPath="" + ForcedIncludes="" + AssemblySearchPath="" + ForcedUsingAssemblies="" + CompileAsManaged="" + /> + </Configuration> + <Configuration + Name="Memento|Win32" + OutputDirectory="$(ConfigurationName)" + IntermediateDirectory="$(ConfigurationName)" + ConfigurationType="0" + > + <Tool + Name="VCNMakeTool" + BuildCommandLine="generate.bat" + ReBuildCommandLine="del /q ..\generated && generate.bat" + CleanCommandLine="del /q ..\generated" + Output="generated\cmap_cns.h" + PreprocessorDefinitions="WIN32;_DEBUG" + IncludeSearchPath="" + ForcedIncludes="" + AssemblySearchPath="" + ForcedUsingAssemblies="" + CompileAsManaged="" + /> + </Configuration> + </Configurations> + <References> + </References> + <Files> + <Filter + Name="Source Files" + Filter="cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx" + UniqueIdentifier="{4FC737F1-C7A5-4376-A066-2A32D752A2FF}" + > + <File + RelativePath="..\scripts\cmapdump.c" + > + </File> + <File + RelativePath="..\scripts\fontdump.c" + > + </File> + </Filter> + <Filter + Name="Header Files" + Filter="h;hpp;hxx;hm;inl;inc;xsd" + UniqueIdentifier="{93995380-89BD-4b04-88EB-625FBE52EBFB}" + > + <File + RelativePath="..\scripts\jconfig.h" + > + </File> + <File + RelativePath="..\scripts\opj_config.h" + > + </File> + <File + RelativePath="..\scripts\slimftmodules.h" + > + </File> + <File + RelativePath="..\scripts\slimftoptions.h" + > + </File> + </Filter> + <Filter + Name="CMAPs" + Filter="rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;tiff;tif;png;wav" + UniqueIdentifier="{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}" + > + <Filter + Name="cns" + > + <File + RelativePath="..\cmaps\cns\Adobe-CNS1-0" + > + </File> + <File + RelativePath="..\cmaps\cns\Adobe-CNS1-1" + > + </File> + <File + RelativePath="..\cmaps\cns\Adobe-CNS1-2" + > + </File> + <File + RelativePath="..\cmaps\cns\Adobe-CNS1-3" + > + </File> + <File + RelativePath="..\cmaps\cns\Adobe-CNS1-4" + > + </File> + <File + RelativePath="..\cmaps\cns\Adobe-CNS1-5" + > + </File> + <File + RelativePath="..\cmaps\cns\Adobe-CNS1-6" + > + </File> + <File + RelativePath="..\cmaps\cns\Adobe-CNS1-UCS2" + > + </File> + <File + RelativePath="..\cmaps\cns\B5-H" + > + </File> + <File + RelativePath="..\cmaps\cns\B5-V" + > + </File> + <File + RelativePath="..\cmaps\cns\B5pc-H" + > + </File> + <File + RelativePath="..\cmaps\cns\B5pc-V" + > + </File> + <File + RelativePath="..\cmaps\cns\CNS-EUC-H" + > + </File> + <File + RelativePath="..\cmaps\cns\CNS-EUC-V" + > + </File> + <File + RelativePath="..\cmaps\cns\CNS1-H" + > + </File> + <File + RelativePath="..\cmaps\cns\CNS1-V" + > + </File> + <File + RelativePath="..\cmaps\cns\CNS2-H" + > + </File> + <File + RelativePath="..\cmaps\cns\CNS2-V" + > + </File> + <File + RelativePath="..\cmaps\cns\ETen-B5-H" + > + </File> + <File + RelativePath="..\cmaps\cns\ETen-B5-V" + > + </File> + <File + RelativePath="..\cmaps\cns\ETenms-B5-H" + > + </File> + <File + RelativePath="..\cmaps\cns\ETenms-B5-V" + > + </File> + <File + RelativePath="..\cmaps\cns\ETHK-B5-H" + > + </File> + <File + RelativePath="..\cmaps\cns\ETHK-B5-V" + > + </File> + <File + RelativePath="..\cmaps\cns\HKdla-B5-H" + > + </File> + <File + RelativePath="..\cmaps\cns\HKdla-B5-V" + > + </File> + <File + RelativePath="..\cmaps\cns\HKdlb-B5-H" + > + </File> + <File + RelativePath="..\cmaps\cns\HKdlb-B5-V" + > + </File> + <File + RelativePath="..\cmaps\cns\HKgccs-B5-H" + > + </File> + <File + RelativePath="..\cmaps\cns\HKgccs-B5-V" + > + </File> + <File + RelativePath="..\cmaps\cns\HKm314-B5-H" + > + </File> + <File + RelativePath="..\cmaps\cns\HKm314-B5-V" + > + </File> + <File + RelativePath="..\cmaps\cns\HKm471-B5-H" + > + </File> + <File + RelativePath="..\cmaps\cns\HKm471-B5-V" + > + </File> + <File + RelativePath="..\cmaps\cns\HKscs-B5-H" + > + </File> + <File + RelativePath="..\cmaps\cns\HKscs-B5-V" + > + </File> + <File + RelativePath="..\cmaps\cns\UniCNS-UCS2-H" + > + </File> + <File + RelativePath="..\cmaps\cns\UniCNS-UCS2-V" + > + </File> + <File + RelativePath="..\cmaps\cns\UniCNS-UTF16-H" + > + </File> + <File + RelativePath="..\cmaps\cns\UniCNS-UTF16-V" + > + </File> + </Filter> + <Filter + Name="gb" + > + <File + RelativePath="..\cmaps\gb\Adobe-GB1-0" + > + </File> + <File + RelativePath="..\cmaps\gb\Adobe-GB1-1" + > + </File> + <File + RelativePath="..\cmaps\gb\Adobe-GB1-2" + > + </File> + <File + RelativePath="..\cmaps\gb\Adobe-GB1-3" + > + </File> + <File + RelativePath="..\cmaps\gb\Adobe-GB1-4" + > + </File> + <File + RelativePath="..\cmaps\gb\Adobe-GB1-5" + > + </File> + <File + RelativePath="..\cmaps\gb\Adobe-GB1-UCS2" + > + </File> + <File + RelativePath="..\cmaps\gb\GB-EUC-H" + > + </File> + <File + RelativePath="..\cmaps\gb\GB-EUC-V" + > + </File> + <File + RelativePath="..\cmaps\gb\GB-H" + > + </File> + <File + RelativePath="..\cmaps\gb\GB-V" + > + </File> + <File + RelativePath="..\cmaps\gb\GBK-EUC-H" + > + </File> + <File + RelativePath="..\cmaps\gb\GBK-EUC-V" + > + </File> + <File + RelativePath="..\cmaps\gb\GBK2K-H" + > + </File> + <File + RelativePath="..\cmaps\gb\GBK2K-V" + > + </File> + <File + RelativePath="..\cmaps\gb\GBKp-EUC-H" + > + </File> + <File + RelativePath="..\cmaps\gb\GBKp-EUC-V" + > + </File> + <File + RelativePath="..\cmaps\gb\GBpc-EUC-H" + > + </File> + <File + RelativePath="..\cmaps\gb\GBpc-EUC-V" + > + </File> + <File + RelativePath="..\cmaps\gb\GBT-EUC-H" + > + </File> + <File + RelativePath="..\cmaps\gb\GBT-EUC-V" + > + </File> + <File + RelativePath="..\cmaps\gb\GBT-H" + > + </File> + <File + RelativePath="..\cmaps\gb\GBT-V" + > + </File> + <File + RelativePath="..\cmaps\gb\GBTpc-EUC-H" + > + </File> + <File + RelativePath="..\cmaps\gb\GBTpc-EUC-V" + > + </File> + <File + RelativePath="..\cmaps\gb\UniGB-UCS2-H" + > + </File> + <File + RelativePath="..\cmaps\gb\UniGB-UCS2-V" + > + </File> + <File + RelativePath="..\cmaps\gb\UniGB-UTF16-H" + > + </File> + <File + RelativePath="..\cmaps\gb\UniGB-UTF16-V" + > + </File> + </Filter> + <Filter + Name="japan" + > + <File + RelativePath="..\cmaps\japan\78-EUC-H" + > + </File> + <File + RelativePath="..\cmaps\japan\78-EUC-V" + > + </File> + <File + RelativePath="..\cmaps\japan\78-H" + > + </File> + <File + RelativePath="..\cmaps\japan\78-RKSJ-H" + > + </File> + <File + RelativePath="..\cmaps\japan\78-RKSJ-V" + > + </File> + <File + RelativePath="..\cmaps\japan\78-V" + > + </File> + <File + RelativePath="..\cmaps\japan\78ms-RKSJ-H" + > + </File> + <File + RelativePath="..\cmaps\japan\78ms-RKSJ-V" + > + </File> + <File + RelativePath="..\cmaps\japan\83pv-RKSJ-H" + > + </File> + <File + RelativePath="..\cmaps\japan\90ms-RKSJ-H" + > + </File> + <File + RelativePath="..\cmaps\japan\90ms-RKSJ-V" + > + </File> + <File + RelativePath="..\cmaps\japan\90msp-RKSJ-H" + > + </File> + <File + RelativePath="..\cmaps\japan\90msp-RKSJ-V" + > + </File> + <File + RelativePath="..\cmaps\japan\90pv-RKSJ-H" + > + </File> + <File + RelativePath="..\cmaps\japan\90pv-RKSJ-V" + > + </File> + <File + RelativePath="..\cmaps\japan\Add-H" + > + </File> + <File + RelativePath="..\cmaps\japan\Add-RKSJ-H" + > + </File> + <File + RelativePath="..\cmaps\japan\Add-RKSJ-V" + > + </File> + <File + RelativePath="..\cmaps\japan\Add-V" + > + </File> + <File + RelativePath="..\cmaps\japan\Adobe-Japan1-0" + > + </File> + <File + RelativePath="..\cmaps\japan\Adobe-Japan1-1" + > + </File> + <File + RelativePath="..\cmaps\japan\Adobe-Japan1-2" + > + </File> + <File + RelativePath="..\cmaps\japan\Adobe-Japan1-3" + > + </File> + <File + RelativePath="..\cmaps\japan\Adobe-Japan1-4" + > + </File> + <File + RelativePath="..\cmaps\japan\Adobe-Japan1-5" + > + </File> + <File + RelativePath="..\cmaps\japan\Adobe-Japan1-6" + > + </File> + <File + RelativePath="..\cmaps\japan\Adobe-Japan1-UCS2" + > + </File> + <File + RelativePath="..\cmaps\japan\Adobe-Japan2-0" + > + </File> + <File + RelativePath="..\cmaps\japan\EUC-H" + > + </File> + <File + RelativePath="..\cmaps\japan\EUC-V" + > + </File> + <File + RelativePath="..\cmaps\japan\Ext-H" + > + </File> + <File + RelativePath="..\cmaps\japan\Ext-RKSJ-H" + > + </File> + <File + RelativePath="..\cmaps\japan\Ext-RKSJ-V" + > + </File> + <File + RelativePath="..\cmaps\japan\Ext-V" + > + </File> + <File + RelativePath="..\cmaps\japan\H" + > + </File> + <File + RelativePath="..\cmaps\japan\Hankaku" + > + </File> + <File + RelativePath="..\cmaps\japan\Hiragana" + > + </File> + <File + RelativePath="..\cmaps\japan\Hojo-EUC-H" + > + </File> + <File + RelativePath="..\cmaps\japan\Hojo-EUC-V" + > + </File> + <File + RelativePath="..\cmaps\japan\Hojo-H" + > + </File> + <File + RelativePath="..\cmaps\japan\Hojo-V" + > + </File> + <File + RelativePath="..\cmaps\japan\Katakana" + > + </File> + <File + RelativePath="..\cmaps\japan\NWP-H" + > + </File> + <File + RelativePath="..\cmaps\japan\NWP-V" + > + </File> + <File + RelativePath="..\cmaps\japan\RKSJ-H" + > + </File> + <File + RelativePath="..\cmaps\japan\RKSJ-V" + > + </File> + <File + RelativePath="..\cmaps\japan\Roman" + > + </File> + <File + RelativePath="..\cmaps\japan\UniHojo-UCS2-H" + > + </File> + <File + RelativePath="..\cmaps\japan\UniHojo-UCS2-V" + > + </File> + <File + RelativePath="..\cmaps\japan\UniHojo-UTF16-H" + > + </File> + <File + RelativePath="..\cmaps\japan\UniHojo-UTF16-V" + > + </File> + <File + RelativePath="..\cmaps\japan\UniJIS-UCS2-H" + > + </File> + <File + RelativePath="..\cmaps\japan\UniJIS-UCS2-HW-H" + > + </File> + <File + RelativePath="..\cmaps\japan\UniJIS-UCS2-HW-V" + > + </File> + <File + RelativePath="..\cmaps\japan\UniJIS-UCS2-V" + > + </File> + <File + RelativePath="..\cmaps\japan\UniJIS-UTF16-H" + > + </File> + <File + RelativePath="..\cmaps\japan\UniJIS-UTF16-V" + > + </File> + <File + RelativePath="..\cmaps\japan\UniJISPro-UCS2-HW-V" + > + </File> + <File + RelativePath="..\cmaps\japan\UniJISPro-UCS2-V" + > + </File> + <File + RelativePath="..\cmaps\japan\V" + > + </File> + <File + RelativePath="..\cmaps\japan\WP-Symbol" + > + </File> + </Filter> + <Filter + Name="korea" + > + <File + RelativePath="..\cmaps\korea\Adobe-Korea1-0" + > + </File> + <File + RelativePath="..\cmaps\korea\Adobe-Korea1-1" + > + </File> + <File + RelativePath="..\cmaps\korea\Adobe-Korea1-2" + > + </File> + <File + RelativePath="..\cmaps\korea\Adobe-Korea1-UCS2" + > + </File> + <File + RelativePath="..\cmaps\korea\KSC-EUC-H" + > + </File> + <File + RelativePath="..\cmaps\korea\KSC-EUC-V" + > + </File> + <File + RelativePath="..\cmaps\korea\KSC-H" + > + </File> + <File + RelativePath="..\cmaps\korea\KSC-Johab-H" + > + </File> + <File + RelativePath="..\cmaps\korea\KSC-Johab-V" + > + </File> + <File + RelativePath="..\cmaps\korea\KSC-V" + > + </File> + <File + RelativePath="..\cmaps\korea\KSCms-UHC-H" + > + </File> + <File + RelativePath="..\cmaps\korea\KSCms-UHC-HW-H" + > + </File> + <File + RelativePath="..\cmaps\korea\KSCms-UHC-HW-V" + > + </File> + <File + RelativePath="..\cmaps\korea\KSCms-UHC-V" + > + </File> + <File + RelativePath="..\cmaps\korea\KSCpc-EUC-H" + > + </File> + <File + RelativePath="..\cmaps\korea\KSCpc-EUC-V" + > + </File> + <File + RelativePath="..\cmaps\korea\UniKS-UCS2-H" + > + </File> + <File + RelativePath="..\cmaps\korea\UniKS-UCS2-V" + > + </File> + <File + RelativePath="..\cmaps\korea\UniKS-UTF16-H" + > + </File> + <File + RelativePath="..\cmaps\korea\UniKS-UTF16-V" + > + </File> + </Filter> + </Filter> + <Filter + Name="Fonts" + > + <File + RelativePath="..\fonts\Dingbats.cff" + > + </File> + <File + RelativePath="..\fonts\NimbusMonL-Bold.cff" + > + </File> + <File + RelativePath="..\fonts\NimbusMonL-BoldObli.cff" + > + </File> + <File + RelativePath="..\fonts\NimbusMonL-Regu.cff" + > + </File> + <File + RelativePath="..\fonts\NimbusMonL-ReguObli.cff" + > + </File> + <File + RelativePath="..\fonts\NimbusRomNo9L-Medi.cff" + > + </File> + <File + RelativePath="..\fonts\NimbusRomNo9L-MediItal.cff" + > + </File> + <File + RelativePath="..\fonts\NimbusRomNo9L-Regu.cff" + > + </File> + <File + RelativePath="..\fonts\NimbusRomNo9L-ReguItal.cff" + > + </File> + <File + RelativePath="..\fonts\NimbusSanL-Bold.cff" + > + </File> + <File + RelativePath="..\fonts\NimbusSanL-BoldItal.cff" + > + </File> + <File + RelativePath="..\fonts\NimbusSanL-Regu.cff" + > + </File> + <File + RelativePath="..\fonts\NimbusSanL-ReguItal.cff" + > + </File> + <File + RelativePath="..\fonts\StandardSymL.cff" + > + </File> + <Filter + Name="droid" + > + <File + RelativePath="..\fonts\droid\DroidSans.ttf" + > + </File> + <File + RelativePath="..\fonts\droid\DroidSansFallback.ttf" + > + </File> + <File + RelativePath="..\fonts\droid\DroidSansMono.ttf" + > + </File> + <File + RelativePath="..\fonts\droid\NOTICE" + > + </File> + </Filter> + </Filter> + </Files> + <Globals> + </Globals> +</VisualStudioProject> diff --git a/win32/libmupdf.vcproj b/win32/libmupdf.vcproj index 67b91df2..8bce42dd 100644 --- a/win32/libmupdf.vcproj +++ b/win32/libmupdf.vcproj @@ -149,8 +149,8 @@ > <Tool Name="VCPreBuildEventTool" - Description="Generate CMap and Font source files" - CommandLine="generate.bat" + Description="" + CommandLine="" /> <Tool Name="VCCustomBuildTool" diff --git a/win32/mupdf.sln b/win32/mupdf.sln index a954c867..6a0481f8 100644 --- a/win32/mupdf.sln +++ b/win32/mupdf.sln @@ -10,9 +10,13 @@ EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libthirdparty", "libthirdparty.vcproj", "{5EDCF4FD-0291-4FB9-8D96-D58957CA5E3C}" EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libmupdf", "libmupdf.vcproj", "{5F615F91-DFF8-4F05-BF48-6222B7D86519}" + ProjectSection(ProjectDependencies) = postProject + {A5053AA7-02E5-4903-B596-04F17AEB1526} = {A5053AA7-02E5-4903-B596-04F17AEB1526} + EndProjectSection EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "mupdfdraw", "mupdfdraw.vcproj", "{26C5D7C3-BEE9-4886-9CDB-846D26F5BCDB}" ProjectSection(ProjectDependencies) = postProject + {A5053AA7-02E5-4903-B596-04F17AEB1526} = {A5053AA7-02E5-4903-B596-04F17AEB1526} {5F615F91-DFF8-4F05-BF48-6222B7D86519} = {5F615F91-DFF8-4F05-BF48-6222B7D86519} {5EDCF4FD-0291-4FB9-8D96-D58957CA5E3C} = {5EDCF4FD-0291-4FB9-8D96-D58957CA5E3C} EndProjectSection @@ -53,6 +57,8 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "mubusy", "mubusy.vcproj", " {5EDCF4FD-0291-4FB9-8D96-D58957CA5E3C} = {5EDCF4FD-0291-4FB9-8D96-D58957CA5E3C} EndProjectSection EndProject +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "generated", "generated.vcproj", "{A5053AA7-02E5-4903-B596-04F17AEB1526}" +EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution Debug|Win32 = Debug|Win32 @@ -120,6 +126,12 @@ Global {00811970-815B-4F64-BC9D-219078B1F3AA}.Memento|Win32.Build.0 = Memento|Win32 {00811970-815B-4F64-BC9D-219078B1F3AA}.Release|Win32.ActiveCfg = Release|Win32 {00811970-815B-4F64-BC9D-219078B1F3AA}.Release|Win32.Build.0 = Release|Win32 + {A5053AA7-02E5-4903-B596-04F17AEB1526}.Debug|Win32.ActiveCfg = Debug|Win32 + {A5053AA7-02E5-4903-B596-04F17AEB1526}.Debug|Win32.Build.0 = Debug|Win32 + {A5053AA7-02E5-4903-B596-04F17AEB1526}.Memento|Win32.ActiveCfg = Memento|Win32 + {A5053AA7-02E5-4903-B596-04F17AEB1526}.Memento|Win32.Build.0 = Memento|Win32 + {A5053AA7-02E5-4903-B596-04F17AEB1526}.Release|Win32.ActiveCfg = Release|Win32 + {A5053AA7-02E5-4903-B596-04F17AEB1526}.Release|Win32.Build.0 = Release|Win32 EndGlobalSection GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE |