[gs-commits] ghostpdl branch, pdfi, updated. jbig2dec-0.14-2714-g139a017
[email protected] (Ken Sharp) Mon, 6 Jan 2020 11:27:04 +0000 (UTC)
| Newsgroups | gmane.comp.printing.ghostscript.cvs |
|---|---|
| Message-ID | <[email protected]> |
The ghostpdl branch, pdfi has been updated
via 139a0172b418e1edc581479ca6d6b87ac705341c (commit)
via 6e289c291d6f2789d389e2e2c32144c2ae4aff4d (commit)
via c53f9d984015b65bf234d65befa552fe9d18c886 (commit)
via d1aa5fdfdbea4c55445ee1bdbe08b822a1bd7a8c (commit)
via 372c862f2050d82248316f54156e5bb33dd7520a (commit)
via 9608d275bd750b189dd52681791f31617a640817 (commit)
via 59ed026565b5be1bd055d0fbd1b066b8c07274e0 (commit)
via d7d012bfe6c8f248db8b8474743618c53318ce40 (commit)
via 92031bd1fb9084088a657b7d83339bf499dcc7d2 (commit)
via 10d2678613d5a93bedc094a62b1b98972871f464 (commit)
via 00cd7c475b173e5cdce7e1e4ff3f0880e1e70583 (commit)
via bf689ee0bff720f202ebc98f301c765f34e2c1fa (commit)
via 97ac0f6ef4010e0a49bf6f8f4515c32a5695df68 (commit)
via 719bf1f2c4104d933767d37e62489535e8ba9a17 (commit)
from 3dc031e4e5da55c689af59aec88fd2f4dd2bcc8a (commit)
----------------------------------------------------------------------
commit 139a0172b418e1edc581479ca6d6b87ac705341c
Author: Ken Sharp <[email protected]>
Date: Mon Jan 6 10:16:32 2020 +0000
update merge
diff --git a/windows/GhostPDL.sln b/windows/GhostPDL.sln
index 80d66a7..160c3a3 100644
--- a/windows/GhostPDL.sln
+++ b/windows/GhostPDL.sln
@@ -11,9 +11,9 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "ghostxps", "ghostxps.vcxpro
EndProject
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "ghostpdl", "ghostpdl.vcxproj", "{C4038125-61B9-4147-9EA8-39690BA3A599}"
EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "ghostpdf", "ghostpdf.vcproj", "{4C038125-61B9-4147-9EA8-39690BA3A599}"
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "ghostpdf", "ghostpdf.vcxproj", "{4C038125-61B9-4147-9EA8-39690BA3A599}"
EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "All", "All.vcproj", "{98351FEF-0032-457C-B9D9-D6B68A829386}"
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "All", "All.vcxproj", "{98351FEF-0032-457C-B9D9-D6B68A829386}"
EndProject
Global
GlobalSection(SolutionConfigurationPlatforms) = preSolution
@@ -167,6 +167,46 @@ Global
{C4038125-61B9-4147-9EA8-39690BA3A599}.ReleaseXP|Win32.Build.0 = ReleaseXP|Win32
{C4038125-61B9-4147-9EA8-39690BA3A599}.ReleaseXP|x64.ActiveCfg = ReleaseXP|x64
{C4038125-61B9-4147-9EA8-39690BA3A599}.ReleaseXP|x64.Build.0 = ReleaseXP|x64
+ {4C038125-61B9-4147-9EA8-39690BA3A599}.Debug|Win32.ActiveCfg = Debug|Win32
+ {4C038125-61B9-4147-9EA8-39690BA3A599}.Debug|Win32.Build.0 = Debug|Win32
+ {4C038125-61B9-4147-9EA8-39690BA3A599}.Debug|x64.ActiveCfg = Debug|x64
+ {4C038125-61B9-4147-9EA8-39690BA3A599}.Debug|x64.Build.0 = Debug|x64
+ {4C038125-61B9-4147-9EA8-39690BA3A599}.Debug-contrib|Win32.ActiveCfg = Debug-contrib|Win32
+ {4C038125-61B9-4147-9EA8-39690BA3A599}.Debug-contrib|Win32.Build.0 = Debug-contrib|Win32
+ {4C038125-61B9-4147-9EA8-39690BA3A599}.Debug-contrib|x64.ActiveCfg = Debug-contrib|x64
+ {4C038125-61B9-4147-9EA8-39690BA3A599}.Debug-contrib|x64.Build.0 = Debug-contrib|x64
+ {4C038125-61B9-4147-9EA8-39690BA3A599}.Debug-cups|Win32.ActiveCfg = Debug-cups|Win32
+ {4C038125-61B9-4147-9EA8-39690BA3A599}.Debug-cups|Win32.Build.0 = Debug-cups|Win32
+ {4C038125-61B9-4147-9EA8-39690BA3A599}.Debug-cups|x64.ActiveCfg = Debug-cups|x64
+ {4C038125-61B9-4147-9EA8-39690BA3A599}.Debug-cups|x64.Build.0 = Debug-cups|x64
+ {4C038125-61B9-4147-9EA8-39690BA3A599}.DebugXP|Win32.ActiveCfg = Debug-contrib|Win32
+ {4C038125-61B9-4147-9EA8-39690BA3A599}.DebugXP|Win32.Build.0 = Debug-contrib|Win32
+ {4C038125-61B9-4147-9EA8-39690BA3A599}.DebugXP|x64.ActiveCfg = Debug-contrib|x64
+ {4C038125-61B9-4147-9EA8-39690BA3A599}.DebugXP|x64.Build.0 = Debug-contrib|x64
+ {4C038125-61B9-4147-9EA8-39690BA3A599}.Memento|Win32.ActiveCfg = Memento|Win32
+ {4C038125-61B9-4147-9EA8-39690BA3A599}.Memento|Win32.Build.0 = Memento|Win32
+ {4C038125-61B9-4147-9EA8-39690BA3A599}.Memento|x64.ActiveCfg = Memento|x64
+ {4C038125-61B9-4147-9EA8-39690BA3A599}.Memento|x64.Build.0 = Memento|x64
+ {4C038125-61B9-4147-9EA8-39690BA3A599}.MementoXP|Win32.ActiveCfg = Memento|Win32
+ {4C038125-61B9-4147-9EA8-39690BA3A599}.MementoXP|Win32.Build.0 = Memento|Win32
+ {4C038125-61B9-4147-9EA8-39690BA3A599}.MementoXP|x64.ActiveCfg = Memento|x64
+ {4C038125-61B9-4147-9EA8-39690BA3A599}.MementoXP|x64.Build.0 = Memento|x64
+ {4C038125-61B9-4147-9EA8-39690BA3A599}.Profile|Win32.ActiveCfg = Profile|Win32
+ {4C038125-61B9-4147-9EA8-39690BA3A599}.Profile|Win32.Build.0 = Profile|Win32
+ {4C038125-61B9-4147-9EA8-39690BA3A599}.Profile|x64.ActiveCfg = Profile|x64
+ {4C038125-61B9-4147-9EA8-39690BA3A599}.Profile|x64.Build.0 = Profile|x64
+ {4C038125-61B9-4147-9EA8-39690BA3A599}.Release|Win32.ActiveCfg = Release|Win32
+ {4C038125-61B9-4147-9EA8-39690BA3A599}.Release|Win32.Build.0 = Release|Win32
+ {4C038125-61B9-4147-9EA8-39690BA3A599}.Release|x64.ActiveCfg = Release|x64
+ {4C038125-61B9-4147-9EA8-39690BA3A599}.Release|x64.Build.0 = Release|x64
+ {4C038125-61B9-4147-9EA8-39690BA3A599}.Release-contrib|Win32.ActiveCfg = Release-contrib|Win32
+ {4C038125-61B9-4147-9EA8-39690BA3A599}.Release-contrib|Win32.Build.0 = Release-contrib|Win32
+ {4C038125-61B9-4147-9EA8-39690BA3A599}.Release-contrib|x64.ActiveCfg = Release-contrib|x64
+ {4C038125-61B9-4147-9EA8-39690BA3A599}.Release-contrib|x64.Build.0 = Release-contrib|x64
+ {4C038125-61B9-4147-9EA8-39690BA3A599}.ReleaseXP|Win32.ActiveCfg = Release-contrib|Win32
+ {4C038125-61B9-4147-9EA8-39690BA3A599}.ReleaseXP|Win32.Build.0 = Release-contrib|Win32
+ {4C038125-61B9-4147-9EA8-39690BA3A599}.ReleaseXP|x64.ActiveCfg = Release-contrib|x64
+ {4C038125-61B9-4147-9EA8-39690BA3A599}.ReleaseXP|x64.Build.0 = Release-contrib|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
diff --git a/windows/ghostpdf.vcxproj b/windows/ghostpdf.vcxproj
new file mode 100644
index 0000000..a2df2be
--- /dev/null
+++ b/windows/ghostpdf.vcxproj
@@ -0,0 +1,355 @@
+<?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">
+ <Configuration>Debug-contrib</Configuration>
+ <Platform>Win32</Platform>
+ </ProjectConfiguration>
+ <ProjectConfiguration Include="Debug-contrib|x64">
+ <Configuration>Debug-contrib</Configuration>
+ <Platform>x64</Platform>
+ </ProjectConfiguration>
+ <ProjectConfiguration Include="Debug-cups|Win32">
+ <Configuration>Debug-cups</Configuration>
+ <Platform>Win32</Platform>
+ </ProjectConfiguration>
+ <ProjectConfiguration Include="Debug-cups|x64">
+ <Configuration>Debug-cups</Configuration>
+ <Platform>x64</Platform>
+ </ProjectConfiguration>
+ <ProjectConfiguration Include="Debug|Win32">
+ <Configuration>Debug</Configuration>
+ <Platform>Win32</Platform>
+ </ProjectConfiguration>
+ <ProjectConfiguration Include="Debug|x64">
+ <Configuration>Debug</Configuration>
+ <Platform>x64</Platform>
+ </ProjectConfiguration>
+ <ProjectConfiguration Include="Memento|Win32">
+ <Configuration>Memento</Configuration>
+ <Platform>Win32</Platform>
+ </ProjectConfiguration>
+ <ProjectConfiguration Include="Memento|x64">
+ <Configuration>Memento</Configuration>
+ <Platform>x64</Platform>
+ </ProjectConfiguration>
+ <ProjectConfiguration Include="Profile|Win32">
+ <Configuration>Profile</Configuration>
+ <Platform>Win32</Platform>
+ </ProjectConfiguration>
+ <ProjectConfiguration Include="Profile|x64">
+ <Configuration>Profile</Configuration>
+ <Platform>x64</Platform>
+ </ProjectConfiguration>
+ <ProjectConfiguration Include="Release-contrib|Win32">
+ <Configuration>Release-contrib</Configuration>
+ <Platform>Win32</Platform>
+ </ProjectConfiguration>
+ <ProjectConfiguration Include="Release-contrib|x64">
+ <Configuration>Release-contrib</Configuration>
+ <Platform>x64</Platform>
+ </ProjectConfiguration>
+ <ProjectConfiguration Include="Release|Win32">
+ <Configuration>Release</Configuration>
+ <Platform>Win32</Platform>
+ </ProjectConfiguration>
+ <ProjectConfiguration Include="Release|x64">
+ <Configuration>Release</Configuration>
+ <Platform>x64</Platform>
+ </ProjectConfiguration>
+ </ItemGroup>
+ <PropertyGroup Label="Globals">
+ <ProjectGuid>{4C038125-61B9-4147-9EA8-39690BA3A599}</ProjectGuid>
+ <RootNamespace>ghostpdf</RootNamespace>
+ <Keyword>MakeFileProj</Keyword>
+ </PropertyGroup>
+ <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
+ <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release-contrib|Win32'" Label="Configuration">
+ <ConfigurationType>Makefile</ConfigurationType>
+ <PlatformToolset>v142</PlatformToolset>
+ </PropertyGroup>
+ <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug-contrib|Win32'" Label="Configuration">
+ <ConfigurationType>Makefile</ConfigurationType>
+ <PlatformToolset>v142</PlatformToolset>
+ </PropertyGroup>
+ <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug-cups|Win32'" Label="Configuration">
+ <ConfigurationType>Makefile</ConfigurationType>
+ <PlatformToolset>v142</PlatformToolset>
+ </PropertyGroup>
+ <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Memento|Win32'" Label="Configuration">
+ <ConfigurationType>Makefile</ConfigurationType>
+ <PlatformToolset>v142</PlatformToolset>
+ </PropertyGroup>
+ <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Profile|Win32'" Label="Configuration">
+ <ConfigurationType>Makefile</ConfigurationType>
+ <PlatformToolset>v142</PlatformToolset>
+ </PropertyGroup>
+ <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
+ <ConfigurationType>Makefile</ConfigurationType>
+ <PlatformToolset>v142</PlatformToolset>
+ </PropertyGroup>
+ <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
+ <ConfigurationType>Makefile</ConfigurationType>
+ <PlatformToolset>v142</PlatformToolset>
+ </PropertyGroup>
+ <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release-contrib|x64'" Label="Configuration">
+ <ConfigurationType>Makefile</ConfigurationType>
+ <PlatformToolset>v142</PlatformToolset>
+ </PropertyGroup>
+ <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug-contrib|x64'" Label="Configuration">
+ <ConfigurationType>Makefile</ConfigurationType>
+ <PlatformToolset>v142</PlatformToolset>
+ </PropertyGroup>
+ <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug-cups|x64'" Label="Configuration">
+ <ConfigurationType>Makefile</ConfigurationType>
+ <PlatformToolset>v142</PlatformToolset>
+ </PropertyGroup>
+ <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Memento|x64'" Label="Configuration">
+ <ConfigurationType>Makefile</ConfigurationType>
+ <PlatformToolset>v142</PlatformToolset>
+ </PropertyGroup>
+ <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Profile|x64'" Label="Configuration">
+ <ConfigurationType>Makefile</ConfigurationType>
+ <PlatformToolset>v142</PlatformToolset>
+ </PropertyGroup>
+ <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
+ <ConfigurationType>Makefile</ConfigurationType>
+ <PlatformToolset>v142</PlatformToolset>
+ </PropertyGroup>
+ <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
+ <ConfigurationType>Makefile</ConfigurationType>
+ <PlatformToolset>v142</PlatformToolset>
+ </PropertyGroup>
+ <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
+ <ImportGroup Label="ExtensionSettings">
+ </ImportGroup>
+ <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release-contrib|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)'=='Debug-contrib|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)'=='Debug-cups|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)'=='Memento|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)'=='Profile|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)'=='Release|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)'=='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)'=='Release-contrib|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)'=='Debug-contrib|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)'=='Debug-cups|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)'=='Memento|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)'=='Profile|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)'=='Release|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)'=='Debug|x64'" Label="PropertySheets">
+ <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+ </ImportGroup>
+ <PropertyGroup Label="UserMacros" />
+ <PropertyGroup>
+ <_ProjectFileVersion>16.0.29511.113</_ProjectFileVersion>
+ </PropertyGroup>
+ <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
+ <OutDir>debugobj\</OutDir>
+ <IntDir>debugobj\</IntDir>
+ <NMakeBuildCommandLine>cd .. && nmake -f psi\msvc32.mak SBR=1 DEVSTUDIO= gpdfdebug && nmake -f psi\msvc32.mak DEVSTUDIO= debugbsc</NMakeBuildCommandLine>
+ <NMakeReBuildCommandLine>cd .. && nmake -f psi\msvc32.mak DEVSTUDIO= debugclean && nmake -f psi\msvc32.mak SBR=1 DEVSTUDIO= gpdfdebug && nmake -f psi\msvc32.mak DEVSTUDIO= debugbsc</NMakeReBuildCommandLine>
+ <NMakeCleanCommandLine>cd .. && nmake -f psi\msvc32.mak DEVSTUDIO= debugclean</NMakeCleanCommandLine>
+ <NMakeOutput>$(ProjectDir)\..\debugbin\gpdfwin32c.exe</NMakeOutput>
+ <NMakePreprocessorDefinitions>WIN32;_DEBUG;DEBUG=1;TDEBUG=1;HAVE_SSE2=1;$(NMakePreprocessorDefinitions)</NMakePreprocessorDefinitions>
+ </PropertyGroup>
+ <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
+ <OutDir>debugobj64\</OutDir>
+ <IntDir>debugobj64\</IntDir>
+ <NMakeBuildCommandLine>cd .. && nmake -f psi\msvc32.mak WIN64= SBR=1 DEVSTUDIO= gpdfdebug && nmake -f psi\msvc32.mak WIN64= DEVSTUDIO= debugbsc</NMakeBuildCommandLine>
+ <NMakeReBuildCommandLine>cd .. && nmake -f psi\msvc32.mak WIN64= DEVSTUDIO= debugclean && nmake -f psi\msvc32.mak WIN64= SBR=1 DEVSTUDIO= gpdfdebug && nmake -f psi\msvc32.mak WIN64= DEVSTUDIO= debugbsc</NMakeReBuildCommandLine>
+ <NMakeCleanCommandLine>cd .. && nmake -f psi\msvc32.mak WIN64= DEVSTUDIO= debugclean</NMakeCleanCommandLine>
+ <NMakeOutput>$(ProjectDir)\..\debugbin\gpdfwin64c.exe</NMakeOutput>
+ <NMakePreprocessorDefinitions>WIN64;_DEBUG;DEBUG=1;TDEBUG=1;$(NMakePreprocessorDefinitions)</NMakePreprocessorDefinitions>
+ </PropertyGroup>
+ <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
+ <OutDir>obj\</OutDir>
+ <IntDir>obj\</IntDir>
+ <NMakeBuildCommandLine>cd .. && nmake -f psi\msvc32.mak SBR=1 DEVSTUDIO= gpdf && nmake -f psi\msvc32.mak DEVSTUDIO= bsc</NMakeBuildCommandLine>
+ <NMakeReBuildCommandLine>cd .. && nmake -f psi\msvc32.mak DEVSTUDIO= clean && nmake -f psi\msvc32.mak SBR=1 DEVSTUDIO= gpdf && nmake -f psi\msvc32.mak DEVSTUDIO= bsc</NMakeReBuildCommandLine>
+ <NMakeCleanCommandLine>cd .. && nmake -f psi\msvc32.mak DEVSTUDIO= clean</NMakeCleanCommandLine>
+ <NMakeOutput>$(ProjectDir)\..\bin\gpdfwin32c.exe</NMakeOutput>
+ <NMakePreprocessorDefinitions>WIN32;NDEBUG;HAVE_SSE2=1;$(NMakePreprocessorDefinitions)</NMakePreprocessorDefinitions>
+ </PropertyGroup>
+ <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
+ <OutDir>obj64\</OutDir>
+ <IntDir>obj64\</IntDir>
+ <NMakeBuildCommandLine>cd .. && nmake -f psi\msvc32.mak WIN64= SBR=1 DEVSTUDIO= gpdf && nmake -f psi\msvc32.mak WIN64= DEVSTUDIO= bsc</NMakeBuildCommandLine>
+ <NMakeReBuildCommandLine>cd .. && nmake -f psi\msvc32.mak WIN64= DEVSTUDIO= clean && nmake -f psi\msvc32.mak WIN64= SBR=1 DEVSTUDIO= gpdf && nmake -f psi\msvc32.mak WIN64= DEVSTUDIO= bsc</NMakeReBuildCommandLine>
+ <NMakeCleanCommandLine>cd .. && nmake -f psi\msvc32.mak WIN64= DEVSTUDIO= clean</NMakeCleanCommandLine>
+ <NMakeOutput>$(ProjectDir)\..\bin\gpdfwin64c.exe</NMakeOutput>
+ <NMakePreprocessorDefinitions>WIN32;NDEBUG;$(NMakePreprocessorDefinitions)</NMakePreprocessorDefinitions>
+ </PropertyGroup>
+ <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Profile|Win32'">
+ <OutDir>profobj\</OutDir>
+ <IntDir>profobj\</IntDir>
+ <NMakeBuildCommandLine>cd .. && nmake -f psi\msvc32.mak SBR=1 DEVSTUDIO= gpdfprofile && nmake -f psi\msvc32.mak DEVSTUDIO= profilebsc</NMakeBuildCommandLine>
+ <NMakeReBuildCommandLine>cd .. && nmake -f psi\msvc32.mak DEVSTUDIO= profileclean && nmake -f psi\msvc32.mak SBR=1 DEVSTUDIO= gpdfprofile && nmake -f psi\msvc32.mak DEVSTUDIO= profilebsc</NMakeReBuildCommandLine>
+ <NMakeCleanCommandLine>cd .. && nmake -f psi\msvc32.mak DEVSTUDIO= profileclean</NMakeCleanCommandLine>
+ <NMakeOutput>$(ProjectDir)\..\profbin\gpdfwin32c.exe</NMakeOutput>
+ <NMakePreprocessorDefinitions>WIN32;NDEBUG;DEBUG=0;TDEBUG=0;DEBUGSYM=1;HAVE_SSE2=1;$(NMakePreprocessorDefinitions)</NMakePreprocessorDefinitions>
+ </PropertyGroup>
+ <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Profile|x64'">
+ <OutDir>profobj64\</OutDir>
+ <IntDir>profobj64\</IntDir>
+ <NMakeBuildCommandLine>cd .. && nmake -f psi\msvc32.mak WIN64= SBR=1 DEVSTUDIO= gpdfprofile && nmake -f psi\msvc32.mak WIN64= DEVSTUDIO= profilebsc</NMakeBuildCommandLine>
+ <NMakeReBuildCommandLine>cd .. && nmake -f psi\msvc32.mak WIN64= DEVSTUDIO= profileclean && nmake -f psi\msvc32.mak WIN64= SBR=1 DEVSTUDIO= gpdfprofile && nmake -f psi\msvc32.mak WIN64= DEVSTUDIO= profilebsc</NMakeReBuildCommandLine>
+ <NMakeCleanCommandLine>cd .. && nmake -f psi\msvc32.mak WIN64= DEVSTUDIO= profileclean</NMakeCleanCommandLine>
+ <NMakeOutput>$(ProjectDir)\..\profbin\gpdfwin64c.exe</NMakeOutput>
+ <NMakePreprocessorDefinitions>WIN64;_DEBUG;DEBUG=1;TDEBUG=1;$(NMakePreprocessorDefinitions)</NMakePreprocessorDefinitions>
+ </PropertyGroup>
+ <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Memento|Win32'">
+ <OutDir>memobj\</OutDir>
+ <IntDir>memobj\</IntDir>
+ <NMakeBuildCommandLine>cd .. && nmake -f psi\msvc32.mak SBR=1 DEVSTUDIO= gpdfmemento && nmake -f psi\msvc32.mak DEVSTUDIO= mementobsc</NMakeBuildCommandLine>
+ <NMakeReBuildCommandLine>cd .. && nmake -f psi\msvc32.mak DEVSTUDIO= mementoclean && nmake -f psi\msvc32.mak SBR=1 DEVSTUDIO= gpdfmemento && nmake -f psi\msvc32.mak DEVSTUDIO= mementobsc</NMakeReBuildCommandLine>
+ <NMakeCleanCommandLine>cd .. && nmake -f psi\msvc32.mak DEVSTUDIO= mementoclean</NMakeCleanCommandLine>
+ <NMakeOutput>$(ProjectDir)\..\membin\gpdfwin32c.exe</NMakeOutput>
+ <NMakePreprocessorDefinitions>WIN32;_DEBUG;DEBUG=1;TDEBUG=1;HAVE_SSE2=1;MEMENTO=1;$(NMakePreprocessorDefinitions)</NMakePreprocessorDefinitions>
+ </PropertyGroup>
+ <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Memento|x64'">
+ <OutDir>memobj64\</OutDir>
+ <IntDir>memobj64\</IntDir>
+ <NMakeBuildCommandLine>cd .. && nmake -f psi\msvc32.mak WIN64= SBR=1 DEVSTUDIO= gpdfmemento && nmake -f psi\msvc32.mak WIN64= DEVSTUDIO= mementobsc</NMakeBuildCommandLine>
+ <NMakeReBuildCommandLine>cd .. && nmake -f psi\msvc32.mak WIN64= DEVSTUDIO= mementoclean && nmake -f psi\msvc32.mak WIN64= SBR=1 DEVSTUDIO= gpdfmemento && nmake -f psi\msvc32.mak WIN64= DEVSTUDIO= mementobsc</NMakeReBuildCommandLine>
+ <NMakeCleanCommandLine>cd .. && nmake -f psi\msvc32.mak WIN64= DEVSTUDIO= mementoclean</NMakeCleanCommandLine>
+ <NMakeOutput>$(ProjectDir)\..\membin\gpdfwin64c.exe</NMakeOutput>
+ <NMakePreprocessorDefinitions>WIN64;_DEBUG;DEBUG=1;TDEBUG=1;$(NMakePreprocessorDefinitions)</NMakePreprocessorDefinitions>
+ </PropertyGroup>
+ <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug-cups|Win32'">
+ <OutDir>$(Configuration)\</OutDir>
+ <IntDir>$(Configuration)\</IntDir>
+ <NMakeBuildCommandLine>cd .. && nmake -f psi\msvc32.mak SBR=1 DEVSTUDIO= WITH_CUPS=1 gpdfdebug && nmake -f psi\msvc32.mak DEVSTUDIO= WITH_CUPS=1 debugbsc</NMakeBuildCommandLine>
+ <NMakeReBuildCommandLine>cd .. && nmake -f psi\msvc32.mak DEVSTUDIO= WITH_CUPS=1 debugclean && nmake -f psi\msvc32.mak SBR=1 DEVSTUDIO= WITH_CUPS=1 gpdfdebug && nmake -f psi\msvc32.mak DEVSTUDIO= WITH_CUPS=1 debugbsc</NMakeReBuildCommandLine>
+ <NMakeCleanCommandLine>cd .. && nmake -f psi\msvc32.mak DEVSTUDIO= WITH_CUPS=1 debugclean</NMakeCleanCommandLine>
+ <NMakeOutput>$(ProjectDir)\..\debugbin\gpdfwin32c.exe</NMakeOutput>
+ <NMakePreprocessorDefinitions>WIN32;_DEBUG;DEBUG=1;TDEBUG=1;HAVE_SSE2=1;$(NMakePreprocessorDefinitions)</NMakePreprocessorDefinitions>
+ </PropertyGroup>
+ <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug-cups|x64'">
+ <OutDir>$(Platform)\$(Configuration)\</OutDir>
+ <IntDir>$(Platform)\$(Configuration)\</IntDir>
+ <NMakeBuildCommandLine>cd .. && nmake -f psi\msvc32.mak WIN64= SBR=1 DEVSTUDIO= WITH_CUPS=1 gpdfdebug && nmake -f psi\msvc32.mak WIN64= DEVSTUDIO= WITH_CUPS=1 debugbsc</NMakeBuildCommandLine>
+ <NMakeReBuildCommandLine>cd .. && nmake -f psi\msvc32.mak WIN64= DEVSTUDIO= WITH_CUPS=1 debugclean && nmake -f psi\msvc32.mak WIN64= SBR=1 DEVSTUDIO= WITH_CUPS=1 gpdfdebug && nmake -f psi\msvc32.mak WIN64= DEVSTUDIO= WITH_CUPS=1 debugbsc</NMakeReBuildCommandLine>
+ <NMakeCleanCommandLine>cd .. && nmake -f psi\msvc32.mak WIN64= DEVSTUDIO= debugclean</NMakeCleanCommandLine>
+ <NMakeOutput>$(ProjectDir)\..\debugbin\gpdfwin64c.exe</NMakeOutput>
+ <NMakePreprocessorDefinitions>WIN64;_DEBUG;DEBUG=1;TDEBUG=1;$(NMakePreprocessorDefinitions)</NMakePreprocessorDefinitions>
+ </PropertyGroup>
+ <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug-contrib|Win32'">
+ <OutDir>$(Configuration)\</OutDir>
+ <IntDir>$(Configuration)\</IntDir>
+ <NMakeBuildCommandLine>cd .. && nmake -f psi\msvc32.mak SBR=1 DEVSTUDIO= WITH_CONTRIB=1 gpdfdebug && nmake -f psi\msvc32.mak DEVSTUDIO= WITH_CONTRIB=1 debugbsc</NMakeBuildCommandLine>
+ <NMakeReBuildCommandLine>cd .. && nmake -f psi\msvc32.mak DEVSTUDIO= WITH_CONTRIB=1 debugclean && nmake -f psi\msvc32.mak SBR=1 DEVSTUDIO= WITH_CUPS=1 gpdfdebug && nmake -f psi\msvc32.mak DEVSTUDIO= WITH_CONTRIB=1 debugbsc</NMakeReBuildCommandLine>
+ <NMakeCleanCommandLine>cd .. && nmake -f psi\msvc32.mak DEVSTUDIO= WITH_CONTRIB=1 debugclean</NMakeCleanCommandLine>
+ <NMakeOutput>$(ProjectDir)\..\debugbin\gpdfwin32c.exe</NMakeOutput>
+ <NMakePreprocessorDefinitions>WIN32;_DEBUG;DEBUG=1;TDEBUG=1;HAVE_SSE2=1;$(NMakePreprocessorDefinitions)</NMakePreprocessorDefinitions>
+ </PropertyGroup>
+ <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug-contrib|x64'">
+ <OutDir>$(Platform)\$(Configuration)\</OutDir>
+ <IntDir>$(Platform)\$(Configuration)\</IntDir>
+ <NMakeBuildCommandLine>cd .. && nmake -f psi\msvc32.mak WIN64= SBR=1 DEVSTUDIO= WITH_CUPS=1 gpdfdebug && nmake -f psi\msvc32.mak WIN64= DEVSTUDIO= WITH_CUPS=1 debugbsc</NMakeBuildCommandLine>
+ <NMakeReBuildCommandLine>cd .. && nmake -f psi\msvc32.mak WIN64= DEVSTUDIO= WITH_CUPS=1 debugclean && nmake -f psi\msvc32.mak WIN64= SBR=1 DEVSTUDIO= WITH_CUPS=1 gpdfdebug && nmake -f psi\msvc32.mak WIN64= DEVSTUDIO= WITH_CUPS=1 debugbsc</NMakeReBuildCommandLine>
+ <NMakeCleanCommandLine>cd .. && nmake -f psi\msvc32.mak WIN64= DEVSTUDIO= debugclean</NMakeCleanCommandLine>
+ <NMakeOutput>$(ProjectDir)\..\debugbin\gpdfwin64c.exe</NMakeOutput>
+ <NMakePreprocessorDefinitions>WIN64;_DEBUG;DEBUG=1;TDEBUG=1;$(NMakePreprocessorDefinitions)</NMakePreprocessorDefinitions>
+ </PropertyGroup>
+ <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release-contrib|Win32'">
+ <OutDir>$(Configuration)\</OutDir>
+ <IntDir>$(Configuration)\</IntDir>
+ <NMakeBuildCommandLine>cd .. && nmake -f psi\msvc32.mak SBR=1 DEVSTUDIO= gpdf && nmake -f psi\msvc32.mak DEVSTUDIO= bsc</NMakeBuildCommandLine>
+ <NMakeReBuildCommandLine>cd .. && nmake -f psi\msvc32.mak DEVSTUDIO= clean && nmake -f psi\msvc32.mak SBR=1 DEVSTUDIO= gpdf && nmake -f psi\msvc32.mak DEVSTUDIO= bsc</NMakeReBuildCommandLine>
+ <NMakeCleanCommandLine>cd .. && nmake -f psi\msvc32.mak DEVSTUDIO= clean</NMakeCleanCommandLine>
+ <NMakeOutput>$(ProjectDir)\..\bin\gpdfwin32c.exe</NMakeOutput>
+ <NMakePreprocessorDefinitions>WIN32;NDEBUG;HAVE_SSE2=1;$(NMakePreprocessorDefinitions)</NMakePreprocessorDefinitions>
+ </PropertyGroup>
+ <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release-contrib|x64'">
+ <OutDir>$(Platform)\$(Configuration)\</OutDir>
+ <IntDir>$(Platform)\$(Configuration)\</IntDir>
+ <NMakeBuildCommandLine>cd .. && nmake -f psi\msvc32.mak WIN64= WITH_CONTRIB=1 SBR=1 DEVSTUDIO= WITH_CONTRIB=1 gpdf && nmake -f psi\msvc32.mak WIN64= WITH_CONTRIB=1 DEVSTUDIO= bsc</NMakeBuildCommandLine>
+ <NMakeReBuildCommandLine>cd .. && nmake -f psi\msvc32.mak WIN64= WITH_CONTRIB=1 DEVSTUDIO= clean && nmake -f psi\msvc32.mak WIN64= SBR=1 WITH_CONTRIB=1 DEVSTUDIO= gpdf && nmake -f psi\msvc32.mak WIN64= WITH_CONTRIB=1 DEVSTUDIO= bsc</NMakeReBuildCommandLine>
+ <NMakeCleanCommandLine>cd .. && nmake -f psi\msvc32.mak WIN64= WITH_CONTRIB=1 DEVSTUDIO= clean</NMakeCleanCommandLine>
+ <NMakeOutput>$(ProjectDir)\..\bin\gpdfwin64c.exe</NMakeOutput>
+ <NMakePreprocessorDefinitions>WIN32;NDEBUG;$(NMakePreprocessorDefinitions)</NMakePreprocessorDefinitions>
+ </PropertyGroup>
+ <ItemDefinitionGroup>
+ </ItemDefinitionGroup>
+ <ItemGroup>
+ <ClCompile Include="..\pdf\ghostpdf.c" />
+ <ClCompile Include="..\pdf\pdftop.c" />
+ <ClCompile Include="..\pdf\pdf_array.c" />
+ <ClCompile Include="..\pdf\pdf_colour.c" />
+ <ClCompile Include="..\pdf\pdf_dict.c" />
+ <ClCompile Include="..\pdf\pdf_file.c" />
+ <ClCompile Include="..\pdf\pdf_font.c" />
+ <ClCompile Include="..\pdf\pdf_font0.c" />
+ <ClCompile Include="..\pdf\pdf_font1.c" />
+ <ClCompile Include="..\pdf\pdf_font1C.c" />
+ <ClCompile Include="..\pdf\pdf_font3.c" />
+ <ClCompile Include="..\pdf\pdf_fontTT.c" />
+ <ClCompile Include="..\pdf\pdf_func.c" />
+ <ClCompile Include="..\pdf\pdf_gstate.c" />
+ <ClCompile Include="..\pdf\pdf_image.c" />
+ <ClCompile Include="..\pdf\pdf_int.c" />
+ <ClCompile Include="..\pdf\pdf_loop_detect.c" />
+ <ClCompile Include="..\pdf\pdf_path.c" />
+ <ClCompile Include="..\pdf\pdf_pattern.c" />
+ <ClCompile Include="..\pdf\pdf_shading.c" />
+ <ClCompile Include="..\pdf\pdf_stack.c" />
+ <ClCompile Include="..\pdf\pdf_text.c" />
+ <ClCompile Include="..\pdf\pdf_trans.c" />
+ <ClCompile Include="..\pdf\pdf_xref.c" />
+ </ItemGroup>
+ <ItemGroup>
+ <ClInclude Include="..\pdf\ghostpdf.h" />
+ <ClInclude Include="..\pdf\pdf_array.h" />
+ <ClInclude Include="..\pdf\pdf_colour.h" />
+ <ClInclude Include="..\pdf\pdf_dict.h" />
+ <ClInclude Include="..\pdf\pdf_file.h" />
+ <ClInclude Include="..\pdf\pdf_font.h" />
+ <ClInclude Include="..\pdf\pdf_font0.h" />
+ <ClInclude Include="..\pdf\pdf_font1.h" />
+ <ClInclude Include="..\pdf\pdf_font1C.h" />
+ <ClInclude Include="..\pdf\pdf_font3.h" />
+ <ClInclude Include="..\pdf\pdf_fontTT.h" />
+ <ClInclude Include="..\pdf\pdf_func.h" />
+ <ClInclude Include="..\pdf\pdf_gstate.h" />
+ <ClInclude Include="..\pdf\pdf_image.h" />
+ <ClInclude Include="..\pdf\pdf_int.h" />
+ <ClInclude Include="..\pdf\pdf_loop_detect.h" />
+ <ClInclude Include="..\pdf\pdf_path.h" />
+ <ClInclude Include="..\pdf\pdf_pattern.h" />
+ <ClInclude Include="..\pdf\pdf_shading.h" />
+ <ClInclude Include="..\pdf\pdf_stack.h" />
+ <ClInclude Include="..\pdf\pdf_text.h" />
+ <ClInclude Include="..\pdf\pdf_trans.h" />
+ <ClInclude Include="..\pdf\pdf_types.h" />
+ <ClInclude Include="..\pdf\pdf_xref.h" />
+ </ItemGroup>
+ <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
+ <ImportGroup Label="ExtensionTargets">
+ </ImportGroup>
+</Project>
\ No newline at end of file
diff --git a/windows/ghostpdf.vcxproj.filters b/windows/ghostpdf.vcxproj.filters
new file mode 100644
index 0000000..1b7e921
--- /dev/null
+++ b/windows/ghostpdf.vcxproj.filters
@@ -0,0 +1,159 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+ <ItemGroup>
+ <Filter Include="pdf %28%2a.c%29">
+ <UniqueIdentifier>{d24cdec9-c0b8-420c-95cc-57a65ea6a8f6}</UniqueIdentifier>
+ </Filter>
+ <Filter Include="pdf %28%2a.h%29">
+ <UniqueIdentifier>{2979d80e-156d-413a-88a9-a4704eff2539}</UniqueIdentifier>
+ </Filter>
+ </ItemGroup>
+ <ItemGroup>
+ <ClCompile Include="..\pdf\ghostpdf.c">
+ <Filter>pdf %28%2a.c%29</Filter>
+ </ClCompile>
+ <ClCompile Include="..\pdf\pdf_array.c">
+ <Filter>pdf %28%2a.c%29</Filter>
+ </ClCompile>
+ <ClCompile Include="..\pdf\pdf_colour.c">
+ <Filter>pdf %28%2a.c%29</Filter>
+ </ClCompile>
+ <ClCompile Include="..\pdf\pdf_dict.c">
+ <Filter>pdf %28%2a.c%29</Filter>
+ </ClCompile>
+ <ClCompile Include="..\pdf\pdf_file.c">
+ <Filter>pdf %28%2a.c%29</Filter>
+ </ClCompile>
+ <ClCompile Include="..\pdf\pdf_font.c">
+ <Filter>pdf %28%2a.c%29</Filter>
+ </ClCompile>
+ <ClCompile Include="..\pdf\pdf_font0.c">
+ <Filter>pdf %28%2a.c%29</Filter>
+ </ClCompile>
+ <ClCompile Include="..\pdf\pdf_font1.c">
+ <Filter>pdf %28%2a.c%29</Filter>
+ </ClCompile>
+ <ClCompile Include="..\pdf\pdf_font1C.c">
+ <Filter>pdf %28%2a.c%29</Filter>
+ </ClCompile>
+ <ClCompile Include="..\pdf\pdf_font3.c">
+ <Filter>pdf %28%2a.c%29</Filter>
+ </ClCompile>
+ <ClCompile Include="..\pdf\pdf_fontTT.c">
+ <Filter>pdf %28%2a.c%29</Filter>
+ </ClCompile>
+ <ClCompile Include="..\pdf\pdf_func.c">
+ <Filter>pdf %28%2a.c%29</Filter>
+ </ClCompile>
+ <ClCompile Include="..\pdf\pdf_gstate.c">
+ <Filter>pdf %28%2a.c%29</Filter>
+ </ClCompile>
+ <ClCompile Include="..\pdf\pdf_image.c">
+ <Filter>pdf %28%2a.c%29</Filter>
+ </ClCompile>
+ <ClCompile Include="..\pdf\pdf_int.c">
+ <Filter>pdf %28%2a.c%29</Filter>
+ </ClCompile>
+ <ClCompile Include="..\pdf\pdf_loop_detect.c">
+ <Filter>pdf %28%2a.c%29</Filter>
+ </ClCompile>
+ <ClCompile Include="..\pdf\pdf_path.c">
+ <Filter>pdf %28%2a.c%29</Filter>
+ </ClCompile>
+ <ClCompile Include="..\pdf\pdf_pattern.c">
+ <Filter>pdf %28%2a.c%29</Filter>
+ </ClCompile>
+ <ClCompile Include="..\pdf\pdf_shading.c">
+ <Filter>pdf %28%2a.c%29</Filter>
+ </ClCompile>
+ <ClCompile Include="..\pdf\pdf_stack.c">
+ <Filter>pdf %28%2a.c%29</Filter>
+ </ClCompile>
+ <ClCompile Include="..\pdf\pdf_text.c">
+ <Filter>pdf %28%2a.c%29</Filter>
+ </ClCompile>
+ <ClCompile Include="..\pdf\pdf_trans.c">
+ <Filter>pdf %28%2a.c%29</Filter>
+ </ClCompile>
+ <ClCompile Include="..\pdf\pdf_xref.c">
+ <Filter>pdf %28%2a.c%29</Filter>
+ </ClCompile>
+ <ClCompile Include="..\pdf\pdftop.c">
+ <Filter>pdf %28%2a.c%29</Filter>
+ </ClCompile>
+ </ItemGroup>
+ <ItemGroup>
+ <ClInclude Include="..\pdf\ghostpdf.h">
+ <Filter>pdf %28%2a.h%29</Filter>
+ </ClInclude>
+ <ClInclude Include="..\pdf\pdf_array.h">
+ <Filter>pdf %28%2a.h%29</Filter>
+ </ClInclude>
+ <ClInclude Include="..\pdf\pdf_colour.h">
+ <Filter>pdf %28%2a.h%29</Filter>
+ </ClInclude>
+ <ClInclude Include="..\pdf\pdf_dict.h">
+ <Filter>pdf %28%2a.h%29</Filter>
+ </ClInclude>
+ <ClInclude Include="..\pdf\pdf_file.h">
+ <Filter>pdf %28%2a.h%29</Filter>
+ </ClInclude>
+ <ClInclude Include="..\pdf\pdf_font.h">
+ <Filter>pdf %28%2a.h%29</Filter>
+ </ClInclude>
+ <ClInclude Include="..\pdf\pdf_font0.h">
+ <Filter>pdf %28%2a.h%29</Filter>
+ </ClInclude>
+ <ClInclude Include="..\pdf\pdf_font1.h">
+ <Filter>pdf %28%2a.h%29</Filter>
+ </ClInclude>
+ <ClInclude Include="..\pdf\pdf_font1C.h">
+ <Filter>pdf %28%2a.h%29</Filter>
+ </ClInclude>
+ <ClInclude Include="..\pdf\pdf_font3.h">
+ <Filter>pdf %28%2a.h%29</Filter>
+ </ClInclude>
+ <ClInclude Include="..\pdf\pdf_fontTT.h">
+ <Filter>pdf %28%2a.h%29</Filter>
+ </ClInclude>
+ <ClInclude Include="..\pdf\pdf_func.h">
+ <Filter>pdf %28%2a.h%29</Filter>
+ </ClInclude>
+ <ClInclude Include="..\pdf\pdf_gstate.h">
+ <Filter>pdf %28%2a.h%29</Filter>
+ </ClInclude>
+ <ClInclude Include="..\pdf\pdf_image.h">
+ <Filter>pdf %28%2a.h%29</Filter>
+ </ClInclude>
+ <ClInclude Include="..\pdf\pdf_int.h">
+ <Filter>pdf %28%2a.h%29</Filter>
+ </ClInclude>
+ <ClInclude Include="..\pdf\pdf_loop_detect.h">
+ <Filter>pdf %28%2a.h%29</Filter>
+ </ClInclude>
+ <ClInclude Include="..\pdf\pdf_path.h">
+ <Filter>pdf %28%2a.h%29</Filter>
+ </ClInclude>
+ <ClInclude Include="..\pdf\pdf_pattern.h">
+ <Filter>pdf %28%2a.h%29</Filter>
+ </ClInclude>
+ <ClInclude Include="..\pdf\pdf_shading.h">
+ <Filter>pdf %28%2a.h%29</Filter>
+ </ClInclude>
+ <ClInclude Include="..\pdf\pdf_stack.h">
+ <Filter>pdf %28%2a.h%29</Filter>
+ </ClInclude>
+ <ClInclude Include="..\pdf\pdf_text.h">
+ <Filter>pdf %28%2a.h%29</Filter>
+ </ClInclude>
+ <ClInclude Include="..\pdf\pdf_trans.h">
+ <Filter>pdf %28%2a.h%29</Filter>
+ </ClInclude>
+ <ClInclude Include="..\pdf\pdf_types.h">
+ <Filter>pdf %28%2a.h%29</Filter>
+ </ClInclude>
+ <ClInclude Include="..\pdf\pdf_xref.h">
+ <Filter>pdf %28%2a.h%29</Filter>
+ </ClInclude>
+ </ItemGroup>
+</Project>
\ No newline at end of file
----------------------------------------------------------------------
commit 6e289c291d6f2789d389e2e2c32144c2ae4aff4d
Merge: 3dc031e c53f9d9
Author: Ken Sharp <[email protected]>
Date: Mon Jan 6 09:56:16 2020 +0000
Merge branch 'master' into pdfi
diff --cc psi/msvc.mak
index 2bc8988,568b795..6c505f4
--- a/psi/msvc.mak
+++ b/psi/msvc.mak
@@@ -2056,31 -2019,36 +2137,39 @@@ WINDEFS=WIN64= BUILD_SYSTEM="$(BUILD_SY
WINDEFS=BUILD_SYSTEM="$(BUILD_SYSTEM)" PGMFILES="$(PGMFILES)" PGMFILESx86="$(PGMFILESx86)"
!endif
- DEBUGDEFS=DEBUG=1 TDEBUG=1
+ RECURSIVEDEFS=$(WINDEFS)
+ !ifdef XP
+ RECURSIVEDEFS=XP=$(XP) $(RECURSIVEDEFS)
+ !endif
+ !ifdef DEVSTUDIO
+ RECURSIVEDEFS=DEVSTUDIO="$(DEVSTUDIO)" $(RECURSIVEDEFS)
+ !endif
+
+ DEBUGDEFS=DEBUG=1 TDEBUG=1 $(RECURSIVEDEFS)
debug:
- nmake -f $(MAKEFILE) DEVSTUDIO="$(DEVSTUDIO)" FT_BRIDGE=$(FT_BRIDGE) $(DEBUGDEFS) $(WINDEFS)
+ nmake -f $(MAKEFILE) $(DEBUGDEFS) FT_BRIDGE=$(FT_BRIDGE)
gsdebug:
- nmake -f $(MAKEFILE) DEVSTUDIO="$(DEVSTUDIO)" FT_BRIDGE=$(FT_BRIDGE) $(DEBUGDEFS) $(WINDEFS) gs
+ nmake -f $(MAKEFILE) $(DEBUGDEFS) FT_BRIDGE=$(FT_BRIDGE) gs
gpcl6debug:
- nmake -f $(MAKEFILE) DEVSTUDIO="$(DEVSTUDIO)" FT_BRIDGE=$(FT_BRIDGE) $(DEBUGDEFS) $(WINDEFS) gpcl6
+ nmake -f $(MAKEFILE) $(DEBUGDEFS) FT_BRIDGE=$(FT_BRIDGE) gpcl6
gxpsdebug:
- nmake -f $(MAKEFILE) DEVSTUDIO="$(DEVSTUDIO)" FT_BRIDGE=$(FT_BRIDGE) $(DEBUGDEFS) $(WINDEFS) gxps
+ nmake -f $(MAKEFILE) $(DEBUGDEFS) FT_BRIDGE=$(FT_BRIDGE) gxps
+gpdfdebug:
+ nmake -f $(MAKEFILE) DEVSTUDIO="$(DEVSTUDIO)" FT_BRIDGE=$(FT_BRIDGE) $(DEBUGDEFS) $(WINDEFS) gpdf
+
gpdldebug:
- nmake -f $(MAKEFILE) DEVSTUDIO="$(DEVSTUDIO)" FT_BRIDGE=$(FT_BRIDGE) $(DEBUGDEFS) $(WINDEFS) gpdl
+ nmake -f $(MAKEFILE) $(DEBUGDEFS) FT_BRIDGE=$(FT_BRIDGE) gpdl
debugclean:
- nmake -f $(MAKEFILE) DEVSTUDIO="$(DEVSTUDIO)" FT_BRIDGE=$(FT_BRIDGE) $(DEBUGDEFS) $(WINDEFS) clean
+ nmake -f $(MAKEFILE) $(DEBUGDEFS) FT_BRIDGE=$(FT_BRIDGE) clean
debugbsc:
- nmake -f $(MAKEFILE) DEVSTUDIO="$(DEVSTUDIO)" FT_BRIDGE=$(FT_BRIDGE) $(DEBUGDEFS) $(WINDEFS) bsc
+ nmake -f $(MAKEFILE) $(DEBUGDEFS) FT_BRIDGE=$(FT_BRIDGE) bsc
# --------------------- Memento targets --------------------- #
# Simply set some definitions and call ourselves back #
@@@ -2088,28 -2056,25 +2177,28 @@@
MEMENTODEFS=$(DEBUGDEFS) MEMENTO=1
memento-target:
- nmake -f $(MAKEFILE) DEVSTUDIO="$(DEVSTUDIO)" FT_BRIDGE=$(FT_BRIDGE) $(MEMENTODEFS) $(WINDEFS)
+ nmake -f $(MAKEFILE) $(MEMENTODEFS) FT_BRIDGE=$(FT_BRIDGE)
gsmemento:
- nmake -f $(MAKEFILE) DEVSTUDIO="$(DEVSTUDIO)" FT_BRIDGE=$(FT_BRIDGE) $(MEMENTODEFS) $(WINDEFS) gs
+ nmake -f $(MAKEFILE) $(MEMENTODEFS) FT_BRIDGE=$(FT_BRIDGE) gs
gpcl6memento:
- nmake -f $(MAKEFILE) DEVSTUDIO="$(DEVSTUDIO)" FT_BRIDGE=$(FT_BRIDGE) $(MEMENTODEFS) $(WINDEFS) gpcl6
+ nmake -f $(MAKEFILE) $(MEMENTODEFS) FT_BRIDGE=$(FT_BRIDGE) gpcl6
gxpsmemento:
- nmake -f $(MAKEFILE) DEVSTUDIO="$(DEVSTUDIO)" FT_BRIDGE=$(FT_BRIDGE) $(MEMENTODEFS) $(WINDEFS) gxps
+ nmake -f $(MAKEFILE) $(MEMENTODEFS) FT_BRIDGE=$(FT_BRIDGE) gxps
+gpdfmemento:
+ nmake -f $(MAKEFILE) DEVSTUDIO="$(DEVSTUDIO)" FT_BRIDGE=$(FT_BRIDGE) $(MEMENTODEFS) $(WINDEFS) gpdf
+
gpdlmemento:
- nmake -f $(MAKEFILE) DEVSTUDIO="$(DEVSTUDIO)" FT_BRIDGE=$(FT_BRIDGE) $(MEMENTODEFS) $(WINDEFS) gpdl
+ nmake -f $(MAKEFILE) $(MEMENTODEFS) FT_BRIDGE=$(FT_BRIDGE) gpdl
mementoclean:
- nmake -f $(MAKEFILE) DEVSTUDIO="$(DEVSTUDIO)" FT_BRIDGE=$(FT_BRIDGE) $(MEMENTODEFS) $(WINDEFS) clean
+ nmake -f $(MAKEFILE) $(MEMENTODEFS) FT_BRIDGE=$(FT_BRIDGE) clean
mementobsc:
- nmake -f $(MAKEFILE) DEVSTUDIO="$(DEVSTUDIO)" FT_BRIDGE=$(FT_BRIDGE) $(MEMENTODEFS) $(WINDEFS) bsc
+ nmake -f $(MAKEFILE) $(MEMENTODEFS) FT_BRIDGE=$(FT_BRIDGE) bsc
# --------------------- Profile targets --------------------- #
# Simply set some definitions and call ourselves back #
@@@ -2118,28 -2083,25 +2207,28 @@@ PROFILEDEFS=$(RECURSIVEDEFS) PROFILE=
profile:
profile-target:
- nmake -f $(MAKEFILE) DEVSTUDIO="$(DEVSTUDIO)" FT_BRIDGE=$(FT_BRIDGE) $(PROFILEDEFS) $(WINDEFS)
+ nmake -f $(MAKEFILE) $(PROFILEDEFS) FT_BRIDGE=$(FT_BRIDGE)
gsprofile:
- nmake -f $(MAKEFILE) DEVSTUDIO="$(DEVSTUDIO)" FT_BRIDGE=$(FT_BRIDGE) $(PROFILEDEFS) $(WINDEFS) gs
+ nmake -f $(MAKEFILE) $(PROFILEDEFS) FT_BRIDGE=$(FT_BRIDGE) gs
gpcl6profile:
- nmake -f $(MAKEFILE) DEVSTUDIO="$(DEVSTUDIO)" FT_BRIDGE=$(FT_BRIDGE) $(PROFILEDEFS) $(WINDEFS) gpcl6
+ nmake -f $(MAKEFILE) $(PROFILEDEFS) FT_BRIDGE=$(FT_BRIDGE) gpcl6
gxpsprofile:
- nmake -f $(MAKEFILE) DEVSTUDIO="$(DEVSTUDIO)" FT_BRIDGE=$(FT_BRIDGE) $(PROFILEDEFS) $(WINDEFS) gxps
+ nmake -f $(MAKEFILE) $(PROFILEDEFS) FT_BRIDGE=$(FT_BRIDGE) gxps
+gpdfprofile:
+ nmake -f $(MAKEFILE) DEVSTUDIO="$(DEVSTUDIO)" FT_BRIDGE=$(FT_BRIDGE) $(PROFILEDEFS) $(WINDEFS) gpdf
+
gpdlprofile:
- nmake -f $(MAKEFILE) DEVSTUDIO="$(DEVSTUDIO)" FT_BRIDGE=$(FT_BRIDGE) $(PROFILEDEFS) $(WINDEFS) gpdl
+ nmake -f $(MAKEFILE) $(PROFILEDEFS) FT_BRIDGE=$(FT_BRIDGE) gpdl
profileclean:
- nmake -f $(MAKEFILE) DEVSTUDIO="$(DEVSTUDIO)" FT_BRIDGE=$(FT_BRIDGE) $(PROFILEDEFS) $(WINDEFS) clean
+ nmake -f $(MAKEFILE) $(PROFILEDEFS) FT_BRIDGE=$(FT_BRIDGE) clean
profilebsc:
- nmake -f $(MAKEFILE) DEVSTUDIO="$(DEVSTUDIO)" FT_BRIDGE=$(FT_BRIDGE) $(PROFILEDEFS) $(WINDEFS) bsc
+ nmake -f $(MAKEFILE) $(PROFILEDEFS) FT_BRIDGE=$(FT_BRIDGE) bsc
diff --cc windows/GhostPDL.sln
index dc58988,4753468..80d66a7
--- a/windows/GhostPDL.sln
+++ b/windows/GhostPDL.sln
@@@ -1,17 -1,17 +1,19 @@@
-
- Microsoft Visual Studio Solution File, Format Version 9.00
- # Visual Studio 2005
- Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "ghostscript", "ghostscript.vcproj", "{1EDA2AC3-D74F-4F4D-B4D6-AC05CC594A2F}"
+
+ Microsoft Visual Studio Solution File, Format Version 12.00
+ # Visual Studio Version 16
+ VisualStudioVersion = 16.0.29609.76
+ MinimumVisualStudioVersion = 10.0.40219.1
+ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "ghostscript", "ghostscript.vcxproj", "{1EDA2AC3-D74F-4F4D-B4D6-AC05CC594A2F}"
EndProject
- Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "ghostpcl", "ghostpcl.vcproj", "{ED35CF95-DAA1-45B3-9206-599F4170F198}"
+ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "ghostpcl", "ghostpcl.vcxproj", "{ED35CF95-DAA1-45B3-9206-599F4170F198}"
EndProject
- Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "ghostxps", "ghostxps.vcproj", "{DE21942C-CDA2-445B-B2EC-51FF54E0F0DD}"
+ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "ghostxps", "ghostxps.vcxproj", "{DE21942C-CDA2-445B-B2EC-51FF54E0F0DD}"
EndProject
- Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "ghostpdl", "ghostpdl.vcproj", "{C4038125-61B9-4147-9EA8-39690BA3A599}"
+ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "ghostpdl", "ghostpdl.vcxproj", "{C4038125-61B9-4147-9EA8-39690BA3A599}"
EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "All", "All.vcxproj", "{98351FEF-0032-457C-B9D9-D6B68A829386}"
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "ghostpdf", "ghostpdf.vcproj", "{4C038125-61B9-4147-9EA8-39690BA3A599}"
+EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "All", "All.vcproj", "{98351FEF-0032-457C-B9D9-D6B68A829386}"
EndProject
Global
GlobalSection(SolutionConfigurationPlatforms) = preSolution
Summary of changes:
Resource/Init/pdf_main.ps | 73 +-
base/gdevdevn.c | 40 +-
base/gsioram.c | 4 +-
base/lib.mak | 4 +-
base/mkromfs.c | 2 +-
base/msvccmd.mak | 7 +
base/msvclib.mak | 44 +
base/pack_ps.c | 2 +-
base/windows_.h | 2 +
devices/devs.mak | 22 +-
devices/gdevtsep.c | 239 +-
devices/vector/gdevpdtb.c | 2 +-
psi/msvc.mak | 173 +-
windows/All.vcxproj | 152 +-
windows/GhostPDL.sln | 101 +-
windows/ghostpcl.vcxproj | 616 ++
windows/ghostpcl.vcxproj.filters | 594 ++
windows/{All.vcxproj => ghostpdf.vcxproj} | 168 +-
windows/ghostpdf.vcxproj.filters | 159 +
windows/{All.vcxproj => ghostpdl.vcxproj} | 245 +-
windows/ghostpdl.vcxproj.filters | 31 +
...{ghostscript_rt.vcxproj => ghostscript.vcxproj} | 4134 ++++++------
windows/ghostscript.vcxproj.filters | 6988 ++++++++++++++++++++
windows/{All.vcxproj => ghostxps.vcxproj} | 270 +-
windows/ghostxps.vcxproj.filters | 105 +
25 files changed, 11732 insertions(+), 2445 deletions(-)
create mode 100644 windows/ghostpcl.vcxproj
create mode 100644 windows/ghostpcl.vcxproj.filters
copy windows/{All.vcxproj => ghostpdf.vcxproj} (70%)
create mode 100644 windows/ghostpdf.vcxproj.filters
copy windows/{All.vcxproj => ghostpdl.vcxproj} (54%)
create mode 100644 windows/ghostpdl.vcxproj.filters
copy windows/{ghostscript_rt.vcxproj => ghostscript.vcxproj} (83%)
create mode 100644 windows/ghostscript.vcxproj.filters
copy windows/{All.vcxproj => ghostxps.vcxproj} (53%)
create mode 100644 windows/ghostxps.vcxproj.filters