diff options
| author |   Thomas Deutschmann <whissi@gentoo.org> | 2021-03-30 10:59:39 +0200 |
|---|---|---|
| committer | Thomas Deutschmann <whissi@gentoo.org> | 2021-04-01 00:04:14 +0200 |
| commit | 5ff1d6955496b3cf9a35042c9ac35db43bc336b1 (patch) | |
| tree | 6d470f7eb448f59f53e8df1010aec9dad8ce1f72 /windows | |
| parent | Import Ghostscript 9.53.1 (diff) | |
| download | ghostscript-gpl-patches-5ff1d6955496b3cf9a35042c9ac35db43bc336b1.tar.gz ghostscript-gpl-patches-5ff1d6955496b3cf9a35042c9ac35db43bc336b1.tar.bz2 ghostscript-gpl-patches-5ff1d6955496b3cf9a35042c9ac35db43bc336b1.zip | |
Import Ghostscript 9.54ghostscript-9.54
Signed-off-by: Thomas Deutschmann <whissi@gentoo.org>
Diffstat (limited to 'windows')
| -rw-r--r-- | windows/All.vcxproj | 44 | ||||
| -rw-r--r-- | windows/GhostPDL.sln | 14 | ||||
| -rw-r--r-- | windows/ghostpcl-ufst.vcproj | 130 | ||||
| -rw-r--r-- | windows/ghostpcl.vcxproj | 46 | ||||
| -rw-r--r-- | windows/ghostpcl.vcxproj.filters | 6 | ||||
| -rw-r--r-- | windows/ghostpdl.vcxproj | 44 | ||||
| -rw-r--r-- | windows/ghostscript.vcproj | 28 | ||||
| -rw-r--r-- | windows/ghostscript.vcxproj | 70 | ||||
| -rw-r--r-- | windows/ghostscript.vcxproj.filters | 26 | ||||
| -rw-r--r-- | windows/ghostscript_rt.vcxproj | 7 | ||||
| -rw-r--r-- | windows/ghostxps.vcxproj | 44 |
11 files changed, 403 insertions, 56 deletions
diff --git a/windows/All.vcxproj b/windows/All.vcxproj index 0d5bf13d..0e84b3eb 100644 --- a/windows/All.vcxproj +++ b/windows/All.vcxproj @@ -1,4 +1,4 @@ -<?xml version="1.0" encoding="utf-8"?> +<?xml version="1.0" encoding="utf-8"?> <Project DefaultTargets="Build" ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> <ItemGroup Label="ProjectConfigurations"> <ProjectConfiguration Include="Debug-contrib|Win32"> @@ -81,6 +81,14 @@ <Configuration>Release</Configuration> <Platform>x64</Platform> </ProjectConfiguration> + <ProjectConfiguration Include="Sanitize|Win32"> + <Configuration>Sanitize</Configuration> + <Platform>Win32</Platform> + </ProjectConfiguration> + <ProjectConfiguration Include="Sanitize|x64"> + <Configuration>Sanitize</Configuration> + <Platform>x64</Platform> + </ProjectConfiguration> </ItemGroup> <PropertyGroup Label="Globals"> <ProjectGuid>{98351FEF-0032-457C-B9D9-D6B68A829386}</ProjectGuid> @@ -124,6 +132,10 @@ <ConfigurationType>Makefile</ConfigurationType> <PlatformToolset>v142</PlatformToolset> </PropertyGroup> + <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Sanitize|Win32'" Label="Configuration"> + <ConfigurationType>Makefile</ConfigurationType> + <PlatformToolset>v142</PlatformToolset> + </PropertyGroup> <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='DebugXP|Win32'" Label="Configuration"> <ConfigurationType>Makefile</ConfigurationType> <PlatformToolset>v141_xp</PlatformToolset> @@ -164,6 +176,10 @@ <ConfigurationType>Makefile</ConfigurationType> <PlatformToolset>v142</PlatformToolset> </PropertyGroup> + <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Sanitize|x64'" Label="Configuration"> + <ConfigurationType>Makefile</ConfigurationType> + <PlatformToolset>v142</PlatformToolset> + </PropertyGroup> <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='DebugXP|x64'" Label="Configuration"> <ConfigurationType>Makefile</ConfigurationType> <PlatformToolset>v141_xp</PlatformToolset> @@ -198,6 +214,9 @@ <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="PropertySheets"> <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" /> </ImportGroup> + <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Sanitize|Win32'" Label="PropertySheets"> + <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" /> + </ImportGroup> <ImportGroup Condition="'$(Configuration)|$(Platform)'=='DebugXP|Win32'" Label="PropertySheets"> <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" /> </ImportGroup> @@ -228,6 +247,9 @@ <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="PropertySheets"> <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" /> </ImportGroup> + <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Sanitize|x64'" Label="PropertySheets"> + <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" /> + </ImportGroup> <ImportGroup Condition="'$(Configuration)|$(Platform)'=='DebugXP|x64'" Label="PropertySheets"> <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" /> </ImportGroup> @@ -244,6 +266,15 @@ <NMakeOutput>$(ProjectDir)\..\debugbin\gswin32c.exe</NMakeOutput> <NMakePreprocessorDefinitions>WIN32;_DEBUG;DEBUG=1;TDEBUG=1;HAVE_SSE2=1;$(NMakePreprocessorDefinitions)</NMakePreprocessorDefinitions> </PropertyGroup> + <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Sanitize|Win32'"> + <OutDir>debugobj\</OutDir> + <IntDir>debugobj\</IntDir> + <NMakeBuildCommandLine>cd .. && nmake -f psi\msvc32.mak SBR=1 DEVSTUDIO= sanitize && nmake -f psi\msvc32.mak DEVSTUDIO= sanitizebsc</NMakeBuildCommandLine> + <NMakeReBuildCommandLine>cd .. && nmake -f psi\msvc32.mak DEVSTUDIO= sanitizeclean && nmake -f psi\msvc32.mak SBR=1 DEVSTUDIO= sanitize && nmake -f psi\msvc32.mak DEVSTUDIO= sanitizebsc</NMakeReBuildCommandLine> + <NMakeCleanCommandLine>cd .. && nmake -f psi\msvc32.mak DEVSTUDIO= sanitizeclean</NMakeCleanCommandLine> + <NMakeOutput>$(ProjectDir)\..\sanbin\gswin32c.exe</NMakeOutput> + <NMakePreprocessorDefinitions>WIN32;_DEBUG;DEBUG=1;TDEBUG=1;HAVE_SSE2=1;$(NMakePreprocessorDefinitions)</NMakePreprocessorDefinitions> + </PropertyGroup> <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='DebugXP|Win32'"> <OutDir>debugobjxp\</OutDir> <IntDir>debugobjxp\</IntDir> @@ -262,6 +293,15 @@ <NMakeOutput>$(ProjectDir)\..\debugbin\gswin64c.exe</NMakeOutput> <NMakePreprocessorDefinitions>WIN64;_DEBUG;DEBUG=1;TDEBUG=1;$(NMakePreprocessorDefinitions)</NMakePreprocessorDefinitions> </PropertyGroup> + <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Sanitize|x64'"> + <OutDir>debugobj64\</OutDir> + <IntDir>debugobj64\</IntDir> + <NMakeBuildCommandLine>cd .. && nmake -f psi\msvc32.mak WIN64= SBR=1 DEVSTUDIO= sanitize && nmake -f psi\msvc32.mak WIN64= DEVSTUDIO= sanitizebsc</NMakeBuildCommandLine> + <NMakeReBuildCommandLine>cd .. && nmake -f psi\msvc32.mak WIN64= DEVSTUDIO= sanitizeclean && nmake -f psi\msvc32.mak WIN64= SBR=1 DEVSTUDIO= sanitize && nmake -f psi\msvc32.mak WIN64= DEVSTUDIO= sanitizebsc</NMakeReBuildCommandLine> + <NMakeCleanCommandLine>cd .. && nmake -f psi\msvc32.mak WIN64= DEVSTUDIO= sanitizeclean</NMakeCleanCommandLine> + <NMakeOutput>$(ProjectDir)\..\sanbin\gswin64c.exe</NMakeOutput> + <NMakePreprocessorDefinitions>WIN64;_DEBUG;DEBUG=1;TDEBUG=1;$(NMakePreprocessorDefinitions)</NMakePreprocessorDefinitions> + </PropertyGroup> <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='DebugXP|x64'"> <OutDir>debugobj64xp\</OutDir> <IntDir>debugobj64xp\</IntDir> @@ -422,4 +462,4 @@ <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" /> <ImportGroup Label="ExtensionTargets"> </ImportGroup> -</Project> +</Project>
\ No newline at end of file diff --git a/windows/GhostPDL.sln b/windows/GhostPDL.sln index 748c7983..4137febe 100644 --- a/windows/GhostPDL.sln +++ b/windows/GhostPDL.sln @@ -35,6 +35,8 @@ Global Release-contrib|x64 = Release-contrib|x64 ReleaseXP|Win32 = ReleaseXP|Win32 ReleaseXP|x64 = ReleaseXP|x64 + Sanitize|Win32 = Sanitize|Win32 + Sanitize|x64 = Sanitize|x64 EndGlobalSection GlobalSection(ProjectConfigurationPlatforms) = postSolution {1EDA2AC3-D74F-4F4D-B4D6-AC05CC594A2F}.Debug|Win32.ActiveCfg = Debug|Win32 @@ -57,6 +59,8 @@ Global {1EDA2AC3-D74F-4F4D-B4D6-AC05CC594A2F}.Release-contrib|x64.ActiveCfg = Release-contrib|x64 {1EDA2AC3-D74F-4F4D-B4D6-AC05CC594A2F}.ReleaseXP|Win32.ActiveCfg = ReleaseXP|Win32 {1EDA2AC3-D74F-4F4D-B4D6-AC05CC594A2F}.ReleaseXP|x64.ActiveCfg = ReleaseXP|x64 + {1EDA2AC3-D74F-4F4D-B4D6-AC05CC594A2F}.Sanitize|Win32.ActiveCfg = Sanitize|Win32 + {1EDA2AC3-D74F-4F4D-B4D6-AC05CC594A2F}.Sanitize|x64.ActiveCfg = Sanitize|x64 {ED35CF95-DAA1-45B3-9206-599F4170F198}.Debug|Win32.ActiveCfg = Debug|Win32 {ED35CF95-DAA1-45B3-9206-599F4170F198}.Debug|x64.ActiveCfg = Debug|x64 {ED35CF95-DAA1-45B3-9206-599F4170F198}.Debug-contrib|Win32.ActiveCfg = Debug-contrib|Win32 @@ -77,6 +81,8 @@ Global {ED35CF95-DAA1-45B3-9206-599F4170F198}.Release-contrib|x64.ActiveCfg = Release-contrib|x64 {ED35CF95-DAA1-45B3-9206-599F4170F198}.ReleaseXP|Win32.ActiveCfg = ReleaseXP|Win32 {ED35CF95-DAA1-45B3-9206-599F4170F198}.ReleaseXP|x64.ActiveCfg = ReleaseXP|x64 + {ED35CF95-DAA1-45B3-9206-599F4170F198}.Sanitize|Win32.ActiveCfg = Sanitize|Win32 + {ED35CF95-DAA1-45B3-9206-599F4170F198}.Sanitize|x64.ActiveCfg = Sanitize|x64 {DE21942C-CDA2-445B-B2EC-51FF54E0F0DD}.Debug|Win32.ActiveCfg = Debug|Win32 {DE21942C-CDA2-445B-B2EC-51FF54E0F0DD}.Debug|x64.ActiveCfg = Debug|x64 {DE21942C-CDA2-445B-B2EC-51FF54E0F0DD}.Debug-contrib|Win32.ActiveCfg = Debug-contrib|Win32 @@ -97,6 +103,8 @@ Global {DE21942C-CDA2-445B-B2EC-51FF54E0F0DD}.Release-contrib|x64.ActiveCfg = Release-contrib|x64 {DE21942C-CDA2-445B-B2EC-51FF54E0F0DD}.ReleaseXP|Win32.ActiveCfg = ReleaseXP|Win32 {DE21942C-CDA2-445B-B2EC-51FF54E0F0DD}.ReleaseXP|x64.ActiveCfg = ReleaseXP|x64 + {DE21942C-CDA2-445B-B2EC-51FF54E0F0DD}.Sanitize|Win32.ActiveCfg = Sanitize|Win32 + {DE21942C-CDA2-445B-B2EC-51FF54E0F0DD}.Sanitize|x64.ActiveCfg = Sanitize|x64 {C4038125-61B9-4147-9EA8-39690BA3A599}.Debug|Win32.ActiveCfg = Debug|Win32 {C4038125-61B9-4147-9EA8-39690BA3A599}.Debug|x64.ActiveCfg = Debug|x64 {C4038125-61B9-4147-9EA8-39690BA3A599}.Debug-contrib|Win32.ActiveCfg = Debug-contrib|Win32 @@ -117,6 +125,8 @@ Global {C4038125-61B9-4147-9EA8-39690BA3A599}.Release-contrib|x64.ActiveCfg = Release-contrib|x64 {C4038125-61B9-4147-9EA8-39690BA3A599}.ReleaseXP|Win32.ActiveCfg = ReleaseXP|Win32 {C4038125-61B9-4147-9EA8-39690BA3A599}.ReleaseXP|x64.ActiveCfg = ReleaseXP|x64 + {C4038125-61B9-4147-9EA8-39690BA3A599}.Sanitize|Win32.ActiveCfg = Sanitize|Win32 + {C4038125-61B9-4147-9EA8-39690BA3A599}.Sanitize|x64.ActiveCfg = Sanitize|x64 {98351FEF-0032-457C-B9D9-D6B68A829386}.Debug|Win32.ActiveCfg = Debug|Win32 {98351FEF-0032-457C-B9D9-D6B68A829386}.Debug|Win32.Build.0 = Debug|Win32 {98351FEF-0032-457C-B9D9-D6B68A829386}.Debug|x64.ActiveCfg = Debug|x64 @@ -156,6 +166,10 @@ Global {98351FEF-0032-457C-B9D9-D6B68A829386}.ReleaseXP|Win32.Build.0 = ReleaseXP|Win32 {98351FEF-0032-457C-B9D9-D6B68A829386}.ReleaseXP|x64.ActiveCfg = ReleaseXP|x64 {98351FEF-0032-457C-B9D9-D6B68A829386}.ReleaseXP|x64.Build.0 = ReleaseXP|x64 + {98351FEF-0032-457C-B9D9-D6B68A829386}.Sanitize|Win32.ActiveCfg = Sanitize|Win32 + {98351FEF-0032-457C-B9D9-D6B68A829386}.Sanitize|Win32.Build.0 = Sanitize|Win32 + {98351FEF-0032-457C-B9D9-D6B68A829386}.Sanitize|x64.ActiveCfg = Sanitize|x64 + {98351FEF-0032-457C-B9D9-D6B68A829386}.Sanitize|x64.Build.0 = Sanitize|x64 EndGlobalSection GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE diff --git a/windows/ghostpcl-ufst.vcproj b/windows/ghostpcl-ufst.vcproj new file mode 100644 index 00000000..bb7093e3 --- /dev/null +++ b/windows/ghostpcl-ufst.vcproj @@ -0,0 +1,130 @@ +<?xml version="1.0" encoding="Windows-1252"?> +<VisualStudioProject + ProjectType="Visual C++" + Version="8.00" + Name="ghostpcl-ufst" + ProjectGUID="{A93401D2-5D65-4BA5-BD0F-419310537401}" + RootNamespace="ghostpcl-ufst" + Keyword="MakeFileProj" + > + <Platforms> + <Platform + Name="Win32" + /> + <Platform + Name="x64" + /> + </Platforms> + <ToolFiles> + </ToolFiles> + <Configurations> + <Configuration + Name="Debug|Win32" + OutputDirectory="ufstdebugobj" + IntermediateDirectory="ufstdebugobj" + ConfigurationType="0" + > + <Tool + Name="VCNMakeTool" + BuildCommandLine="cd .. && nmake -f psi\msvc32.mak UFST_ROOT=.\ufst SBR=1 DEVSTUDIO= gpcl6-ufst-debug && nmake -f psi\msvc32.mak UFST_ROOT=.\ufst DEVSTUDIO= ufst-debugbsc" + ReBuildCommandLine="cd .. && nmake -f psi\msvc32.mak UFST_ROOT=.\ufst DEVSTUDIO= ufst-debugclean && nmake -f psi\msvc32.mak UFST_ROOT=.\ufst SBR=1 DEVSTUDIO= ufst-debug && nmake -f psi\msvc32.mak UFST_ROOT=.\ufst DEVSTUDIO= ufst-debugbsc" + CleanCommandLine="cd .. && nmake -f psi\msvc32.mak UFST_ROOT=.\ufst DEVSTUDIO= ufst-debugclean" + Output="$(ProjectDir)\..\ufstdebugbin\gswin32c.exe" + PreprocessorDefinitions="WIN32;_DEBUG" + IncludeSearchPath="" + ForcedIncludes="" + AssemblySearchPath="" + ForcedUsingAssemblies="" + CompileAsManaged="" + /> + </Configuration> + <Configuration + Name="Debug|x64" + OutputDirectory="$(PlatformName)\$(ConfigurationName)" + IntermediateDirectory="$(PlatformName)\$(ConfigurationName)" + ConfigurationType="0" + > + <Tool + Name="VCNMakeTool" + BuildCommandLine="cd .. && nmake -f psi\msvc32.mak WIN64= UFST_ROOT=.\ufst SBR=1 DEVSTUDIO= gpcl6-ufst-debug && nmake -f psi\msvc32.mak WIN64= UFST_ROOT=.\ufst DEVSTUDIO= ufst-debugbsc" + ReBuildCommandLine="cd .. && nmake -f psi\msvc32.mak WIN64= UFST_ROOT=.\ufst DEVSTUDIO= ufst-debugclean && nmake -f psi\msvc32.mak WIN64= UFST_ROOT=.\ufst SBR=1 DEVSTUDIO= ufst-debug && nmake -f psi\msvc32.mak WIN64= UFST_ROOT=.\ufst DEVSTUDIO= ufst-debugbsc" + CleanCommandLine="cd .. && nmake -f psi\msvc32.mak WIN64= UFST_ROOT=.\ufst DEVSTUDIO= ufst-debugclean" + Output="$(ProjectDir)\..\ufstdebugbin\gswin64c.exe" + PreprocessorDefinitions="WIN32;_DEBUG" + IncludeSearchPath="" + ForcedIncludes="" + AssemblySearchPath="" + ForcedUsingAssemblies="" + CompileAsManaged="" + /> + </Configuration> + <Configuration + Name="Release|Win32" + OutputDirectory="ufstobj" + IntermediateDirectory="ufstobj" + ConfigurationType="0" + > + <Tool + Name="VCNMakeTool" + BuildCommandLine="cd .. && nmake -f psi\msvc32.mak UFST_ROOT=.\ufst SBR=1 DEVSTUDIO= gpcl6-ufst && nmake -f psi\msvc32.mak UFST_ROOT=.\ufst DEVSTUDIO= ufst-bsc" + ReBuildCommandLine="cd .. && nmake -f psi\msvc32.mak UFST_ROOT=.\ufst DEVSTUDIO= ufst-clean && nmake -f psi\msvc32.mak UFST_ROOT=.\ufst SBR=1 DEVSTUDIO= ufst && nmake -f psi\msvc32.mak UFST_ROOT=.\ufst DEVSTUDIO= ufst-bsc" + CleanCommandLine="cd .. && nmake -f psi\msvc32.mak UFST_ROOT=.\ufst DEVSTUDIO= ufst-clean" + Output="$(ProjectDir)\..\ufstbin\gswin32c.exe" + PreprocessorDefinitions="WIN32;NDEBUG" + IncludeSearchPath="" + ForcedIncludes="" + AssemblySearchPath="" + ForcedUsingAssemblies="" + CompileAsManaged="" + /> + </Configuration> + <Configuration + Name="Release|x64" + OutputDirectory="$(PlatformName)\$(ConfigurationName)" + IntermediateDirectory="$(PlatformName)\$(ConfigurationName)" + ConfigurationType="0" + > + <Tool + Name="VCNMakeTool" + BuildCommandLine="cd .. && nmake -f psi\msvc32.mak WIN64= UFST_ROOT=.\ufst SBR=1 DEVSTUDIO= gpcl6-ufst && nmake -f psi\msvc32.mak WIN64= UFST_ROOT=.\ufst DEVSTUDIO= ufst-bsc" + ReBuildCommandLine="cd .. && nmake -f psi\msvc32.mak WIN64= UFST_ROOT=.\ufst DEVSTUDIO= ufst-clean && nmake -f psi\msvc32.mak WIN64= UFST_ROOT=.\ufst SBR=1 DEVSTUDIO= ufst && nmake -f psi\msvc32.mak WIN64= UFST_ROOT=.\ufst DEVSTUDIO= ufst-bsc" + CleanCommandLine="cd .. && nmake -f psi\msvc32.mak WIN64= UFST_ROOT=.\ufst DEVSTUDIO= ufst-clean" + Output="$(ProjectDir)\..\ufstbin\gswin64c.exe" + PreprocessorDefinitions="WIN32;NDEBUG" + 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}" + > + </Filter> + <Filter + Name="Header Files" + Filter="h;hpp;hxx;hm;inl;inc;xsd" + UniqueIdentifier="{93995380-89BD-4b04-88EB-625FBE52EBFB}" + > + </Filter> + <Filter + Name="Resource Files" + 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> + <File + RelativePath=".\readme.txt" + > + </File> + </Files> + <Globals> + </Globals> +</VisualStudioProject> diff --git a/windows/ghostpcl.vcxproj b/windows/ghostpcl.vcxproj index e7cce71f..9f0ceb6e 100644 --- a/windows/ghostpcl.vcxproj +++ b/windows/ghostpcl.vcxproj @@ -1,4 +1,4 @@ -<?xml version="1.0" encoding="utf-8"?> +<?xml version="1.0" encoding="utf-8"?> <Project DefaultTargets="Build" ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> <ItemGroup Label="ProjectConfigurations"> <ProjectConfiguration Include="Debug-contrib|Win32"> @@ -81,6 +81,14 @@ <Configuration>Release</Configuration> <Platform>x64</Platform> </ProjectConfiguration> + <ProjectConfiguration Include="Sanitize|Win32"> + <Configuration>Sanitize</Configuration> + <Platform>Win32</Platform> + </ProjectConfiguration> + <ProjectConfiguration Include="Sanitize|x64"> + <Configuration>Sanitize</Configuration> + <Platform>x64</Platform> + </ProjectConfiguration> </ItemGroup> <PropertyGroup Label="Globals"> <ProjectGuid>{ED35CF95-DAA1-45B3-9206-599F4170F198}</ProjectGuid> @@ -124,6 +132,10 @@ <ConfigurationType>Makefile</ConfigurationType> <PlatformToolset>v142</PlatformToolset> </PropertyGroup> + <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Sanitize|Win32'" Label="Configuration"> + <ConfigurationType>Makefile</ConfigurationType> + <PlatformToolset>v142</PlatformToolset> + </PropertyGroup> <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='DebugXP|Win32'" Label="Configuration"> <ConfigurationType>Makefile</ConfigurationType> <PlatformToolset>v141_xp</PlatformToolset> @@ -164,6 +176,10 @@ <ConfigurationType>Makefile</ConfigurationType> <PlatformToolset>v142</PlatformToolset> </PropertyGroup> + <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Sanitize|x64'" Label="Configuration"> + <ConfigurationType>Makefile</ConfigurationType> + <PlatformToolset>v142</PlatformToolset> + </PropertyGroup> <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='DebugXP|x64'" Label="Configuration"> <ConfigurationType>Makefile</ConfigurationType> <PlatformToolset>v141_xp</PlatformToolset> @@ -198,6 +214,9 @@ <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="PropertySheets"> <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" /> </ImportGroup> + <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Sanitize|Win32'" Label="PropertySheets"> + <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" /> + </ImportGroup> <ImportGroup Condition="'$(Configuration)|$(Platform)'=='DebugXP|Win32'" Label="PropertySheets"> <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" /> </ImportGroup> @@ -228,6 +247,9 @@ <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="PropertySheets"> <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" /> </ImportGroup> + <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Sanitize|x64'" Label="PropertySheets"> + <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" /> + </ImportGroup> <ImportGroup Condition="'$(Configuration)|$(Platform)'=='DebugXP|x64'" Label="PropertySheets"> <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" /> </ImportGroup> @@ -244,6 +266,15 @@ <NMakeOutput>$(ProjectDir)\..\debugbin\gpcl6win32.exe</NMakeOutput> <NMakePreprocessorDefinitions>WIN32;_DEBUG;DEBUG=1;TDEBUG=1;HAVE_SSE2=1;$(NMakePreprocessorDefinitions)</NMakePreprocessorDefinitions> </PropertyGroup> + <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Sanitize|Win32'"> + <OutDir>debugobj\</OutDir> + <IntDir>debugobj\</IntDir> + <NMakeBuildCommandLine>cd .. && nmake -f psi\msvc32.mak SBR=1 DEVSTUDIO= gpcl6sanitize && nmake -f psi\msvc32.mak DEVSTUDIO= sanitizebsc</NMakeBuildCommandLine> + <NMakeReBuildCommandLine>cd .. && nmake -f psi\msvc32.mak DEVSTUDIO= sanitizeclean && nmake -f psi\msvc32.mak SBR=1 DEVSTUDIO= gpcl6debug && nmake -f psi\msvc32.mak DEVSTUDIO= sanitizebsc</NMakeReBuildCommandLine> + <NMakeCleanCommandLine>cd .. && nmake -f psi\msvc32.mak DEVSTUDIO= sanitizeclean</NMakeCleanCommandLine> + <NMakeOutput>$(ProjectDir)\..\sanbin\gpcl6win32.exe</NMakeOutput> + <NMakePreprocessorDefinitions>WIN32;_DEBUG;DEBUG=1;TDEBUG=1;HAVE_SSE2=1;$(NMakePreprocessorDefinitions)</NMakePreprocessorDefinitions> + </PropertyGroup> <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='DebugXP|Win32'"> <OutDir>debugobjxp\</OutDir> <IntDir>debugobjxp\</IntDir> @@ -262,6 +293,15 @@ <NMakeOutput>$(ProjectDir)\..\debugbin\gpcl6win64.exe</NMakeOutput> <NMakePreprocessorDefinitions>WIN64;_DEBUG;DEBUG=1;TDEBUG=1;$(NMakePreprocessorDefinitions)</NMakePreprocessorDefinitions> </PropertyGroup> + <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Sanitize|x64'"> + <OutDir>debugobj64\</OutDir> + <IntDir>debugobj64\</IntDir> + <NMakeBuildCommandLine>cd .. && nmake -f psi\msvc32.mak WIN64= SBR=1 DEVSTUDIO= gpcl6sanitize && nmake -f psi\msvc32.mak WIN64= DEVSTUDIO= sanitizebsc</NMakeBuildCommandLine> + <NMakeReBuildCommandLine>cd .. && nmake -f psi\msvc32.mak WIN64= DEVSTUDIO= sanitizeclean && nmake -f psi\msvc32.mak WIN64= SBR=1 DEVSTUDIO= gpcl6sanitize && nmake -f psi\msvc32.mak WIN64= DEVSTUDIO= sanitizebsc</NMakeReBuildCommandLine> + <NMakeCleanCommandLine>cd .. && nmake -f psi\msvc32.mak WIN64= DEVSTUDIO= sanitizeclean</NMakeCleanCommandLine> + <NMakeOutput>$(ProjectDir)\..\sanbin\gpcl6win64.exe</NMakeOutput> + <NMakePreprocessorDefinitions>WIN64;_DEBUG;DEBUG=1;TDEBUG=1;$(NMakePreprocessorDefinitions)</NMakePreprocessorDefinitions> + </PropertyGroup> <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='DebugXP|x64'"> <OutDir>debugobj64xp\</OutDir> <IntDir>debugobj64xp\</IntDir> @@ -479,7 +519,6 @@ <ClCompile Include="..\pcl\pl\plapi.c" /> <ClCompile Include="..\pcl\pl\plchar.c" /> <ClCompile Include="..\pcl\pl\pldict.c" /> - <ClCompile Include="..\pcl\pl\pldraw.c" /> <ClCompile Include="..\pcl\pl\plfapi.c" /> <ClCompile Include="..\pcl\pl\plfont.c" /> <ClCompile Include="..\pcl\pl\plftable.c" /> @@ -576,7 +615,6 @@ <ClInclude Include="..\pcl\pl\plchar.h" /> <ClInclude Include="..\pcl\pl\pldebug.h" /> <ClInclude Include="..\pcl\pl\pldict.h" /> - <ClInclude Include="..\pcl\pl\pldraw.h" /> <ClInclude Include="..\pcl\pl\plfapi.h" /> <ClInclude Include="..\pcl\pl\plfont.h" /> <ClInclude Include="..\pcl\pl\plftable.h" /> @@ -613,4 +651,4 @@ <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" /> <ImportGroup Label="ExtensionTargets"> </ImportGroup> -</Project> +</Project>
\ No newline at end of file diff --git a/windows/ghostpcl.vcxproj.filters b/windows/ghostpcl.vcxproj.filters index 048decea..f797fde3 100644 --- a/windows/ghostpcl.vcxproj.filters +++ b/windows/ghostpcl.vcxproj.filters @@ -204,9 +204,6 @@ <ClCompile Include="..\pcl\pl\pldict.c"> <Filter>pl</Filter> </ClCompile> - <ClCompile Include="..\pcl\pl\pldraw.c"> - <Filter>pl</Filter> - </ClCompile> <ClCompile Include="..\pcl\pl\plfapi.c"> <Filter>pl</Filter> </ClCompile> @@ -491,9 +488,6 @@ <ClInclude Include="..\pcl\pl\pldict.h"> <Filter>pl %28.h%29</Filter> </ClInclude> - <ClInclude Include="..\pcl\pl\pldraw.h"> - <Filter>pl %28.h%29</Filter> - </ClInclude> <ClInclude Include="..\pcl\pl\plfapi.h"> <Filter>pl %28.h%29</Filter> </ClInclude> diff --git a/windows/ghostpdl.vcxproj b/windows/ghostpdl.vcxproj index ed099496..3ccf4d44 100644 --- a/windows/ghostpdl.vcxproj +++ b/windows/ghostpdl.vcxproj @@ -1,4 +1,4 @@ -<?xml version="1.0" encoding="utf-8"?> +<?xml version="1.0" encoding="utf-8"?> <Project DefaultTargets="Build" ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> <ItemGroup Label="ProjectConfigurations"> <ProjectConfiguration Include="Debug-contrib|Win32"> @@ -81,6 +81,14 @@ <Configuration>Release</Configuration> <Platform>x64</Platform> </ProjectConfiguration> + <ProjectConfiguration Include="Sanitize|Win32"> + <Configuration>Sanitize</Configuration> + <Platform>Win32</Platform> + </ProjectConfiguration> + <ProjectConfiguration Include="Sanitize|x64"> + <Configuration>Sanitize</Configuration> + <Platform>x64</Platform> + </ProjectConfiguration> </ItemGroup> <PropertyGroup Label="Globals"> <ProjectGuid>{C4038125-61B9-4147-9EA8-39690BA3A599}</ProjectGuid> @@ -124,6 +132,10 @@ <ConfigurationType>Makefile</ConfigurationType> <PlatformToolset>v142</PlatformToolset> </PropertyGroup> + <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Sanitize|Win32'" Label="Configuration"> + <ConfigurationType>Makefile</ConfigurationType> + <PlatformToolset>v142</PlatformToolset> + </PropertyGroup> <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='DebugXP|Win32'" Label="Configuration"> <ConfigurationType>Makefile</ConfigurationType> <PlatformToolset>v141_xp</PlatformToolset> @@ -164,6 +176,10 @@ <ConfigurationType>Makefile</ConfigurationType> <PlatformToolset>v142</PlatformToolset> </PropertyGroup> + <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Sanitize|x64'" Label="Configuration"> + <ConfigurationType>Makefile</ConfigurationType> + <PlatformToolset>v142</PlatformToolset> + </PropertyGroup> <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='DebugXP|x64'" Label="Configuration"> <ConfigurationType>Makefile</ConfigurationType> <PlatformToolset>v141_xp</PlatformToolset> @@ -198,6 +214,9 @@ <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="PropertySheets"> <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" /> </ImportGroup> + <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Sanitize|Win32'" Label="PropertySheets"> + <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" /> + </ImportGroup> <ImportGroup Condition="'$(Configuration)|$(Platform)'=='DebugXP|Win32'" Label="PropertySheets"> <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" /> </ImportGroup> @@ -228,6 +247,9 @@ <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="PropertySheets"> <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" /> </ImportGroup> + <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Sanitize|x64'" Label="PropertySheets"> + <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" /> + </ImportGroup> <ImportGroup Condition="'$(Configuration)|$(Platform)'=='DebugXP|x64'" Label="PropertySheets"> <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" /> </ImportGroup> @@ -244,6 +266,15 @@ <NMakeOutput>$(ProjectDir)\..\debugbin\gpdlwin32.exe</NMakeOutput> <NMakePreprocessorDefinitions>WIN32;_DEBUG;DEBUG=1;TDEBUG=1;HAVE_SSE2=1;$(NMakePreprocessorDefinitions)</NMakePreprocessorDefinitions> </PropertyGroup> + <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Sanitize|Win32'"> + <OutDir>debugobj\</OutDir> + <IntDir>debugobj\</IntDir> + <NMakeBuildCommandLine>cd .. && nmake -f psi\msvc32.mak SBR=1 DEVSTUDIO= gpdlsanitize && nmake -f psi\msvc32.mak DEVSTUDIO= sanitizebsc</NMakeBuildCommandLine> + <NMakeReBuildCommandLine>cd .. && nmake -f psi\msvc32.mak DEVSTUDIO= sanitizeclean && nmake -f psi\msvc32.mak SBR=1 DEVSTUDIO= gpdlsanitize && nmake -f psi\msvc32.mak DEVSTUDIO= sanitizebsc</NMakeReBuildCommandLine> + <NMakeCleanCommandLine>cd .. && nmake -f psi\msvc32.mak DEVSTUDIO= sanitizeclean</NMakeCleanCommandLine> + <NMakeOutput>$(ProjectDir)\..\sanbin\gpdlwin32.exe</NMakeOutput> + <NMakePreprocessorDefinitions>WIN32;_DEBUG;DEBUG=1;TDEBUG=1;HAVE_SSE2=1;$(NMakePreprocessorDefinitions)</NMakePreprocessorDefinitions> + </PropertyGroup> <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='DebugXP|Win32'"> <OutDir>debugobjxp\</OutDir> <IntDir>debugobjxp\</IntDir> @@ -262,6 +293,15 @@ <NMakeOutput>$(ProjectDir)\..\debugbin\gpdlwin64.exe</NMakeOutput> <NMakePreprocessorDefinitions>WIN64;_DEBUG;DEBUG=1;TDEBUG=1;$(NMakePreprocessorDefinitions)</NMakePreprocessorDefinitions> </PropertyGroup> + <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Sanitize|x64'"> + <OutDir>debugobj64\</OutDir> + <IntDir>debugobj64\</IntDir> + <NMakeBuildCommandLine>cd .. && nmake -f psi\msvc32.mak WIN64= SBR=1 DEVSTUDIO= gpdlsanitize && nmake -f psi\msvc32.mak WIN64= DEVSTUDIO= sanitizebsc</NMakeBuildCommandLine> + <NMakeReBuildCommandLine>cd .. && nmake -f psi\msvc32.mak WIN64= DEVSTUDIO= sanitizeclean && nmake -f psi\msvc32.mak WIN64= SBR=1 DEVSTUDIO= gpdlsanitize && nmake -f psi\msvc32.mak WIN64= DEVSTUDIO= sanitizebsc</NMakeReBuildCommandLine> + <NMakeCleanCommandLine>cd .. && nmake -f psi\msvc32.mak WIN64= DEVSTUDIO= sanitizeclean</NMakeCleanCommandLine> + <NMakeOutput>$(ProjectDir)\..\sanbin\gpdlwin64.exe</NMakeOutput> + <NMakePreprocessorDefinitions>WIN64;_DEBUG;DEBUG=1;TDEBUG=1;$(NMakePreprocessorDefinitions)</NMakePreprocessorDefinitions> + </PropertyGroup> <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='DebugXP|x64'"> <OutDir>debugobj64xp\</OutDir> <IntDir>debugobj64xp\</IntDir> @@ -429,4 +469,4 @@ <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" /> <ImportGroup Label="ExtensionTargets"> </ImportGroup> -</Project> +</Project>
\ No newline at end of file diff --git a/windows/ghostscript.vcproj b/windows/ghostscript.vcproj index 3c085402..2a30c559 100644 --- a/windows/ghostscript.vcproj +++ b/windows/ghostscript.vcproj @@ -2662,10 +2662,6 @@ > </File> <File - RelativePath="..\base\sjbig2_luratech.c" - > - </File> - <File RelativePath="..\base\sjpegc.c" > </File> @@ -2682,10 +2678,6 @@ > </File> <File - RelativePath="..\base\sjpx_luratech.c" - > - </File> - <File RelativePath="..\base\sjpx_openjpeg.c" > </File> @@ -4534,18 +4526,10 @@ > </File> <File - RelativePath="..\base\sjbig2_luratech.h" - > - </File> - <File RelativePath="..\base\sjpeg.h" > </File> <File - RelativePath="..\base\sjpx_luratech.h" - > - </File> - <File RelativePath="..\base\sjpx_openjpeg.h" > </File> @@ -6185,6 +6169,14 @@ > </File> <File + RelativePath="..\devices\vector\gdevdocxw.c" + > + </File> + <File + RelativePath="..\devices\vector\doc_common.c" + > + </File> + <File RelativePath="..\devices\vector\gdevxps.c" > </File> @@ -6329,6 +6321,10 @@ Name="vector (.h)" > <File + RelativePath="..\devices\vector\doc_common.h" + > + </File> + <File RelativePath="..\devices\vector\gdevagl.h" > </File> diff --git a/windows/ghostscript.vcxproj b/windows/ghostscript.vcxproj index 0f198da3..df7a63ae 100644 --- a/windows/ghostscript.vcxproj +++ b/windows/ghostscript.vcxproj @@ -1,4 +1,4 @@ -<?xml version="1.0" encoding="utf-8"?> +<?xml version="1.0" encoding="utf-8"?> <Project DefaultTargets="Build" ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> <ItemGroup Label="ProjectConfigurations"> <ProjectConfiguration Include="Debug-contrib|Win32"> @@ -81,6 +81,14 @@ <Configuration>Release</Configuration> <Platform>x64</Platform> </ProjectConfiguration> + <ProjectConfiguration Include="Sanitize|Win32"> + <Configuration>Sanitize</Configuration> + <Platform>Win32</Platform> + </ProjectConfiguration> + <ProjectConfiguration Include="Sanitize|x64"> + <Configuration>Sanitize</Configuration> + <Platform>x64</Platform> + </ProjectConfiguration> </ItemGroup> <PropertyGroup Label="Globals"> <ProjectGuid>{1EDA2AC3-D74F-4F4D-B4D6-AC05CC594A2F}</ProjectGuid> @@ -124,6 +132,10 @@ <ConfigurationType>Makefile</ConfigurationType> <PlatformToolset>v142</PlatformToolset> </PropertyGroup> + <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Sanitize|Win32'" Label="Configuration"> + <ConfigurationType>Makefile</ConfigurationType> + <PlatformToolset>v142</PlatformToolset> + </PropertyGroup> <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='DebugXP|Win32'" Label="Configuration"> <ConfigurationType>Makefile</ConfigurationType> <PlatformToolset>v141_xp</PlatformToolset> @@ -164,6 +176,10 @@ <ConfigurationType>Makefile</ConfigurationType> <PlatformToolset>v142</PlatformToolset> </PropertyGroup> + <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Sanitize|x64'" Label="Configuration"> + <ConfigurationType>Makefile</ConfigurationType> + <PlatformToolset>v142</PlatformToolset> + </PropertyGroup> <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='DebugXP|x64'" Label="Configuration"> <ConfigurationType>Makefile</ConfigurationType> <PlatformToolset>v141_xp</PlatformToolset> @@ -198,6 +214,9 @@ <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="PropertySheets"> <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" /> </ImportGroup> + <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Sanitize|Win32'" Label="PropertySheets"> + <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" /> + </ImportGroup> <ImportGroup Condition="'$(Configuration)|$(Platform)'=='DebugXP|Win32'" Label="PropertySheets"> <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" /> </ImportGroup> @@ -228,6 +247,9 @@ <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="PropertySheets"> <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" /> </ImportGroup> + <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Sanitize|x64'" Label="PropertySheets"> + <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" /> + </ImportGroup> <ImportGroup Condition="'$(Configuration)|$(Platform)'=='DebugXP|x64'" Label="PropertySheets"> <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" /> </ImportGroup> @@ -244,6 +266,15 @@ <NMakeOutput>$(ProjectDir)\..\debugbin\gswin32c.exe</NMakeOutput> <NMakePreprocessorDefinitions>WIN32;_DEBUG;DEBUG=1;TDEBUG=1;HAVE_SSE2=1;$(NMakePreprocessorDefinitions)</NMakePreprocessorDefinitions> </PropertyGroup> + <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Sanitize|Win32'"> + <OutDir>debugobj\</OutDir> + <IntDir>debugobj\</IntDir> + <NMakeBuildCommandLine>cd .. && nmake -f psi\msvc32.mak SBR=1 DEVSTUDIO= gssanitize && nmake -f psi\msvc32.mak DEVSTUDIO= sanitizebsc</NMakeBuildCommandLine> + <NMakeReBuildCommandLine>cd .. && nmake -f psi\msvc32.mak DEVSTUDIO= sanitizeclean && nmake -f psi\msvc32.mak SBR=1 DEVSTUDIO= gssanitize && nmake -f psi\msvc32.mak DEVSTUDIO= sanitizebsc</NMakeReBuildCommandLine> + <NMakeCleanCommandLine>cd .. && nmake -f psi\msvc32.mak DEVSTUDIO= sanitizeclean</NMakeCleanCommandLine> + <NMakeOutput>$(ProjectDir)\..\sanbin\gswin32c.exe</NMakeOutput> + <NMakePreprocessorDefinitions>WIN32;_DEBUG;DEBUG=1;TDEBUG=1;HAVE_SSE2=1;$(NMakePreprocessorDefinitions)</NMakePreprocessorDefinitions> + </PropertyGroup> <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='DebugXP|Win32'"> <OutDir>debugobjxp\</OutDir> <IntDir>debugobjxp\</IntDir> @@ -262,6 +293,15 @@ <NMakeOutput>$(ProjectDir)\..\debugbin\gswin64c.exe</NMakeOutput> <NMakePreprocessorDefinitions>WIN64;_DEBUG;DEBUG=1;TDEBUG=1;$(NMakePreprocessorDefinitions)</NMakePreprocessorDefinitions> </PropertyGroup> + <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Sanitize|x64'"> + <OutDir>debugobj64\</OutDir> + <IntDir>debugobj64\</IntDir> + <NMakeBuildCommandLine>cd .. && nmake -f psi\msvc32.mak WIN64= SBR=1 DEVSTUDIO= gssanitize && nmake -f psi\msvc32.mak WIN64= DEVSTUDIO= sanitizebsc</NMakeBuildCommandLine> + <NMakeReBuildCommandLine>cd .. && nmake -f psi\msvc32.mak WIN64= DEVSTUDIO= sanitizeclean && nmake -f psi\msvc32.mak WIN64= SBR=1 DEVSTUDIO= gssanitize && nmake -f psi\msvc32.mak WIN64= DEVSTUDIO= sanitizebsc</NMakeReBuildCommandLine> + <NMakeCleanCommandLine>cd .. && nmake -f psi\msvc32.mak WIN64= DEVSTUDIO= sanitizeclean</NMakeCleanCommandLine> + <NMakeOutput>$(ProjectDir)\..\sanbin\gswin64c.exe</NMakeOutput> + <NMakePreprocessorDefinitions>WIN64;_DEBUG;DEBUG=1;TDEBUG=1;$(NMakePreprocessorDefinitions)</NMakePreprocessorDefinitions> + </PropertyGroup> <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='DebugXP|x64'"> <OutDir>debugobj64xp\</OutDir> <IntDir>debugobj64xp\</IntDir> @@ -1067,6 +1107,7 @@ <ClCompile Include="..\base\gshtscr.c" /> <ClCompile Include="..\base\gshtx.c" /> <ClCompile Include="..\base\gsicc.c" /> + <ClCompile Include="..\base\gsicc_blacktext.c" /> <ClCompile Include="..\base\gsicc_cache.c" /> <ClCompile Include="..\base\gsicc_create.c" /> <ClCompile Include="..\base\gsicc_lcms2.c" /> @@ -1258,13 +1299,10 @@ <ClCompile Include="..\base\siscale.c" /> <ClCompile Include="..\base\siscale_cal.c" /> <ClCompile Include="..\base\sjbig2.c" /> - <ClCompile Include="..\base\sjbig2_luratech.c" /> <ClCompile Include="..\base\sjpegc.c" /> <ClCompile Include="..\base\sjpegd.c" /> <ClCompile Include="..\base\sjpege.c" /> <ClCompile Include="..\base\sjpx.c" /> - <ClCompile Include="..\base\sjpx_luratech.c" /> - <ClCompile Include="..\base\sjpx_openjpeg.c" /> <ClCompile Include="..\base\slzwc.c" /> <ClCompile Include="..\base\slzwd.c" /> <ClCompile Include="..\base\slzwe.c" /> @@ -1564,6 +1602,8 @@ <ClCompile Include="..\devices\vector\gdevpx.c" /> <ClCompile Include="..\devices\vector\gdevsvg.c" /> <ClCompile Include="..\devices\vector\gdevtxtw.c" /> + <ClCompile Include="..\devices\vector\gdevdocxw.c" /> + <ClCompile Include="..\devices\vector\doc_common.c" /> <ClCompile Include="..\devices\vector\gdevxps.c" /> <ClCompile Include="..\devices\vector\whitelst.c" /> <ClCompile Include="..\expat\lib\xmlparse.c" /> @@ -1576,6 +1616,22 @@ <ClCompile Include="..\expat\tests\minicheck.c" /> <ClCompile Include="..\expat\tests\runtests.c" /> <ClCompile Include="..\expat\tests\runtestspp.cpp" /> + <ClCompile Include="..\extract\src\alloc.c" /> + <ClCompile Include="..\extract\src\astring.c" /> + <ClCompile Include="..\extract\src\buffer-test.c" /> + <ClCompile Include="..\extract\src\buffer.c" /> + <ClCompile Include="..\extract\src\docx.c" /> + <ClCompile Include="..\extract\src\docx_template.c" /> + <ClCompile Include="..\extract\src\extract-exe.c" /> + <ClCompile Include="..\extract\src\extract.c" /> + <ClCompile Include="..\extract\src\join.c" /> + <ClCompile Include="..\extract\src\mem.c" /> + <ClCompile Include="..\extract\src\memento.c" /> + <ClCompile Include="..\extract\src\misc-test.c" /> + <ClCompile Include="..\extract\src\outf.c" /> + <ClCompile Include="..\extract\src\xml.c" /> + <ClCompile Include="..\extract\src\zip-test.c" /> + <ClCompile Include="..\extract\src\zip.c" /> <ClCompile Include="..\ijs\ijs.c" /> <ClCompile Include="..\ijs\ijs_client.c" /> <ClCompile Include="..\ijs\ijs_client_example.c" /> @@ -2542,6 +2598,7 @@ <ClInclude Include="..\base\gsht1.h" /> <ClInclude Include="..\base\gshtx.h" /> <ClInclude Include="..\base\gsicc.h" /> + <ClInclude Include="..\base\gsicc_blacktext.h" /> <ClInclude Include="..\base\gsicc_cache.h" /> <ClInclude Include="..\base\gsicc_cms.h" /> <ClInclude Include="..\base\gsicc_create.h" /> @@ -2768,9 +2825,7 @@ <ClInclude Include="..\base\siscale.h" /> <ClInclude Include="..\base\sisparam.h" /> <ClInclude Include="..\base\sjbig2.h" /> - <ClInclude Include="..\base\sjbig2_luratech.h" /> <ClInclude Include="..\base\sjpeg.h" /> - <ClInclude Include="..\base\sjpx_luratech.h" /> <ClInclude Include="..\base\sjpx_openjpeg.h" /> <ClInclude Include="..\base\slzwx.h" /> <ClInclude Include="..\base\smd5.h" /> @@ -2903,6 +2958,7 @@ <ClInclude Include="..\devices\rinkj\rinkj-dither.h" /> <ClInclude Include="..\devices\rinkj\rinkj-epson870.h" /> <ClInclude Include="..\devices\rinkj\rinkj-screen-eb.h" /> + <ClInclude Include="..\devices\vector\doc_common.h" /> <ClInclude Include="..\devices\vector\gdevagl.h" /> <ClInclude Include="..\devices\vector\gdevpdfb.h" /> <ClInclude Include="..\devices\vector\gdevpdfc.h" /> @@ -3432,4 +3488,4 @@ <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" /> <ImportGroup Label="ExtensionTargets"> </ImportGroup> -</Project>
\ No newline at end of file +</Project> diff --git a/windows/ghostscript.vcxproj.filters b/windows/ghostscript.vcxproj.filters index f4a89bfd..5b7da7a0 100644 --- a/windows/ghostscript.vcxproj.filters +++ b/windows/ghostscript.vcxproj.filters @@ -2123,9 +2123,6 @@ <ClCompile Include="..\base\sjbig2.c"> <Filter>base</Filter> </ClCompile> - <ClCompile Include="..\base\sjbig2_luratech.c"> - <Filter>base</Filter> - </ClCompile> <ClCompile Include="..\base\sjpegc.c"> <Filter>base</Filter> </ClCompile> @@ -2138,9 +2135,6 @@ <ClCompile Include="..\base\sjpx.c"> <Filter>base</Filter> </ClCompile> - <ClCompile Include="..\base\sjpx_luratech.c"> - <Filter>base</Filter> - </ClCompile> <ClCompile Include="..\base\sjpx_openjpeg.c"> <Filter>base</Filter> </ClCompile> @@ -3377,6 +3371,12 @@ <ClCompile Include="..\devices\vector\gdevtxtw.c"> <Filter>devices\vector</Filter> </ClCompile> + <ClCompile Include="..\devices\vector\gdevdocxw.c"> + <Filter>devices\vector</Filter> + </ClCompile> + <ClCompile Include="..\devices\vector\doc_common.c"> + <Filter>devices\vector</Filter> + </ClCompile> <ClCompile Include="..\devices\vector\gdevxps.c"> <Filter>devices\vector</Filter> </ClCompile> @@ -6026,6 +6026,9 @@ <ClCompile Include="..\base\gdevkrnlsclass.c"> <Filter>base\gldevices</Filter> </ClCompile> + <ClCompile Include="..\base\gsicc_blacktext.c"> + <Filter>base\color\icc</Filter> + </ClCompile> </ItemGroup> <ItemGroup> <ClInclude Include="..\base\aes.h"> @@ -6946,15 +6949,9 @@ <ClInclude Include="..\base\sjbig2.h"> <Filter>base %28.h%29</Filter> </ClInclude> - <ClInclude Include="..\base\sjbig2_luratech.h"> - <Filter>base %28.h%29</Filter> - </ClInclude> <ClInclude Include="..\base\sjpeg.h"> <Filter>base %28.h%29</Filter> </ClInclude> - <ClInclude Include="..\base\sjpx_luratech.h"> - <Filter>base %28.h%29</Filter> - </ClInclude> <ClInclude Include="..\base\sjpx_openjpeg.h"> <Filter>base %28.h%29</Filter> </ClInclude> @@ -8968,6 +8965,9 @@ <ClInclude Include="..\base\gdevepo.h"> <Filter>base %28.h%29\gldevices %28.h%29</Filter> </ClInclude> + <ClInclude Include="..\base\gsicc_blacktext.h"> + <Filter>base %28.h%29\icc %28.h%29</Filter> + </ClInclude> </ItemGroup> <ItemGroup> <ResourceCompile Include="..\base\gspmdrv.rc"> @@ -8998,4 +8998,4 @@ <Filter>psi %28.rc%29</Filter> </ResourceCompile> </ItemGroup> -</Project>
\ No newline at end of file +</Project> diff --git a/windows/ghostscript_rt.vcxproj b/windows/ghostscript_rt.vcxproj index 8370363e..c5f8a4f3 100644 --- a/windows/ghostscript_rt.vcxproj +++ b/windows/ghostscript_rt.vcxproj @@ -631,12 +631,10 @@ <ClCompile Include="..\base\simscale.c" /> <ClCompile Include="..\base\siscale.c" /> <ClCompile Include="..\base\sjbig2.c" /> - <ClCompile Include="..\base\sjbig2_luratech.c" /> <ClCompile Include="..\base\sjpegc.c" /> <ClCompile Include="..\base\sjpegd.c" /> <ClCompile Include="..\base\sjpege.c" /> <ClCompile Include="..\base\sjpx.c" /> - <ClCompile Include="..\base\sjpx_luratech.c" /> <ClCompile Include="..\base\slzwc.c" /> <ClCompile Include="..\base\slzwd.c" /> <ClCompile Include="..\base\slzwe.c" /> @@ -1503,6 +1501,8 @@ <ClCompile Include="..\devices\vector\gdevpxut.c" /> <ClCompile Include="..\devices\vector\gdevsvg.c" /> <ClCompile Include="..\devices\vector\gdevtxtw.c" /> + <ClCompile Include="..\devices\vector\gdevdocxw.c" /> + <ClCompile Include="..\devices\vector\doc_common.c" /> <ClCompile Include="..\devices\vector\whitelst.c" /> <ClCompile Include="..\devices\rinkj\evenbetter-rll.c" /> <ClCompile Include="..\devices\rinkj\rinkj-byte-stream.c" /> @@ -1942,9 +1942,7 @@ <ClInclude Include="..\base\siscale.h" /> <ClInclude Include="..\base\sisparam.h" /> <ClInclude Include="..\base\sjbig2.h" /> - <ClInclude Include="..\base\sjbig2_luratech.h" /> <ClInclude Include="..\base\sjpeg.h" /> - <ClInclude Include="..\base\sjpx_luratech.h" /> <ClInclude Include="..\base\sjpx_openjpeg.h" /> <ClInclude Include="..\base\slzwx.h" /> <ClInclude Include="..\base\smd5.h" /> @@ -2175,6 +2173,7 @@ <ClInclude Include="..\devices\gdevxcmp.h" /> <ClInclude Include="..\devices\gxfcopy.h" /> <ClInclude Include="..\devices\minftrsz.h" /> + <ClInclude Include="..\devices\vector\doc_common.h" /> <ClInclude Include="..\devices\vector\gdevagl.h" /> <ClInclude Include="..\devices\vector\gdevpdfb.h" /> <ClInclude Include="..\devices\vector\gdevpdfc.h" /> diff --git a/windows/ghostxps.vcxproj b/windows/ghostxps.vcxproj index b85b325d..0b6f7120 100644 --- a/windows/ghostxps.vcxproj +++ b/windows/ghostxps.vcxproj @@ -1,4 +1,4 @@ -<?xml version="1.0" encoding="utf-8"?> +<?xml version="1.0" encoding="utf-8"?> <Project DefaultTargets="Build" ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> <ItemGroup Label="ProjectConfigurations"> <ProjectConfiguration Include="Debug-contrib|Win32"> @@ -81,6 +81,14 @@ <Configuration>Release</Configuration> <Platform>x64</Platform> </ProjectConfiguration> + <ProjectConfiguration Include="Sanitize|Win32"> + <Configuration>Sanitize</Configuration> + <Platform>Win32</Platform> + </ProjectConfiguration> + <ProjectConfiguration Include="Sanitize|x64"> + <Configuration>Sanitize</Configuration> + <Platform>x64</Platform> + </ProjectConfiguration> </ItemGroup> <PropertyGroup Label="Globals"> <ProjectGuid>{DE21942C-CDA2-445B-B2EC-51FF54E0F0DD}</ProjectGuid> @@ -124,6 +132,10 @@ <ConfigurationType>Makefile</ConfigurationType> <PlatformToolset>v142</PlatformToolset> </PropertyGroup> + <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Sanitize|Win32'" Label="Configuration"> + <ConfigurationType>Makefile</ConfigurationType> + <PlatformToolset>v142</PlatformToolset> + </PropertyGroup> <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='DebugXP|Win32'" Label="Configuration"> <ConfigurationType>Makefile</ConfigurationType> <PlatformToolset>v141_xp</PlatformToolset> @@ -164,6 +176,10 @@ <ConfigurationType>Makefile</ConfigurationType> <PlatformToolset>v142</PlatformToolset> </PropertyGroup> + <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Sanitize|x64'" Label="Configuration"> + <ConfigurationType>Makefile</ConfigurationType> + <PlatformToolset>v142</PlatformToolset> + </PropertyGroup> <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='DebugXP|x64'" Label="Configuration"> <ConfigurationType>Makefile</ConfigurationType> <PlatformToolset>v141_xp</PlatformToolset> @@ -198,6 +214,9 @@ <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="PropertySheets"> <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" /> </ImportGroup> + <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Sanitize|Win32'" Label="PropertySheets"> + <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" /> + </ImportGroup> <ImportGroup Condition="'$(Configuration)|$(Platform)'=='DebugXP|Win32'" Label="PropertySheets"> <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" /> </ImportGroup> @@ -228,6 +247,9 @@ <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="PropertySheets"> <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" /> </ImportGroup> + <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Sanitize|x64'" Label="PropertySheets"> + <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" /> + </ImportGroup> <ImportGroup Condition="'$(Configuration)|$(Platform)'=='DebugXP|x64'" Label="PropertySheets"> <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" /> </ImportGroup> @@ -244,6 +266,15 @@ <NMakeOutput>$(ProjectDir)\..\debugbin\gxpswin32.exe</NMakeOutput> <NMakePreprocessorDefinitions>WIN32;_DEBUG;DEBUG=1;TDEBUG=1;HAVE_SSE2=1;$(NMakePreprocessorDefinitions)</NMakePreprocessorDefinitions> </PropertyGroup> + <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Sanitize|Win32'"> + <OutDir>debugobj\</OutDir> + <IntDir>debugobj\</IntDir> + <NMakeBuildCommandLine>cd .. && nmake -f psi\msvc32.mak SBR=1 DEVSTUDIO= gxpssanitize && nmake -f psi\msvc32.mak DEVSTUDIO= sanitizebsc</NMakeBuildCommandLine> + <NMakeReBuildCommandLine>cd .. && nmake -f psi\msvc32.mak DEVSTUDIO= sanitizeclean && nmake -f psi\msvc32.mak SBR=1 DEVSTUDIO= gxpssanitize && nmake -f psi\msvc32.mak DEVSTUDIO= sanitizebsc</NMakeReBuildCommandLine> + <NMakeCleanCommandLine>cd .. && nmake -f psi\msvc32.mak DEVSTUDIO= sanitizeclean</NMakeCleanCommandLine> + <NMakeOutput>$(ProjectDir)\..\sanbin\gxpswin32.exe</NMakeOutput> + <NMakePreprocessorDefinitions>WIN32;_DEBUG;DEBUG=1;TDEBUG=1;HAVE_SSE2=1;$(NMakePreprocessorDefinitions)</NMakePreprocessorDefinitions> + </PropertyGroup> <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='DebugXP|Win32'"> <OutDir>debugobjxp\</OutDir> <IntDir>debugobjxp\</IntDir> @@ -262,6 +293,15 @@ <NMakeOutput>$(ProjectDir)\..\debugbin\gxpswin64.exe</NMakeOutput> <NMakePreprocessorDefinitions>WIN64;_DEBUG;DEBUG=1;TDEBUG=1;$(NMakePreprocessorDefinitions)</NMakePreprocessorDefinitions> </PropertyGroup> + <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Sanitize|x64'"> + <OutDir>debugobj64\</OutDir> + <IntDir>debugobj64\</IntDir> + <NMakeBuildCommandLine>cd .. && nmake -f psi\msvc32.mak WIN64= SBR=1 DEVSTUDIO= gxpssanitize && nmake -f psi\msvc32.mak WIN64= DEVSTUDIO= sanitizebsc</NMakeBuildCommandLine> + <NMakeReBuildCommandLine>cd .. && nmake -f psi\msvc32.mak WIN64= DEVSTUDIO= sanitizeclean && nmake -f psi\msvc32.mak WIN64= SBR=1 DEVSTUDIO= gxpssanitize && nmake -f psi\msvc32.mak WIN64= DEVSTUDIO= sanitizebsc</NMakeReBuildCommandLine> + <NMakeCleanCommandLine>cd .. && nmake -f psi\msvc32.mak WIN64= DEVSTUDIO= sanitizeclean</NMakeCleanCommandLine> + <NMakeOutput>$(ProjectDir)\..\sanbin\gxpswin64.exe</NMakeOutput> + <NMakePreprocessorDefinitions>WIN64;_DEBUG;DEBUG=1;TDEBUG=1;$(NMakePreprocessorDefinitions)</NMakePreprocessorDefinitions> + </PropertyGroup> <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='DebugXP|x64'"> <OutDir>debugobj64xp\</OutDir> <IntDir>debugobj64xp\</IntDir> @@ -454,4 +494,4 @@ <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" /> <ImportGroup Label="ExtensionTargets"> </ImportGroup> -</Project> +</Project>
\ No newline at end of file |