diff options
| author | Robin Watts <Robin.Watts@artifex.com> | 2021-11-12 14:09:41 +0000 |
|---|---|---|
| committer | Robin Watts <Robin.Watts@artifex.com> | 2021-11-12 14:11:12 +0000 |
| commit | e5197d3ae65e6b16012c4509000ff7efbb9e9d89 (patch) | |
| tree | 1b711d8775f0fc8f495f47a6219c8b2e51ef9e8a /windows | |
| parent | 8823793c8cfd7d973fc6abe0083bc8226b740b01 (diff) | |
| download | ghostpdl-e5197d3ae65e6b16012c4509000ff7efbb9e9d89.tar.gz | |
MSVC Solution: Fixes.
Fix mistaken inclusion of multi_test.vcxproj, and incorrect target
name of gpdf binarys.
Diffstat (limited to 'windows')
| -rw-r--r-- | windows/GhostPDL.sln | 49 | ||||
| -rw-r--r-- | windows/ghostpdf.vcproj | 28 | ||||
| -rw-r--r-- | windows/ghostpdf.vcxproj | 2 |
3 files changed, 15 insertions, 64 deletions
diff --git a/windows/GhostPDL.sln b/windows/GhostPDL.sln index 8902f6917..408e84737 100644 --- a/windows/GhostPDL.sln +++ b/windows/GhostPDL.sln @@ -15,11 +15,6 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "ghostpdf", "ghostpdf.vcxpro EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "All", "All.vcxproj", "{98351FEF-0032-457C-B9D9-D6B68A829386}" EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "multi_test", "..\demos\c\multi_test.vcxproj", "{6F11D63A-3533-47E5-8AA8-973D804443A0}" - ProjectSection(ProjectDependencies) = postProject - {C4038125-61B9-4147-9EA8-39690BA3A599} = {C4038125-61B9-4147-9EA8-39690BA3A599} - EndProjectSection -EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution Debug|Win32 = Debug|Win32 @@ -221,50 +216,6 @@ Global {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 - {6F11D63A-3533-47E5-8AA8-973D804443A0}.Debug|Win32.ActiveCfg = Debug|Win32 - {6F11D63A-3533-47E5-8AA8-973D804443A0}.Debug|Win32.Build.0 = Debug|Win32 - {6F11D63A-3533-47E5-8AA8-973D804443A0}.Debug|x64.ActiveCfg = Debug|x64 - {6F11D63A-3533-47E5-8AA8-973D804443A0}.Debug|x64.Build.0 = Debug|x64 - {6F11D63A-3533-47E5-8AA8-973D804443A0}.Debug-contrib|Win32.ActiveCfg = Debug|Win32 - {6F11D63A-3533-47E5-8AA8-973D804443A0}.Debug-contrib|Win32.Build.0 = Debug|Win32 - {6F11D63A-3533-47E5-8AA8-973D804443A0}.Debug-contrib|x64.ActiveCfg = Debug|x64 - {6F11D63A-3533-47E5-8AA8-973D804443A0}.Debug-contrib|x64.Build.0 = Debug|x64 - {6F11D63A-3533-47E5-8AA8-973D804443A0}.Debug-cups|Win32.ActiveCfg = Debug|Win32 - {6F11D63A-3533-47E5-8AA8-973D804443A0}.Debug-cups|Win32.Build.0 = Debug|Win32 - {6F11D63A-3533-47E5-8AA8-973D804443A0}.Debug-cups|x64.ActiveCfg = Debug|x64 - {6F11D63A-3533-47E5-8AA8-973D804443A0}.Debug-cups|x64.Build.0 = Debug|x64 - {6F11D63A-3533-47E5-8AA8-973D804443A0}.DebugXP|Win32.ActiveCfg = Debug|Win32 - {6F11D63A-3533-47E5-8AA8-973D804443A0}.DebugXP|Win32.Build.0 = Debug|Win32 - {6F11D63A-3533-47E5-8AA8-973D804443A0}.DebugXP|x64.ActiveCfg = Debug|x64 - {6F11D63A-3533-47E5-8AA8-973D804443A0}.DebugXP|x64.Build.0 = Debug|x64 - {6F11D63A-3533-47E5-8AA8-973D804443A0}.Memento|Win32.ActiveCfg = Memento|Win32 - {6F11D63A-3533-47E5-8AA8-973D804443A0}.Memento|Win32.Build.0 = Memento|Win32 - {6F11D63A-3533-47E5-8AA8-973D804443A0}.Memento|x64.ActiveCfg = Memento|x64 - {6F11D63A-3533-47E5-8AA8-973D804443A0}.Memento|x64.Build.0 = Memento|x64 - {6F11D63A-3533-47E5-8AA8-973D804443A0}.MementoXP|Win32.ActiveCfg = Memento|Win32 - {6F11D63A-3533-47E5-8AA8-973D804443A0}.MementoXP|Win32.Build.0 = Memento|Win32 - {6F11D63A-3533-47E5-8AA8-973D804443A0}.MementoXP|x64.ActiveCfg = Memento|x64 - {6F11D63A-3533-47E5-8AA8-973D804443A0}.MementoXP|x64.Build.0 = Memento|x64 - {6F11D63A-3533-47E5-8AA8-973D804443A0}.Profile|Win32.ActiveCfg = Debug|Win32 - {6F11D63A-3533-47E5-8AA8-973D804443A0}.Profile|Win32.Build.0 = Debug|Win32 - {6F11D63A-3533-47E5-8AA8-973D804443A0}.Profile|x64.ActiveCfg = Memento|x64 - {6F11D63A-3533-47E5-8AA8-973D804443A0}.Profile|x64.Build.0 = Memento|x64 - {6F11D63A-3533-47E5-8AA8-973D804443A0}.Release|Win32.ActiveCfg = Release|Win32 - {6F11D63A-3533-47E5-8AA8-973D804443A0}.Release|Win32.Build.0 = Release|Win32 - {6F11D63A-3533-47E5-8AA8-973D804443A0}.Release|x64.ActiveCfg = Release|x64 - {6F11D63A-3533-47E5-8AA8-973D804443A0}.Release|x64.Build.0 = Release|x64 - {6F11D63A-3533-47E5-8AA8-973D804443A0}.Release-contrib|Win32.ActiveCfg = Release|Win32 - {6F11D63A-3533-47E5-8AA8-973D804443A0}.Release-contrib|Win32.Build.0 = Release|Win32 - {6F11D63A-3533-47E5-8AA8-973D804443A0}.Release-contrib|x64.ActiveCfg = Release|x64 - {6F11D63A-3533-47E5-8AA8-973D804443A0}.Release-contrib|x64.Build.0 = Release|x64 - {6F11D63A-3533-47E5-8AA8-973D804443A0}.ReleaseXP|Win32.ActiveCfg = Release|Win32 - {6F11D63A-3533-47E5-8AA8-973D804443A0}.ReleaseXP|Win32.Build.0 = Release|Win32 - {6F11D63A-3533-47E5-8AA8-973D804443A0}.ReleaseXP|x64.ActiveCfg = Release|x64 - {6F11D63A-3533-47E5-8AA8-973D804443A0}.ReleaseXP|x64.Build.0 = Release|x64 - {6F11D63A-3533-47E5-8AA8-973D804443A0}.Sanitize|Win32.ActiveCfg = Debug|Win32 - {6F11D63A-3533-47E5-8AA8-973D804443A0}.Sanitize|Win32.Build.0 = Debug|Win32 - {6F11D63A-3533-47E5-8AA8-973D804443A0}.Sanitize|x64.ActiveCfg = Memento|x64 - {6F11D63A-3533-47E5-8AA8-973D804443A0}.Sanitize|x64.Build.0 = Memento|x64 EndGlobalSection GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE diff --git a/windows/ghostpdf.vcproj b/windows/ghostpdf.vcproj index 23c0c3a5d..f8dc7bdfc 100644 --- a/windows/ghostpdf.vcproj +++ b/windows/ghostpdf.vcproj @@ -29,7 +29,7 @@ BuildCommandLine="cd .. && nmake -f psi\msvc32.mak SBR=1 DEVSTUDIO= gpdfdebug && nmake -f psi\msvc32.mak DEVSTUDIO= debugbsc" ReBuildCommandLine="cd .. && nmake -f psi\msvc32.mak DEVSTUDIO= debugclean && nmake -f psi\msvc32.mak SBR=1 DEVSTUDIO= gpdfdebug && nmake -f psi\msvc32.mak DEVSTUDIO= debugbsc" CleanCommandLine="cd .. && nmake -f psi\msvc32.mak DEVSTUDIO= debugclean" - Output="$(ProjectDir)\..\debugbin\gpdfwin32c.exe" + Output="$(ProjectDir)\..\debugbin\gpdfwin32.exe" PreprocessorDefinitions="WIN32;_DEBUG;DEBUG=1;TDEBUG=1;HAVE_SSE2=1" IncludeSearchPath="" ForcedIncludes="" @@ -49,7 +49,7 @@ BuildCommandLine="cd .. && nmake -f psi\msvc32.mak WIN64= SBR=1 DEVSTUDIO= gpdfdebug && nmake -f psi\msvc32.mak WIN64= DEVSTUDIO= debugbsc" ReBuildCommandLine="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" CleanCommandLine="cd .. && nmake -f psi\msvc32.mak WIN64= DEVSTUDIO= debugclean" - Output="$(ProjectDir)\..\debugbin\gpdfwin64c.exe" + Output="$(ProjectDir)\..\debugbin\gpdfwin64.exe" PreprocessorDefinitions="WIN64;_DEBUG;DEBUG=1;TDEBUG=1" IncludeSearchPath="" ForcedIncludes="" @@ -69,7 +69,7 @@ BuildCommandLine="cd .. && nmake -f psi\msvc32.mak SBR=1 DEVSTUDIO= gpdf && nmake -f psi\msvc32.mak DEVSTUDIO= bsc" ReBuildCommandLine="cd .. && nmake -f psi\msvc32.mak DEVSTUDIO= clean && nmake -f psi\msvc32.mak SBR=1 DEVSTUDIO= gpdf && nmake -f psi\msvc32.mak DEVSTUDIO= bsc" CleanCommandLine="cd .. && nmake -f psi\msvc32.mak DEVSTUDIO= clean" - Output="$(ProjectDir)\..\bin\gpdfwin32c.exe" + Output="$(ProjectDir)\..\bin\gpdfwin32.exe" PreprocessorDefinitions="WIN32;NDEBUG;HAVE_SSE2=1" IncludeSearchPath="" ForcedIncludes="" @@ -89,7 +89,7 @@ BuildCommandLine="cd .. && nmake -f psi\msvc32.mak WIN64= SBR=1 DEVSTUDIO= gpdf && nmake -f psi\msvc32.mak WIN64= DEVSTUDIO= bsc" ReBuildCommandLine="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" CleanCommandLine="cd .. && nmake -f psi\msvc32.mak WIN64= DEVSTUDIO= clean" - Output="$(ProjectDir)\..\bin\gpdfwin64c.exe" + Output="$(ProjectDir)\..\bin\gpdfwin64.exe" PreprocessorDefinitions="WIN32;NDEBUG;" IncludeSearchPath="" ForcedIncludes="" @@ -109,7 +109,7 @@ BuildCommandLine="cd .. && nmake -f psi\msvc32.mak SBR=1 DEVSTUDIO= gpdfprofile && nmake -f psi\msvc32.mak DEVSTUDIO= profilebsc" ReBuildCommandLine="cd .. && nmake -f psi\msvc32.mak DEVSTUDIO= profileclean && nmake -f psi\msvc32.mak SBR=1 DEVSTUDIO= gpdfprofile && nmake -f psi\msvc32.mak DEVSTUDIO= profilebsc" CleanCommandLine="cd .. && nmake -f psi\msvc32.mak DEVSTUDIO= profileclean" - Output="$(ProjectDir)\..\profbin\gpdfwin32c.exe" + Output="$(ProjectDir)\..\profbin\gpdfwin32.exe" PreprocessorDefinitions="WIN32;NDEBUG;DEBUG=0;TDEBUG=0;DEBUGSYM=1;HAVE_SSE2=1" IncludeSearchPath="" ForcedIncludes="" @@ -129,7 +129,7 @@ BuildCommandLine="cd .. && nmake -f psi\msvc32.mak WIN64= SBR=1 DEVSTUDIO= gpdfprofile && nmake -f psi\msvc32.mak WIN64= DEVSTUDIO= profilebsc" ReBuildCommandLine="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" CleanCommandLine="cd .. && nmake -f psi\msvc32.mak WIN64= DEVSTUDIO= profileclean" - Output="$(ProjectDir)\..\profbin\gpdfwin64c.exe" + Output="$(ProjectDir)\..\profbin\gpdfwin64.exe" PreprocessorDefinitions="WIN64;_DEBUG;DEBUG=1;TDEBUG=1" IncludeSearchPath="" ForcedIncludes="" @@ -149,7 +149,7 @@ BuildCommandLine="cd .. && nmake -f psi\msvc32.mak SBR=1 DEVSTUDIO= gpdfmemento && nmake -f psi\msvc32.mak DEVSTUDIO= mementobsc" ReBuildCommandLine="cd .. && nmake -f psi\msvc32.mak DEVSTUDIO= mementoclean && nmake -f psi\msvc32.mak SBR=1 DEVSTUDIO= gpdfmemento && nmake -f psi\msvc32.mak DEVSTUDIO= mementobsc" CleanCommandLine="cd .. && nmake -f psi\msvc32.mak DEVSTUDIO= mementoclean" - Output="$(ProjectDir)\..\membin\gpdfwin32c.exe" + Output="$(ProjectDir)\..\membin\gpdfwin32.exe" PreprocessorDefinitions="WIN32;_DEBUG;DEBUG=1;TDEBUG=1;HAVE_SSE2=1;MEMENTO=1" IncludeSearchPath="" ForcedIncludes="" @@ -169,7 +169,7 @@ BuildCommandLine="cd .. && nmake -f psi\msvc32.mak WIN64= SBR=1 DEVSTUDIO= gpdfmemento && nmake -f psi\msvc32.mak WIN64= DEVSTUDIO= mementobsc" ReBuildCommandLine="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" CleanCommandLine="cd .. && nmake -f psi\msvc32.mak WIN64= DEVSTUDIO= mementoclean" - Output="$(ProjectDir)\..\membin\gpdfwin64c.exe" + Output="$(ProjectDir)\..\membin\gpdfwin64.exe" PreprocessorDefinitions="WIN64;_DEBUG;DEBUG=1;TDEBUG=1" IncludeSearchPath="" ForcedIncludes="" @@ -189,7 +189,7 @@ BuildCommandLine="cd .. && nmake -f psi\msvc32.mak SBR=1 DEVSTUDIO= WITH_CUPS=1 gpdfdebug && nmake -f psi\msvc32.mak DEVSTUDIO= WITH_CUPS=1 debugbsc" ReBuildCommandLine="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" CleanCommandLine="cd .. && nmake -f psi\msvc32.mak DEVSTUDIO= WITH_CUPS=1 debugclean" - Output="$(ProjectDir)\..\debugbin\gpdfwin32c.exe" + Output="$(ProjectDir)\..\debugbin\gpdfwin32.exe" PreprocessorDefinitions="WIN32;_DEBUG;DEBUG=1;TDEBUG=1;HAVE_SSE2=1" IncludeSearchPath="" ForcedIncludes="" @@ -209,7 +209,7 @@ BuildCommandLine="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" ReBuildCommandLine="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" CleanCommandLine="cd .. && nmake -f psi\msvc32.mak WIN64= DEVSTUDIO= debugclean" - Output="$(ProjectDir)\..\debugbin\gpdfwin64c.exe" + Output="$(ProjectDir)\..\debugbin\gpdfwin64.exe" PreprocessorDefinitions="WIN64;_DEBUG;DEBUG=1;TDEBUG=1" IncludeSearchPath="" ForcedIncludes="" @@ -229,7 +229,7 @@ BuildCommandLine="cd .. && nmake -f psi\msvc32.mak SBR=1 DEVSTUDIO= WITH_CONTRIB=1 gpdfdebug && nmake -f psi\msvc32.mak DEVSTUDIO= WITH_CONTRIB=1 debugbsc" ReBuildCommandLine="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" CleanCommandLine="cd .. && nmake -f psi\msvc32.mak DEVSTUDIO= WITH_CONTRIB=1 debugclean" - Output="$(ProjectDir)\..\debugbin\gpdfwin32c.exe" + Output="$(ProjectDir)\..\debugbin\gpdfwin32.exe" PreprocessorDefinitions="WIN32;_DEBUG;DEBUG=1;TDEBUG=1;HAVE_SSE2=1" IncludeSearchPath="" ForcedIncludes="" @@ -249,7 +249,7 @@ BuildCommandLine="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" ReBuildCommandLine="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" CleanCommandLine="cd .. && nmake -f psi\msvc32.mak WIN64= DEVSTUDIO= debugclean" - Output="$(ProjectDir)\..\debugbin\gpdfwin64c.exe" + Output="$(ProjectDir)\..\debugbin\gpdfwin64.exe" PreprocessorDefinitions="WIN64;_DEBUG;DEBUG=1;TDEBUG=1" IncludeSearchPath="" ForcedIncludes="" @@ -269,7 +269,7 @@ BuildCommandLine="cd .. && nmake -f psi\msvc32.mak SBR=1 DEVSTUDIO= gpdf && nmake -f psi\msvc32.mak DEVSTUDIO= bsc" ReBuildCommandLine="cd .. && nmake -f psi\msvc32.mak DEVSTUDIO= clean && nmake -f psi\msvc32.mak SBR=1 DEVSTUDIO= gpdf && nmake -f psi\msvc32.mak DEVSTUDIO= bsc" CleanCommandLine="cd .. && nmake -f psi\msvc32.mak DEVSTUDIO= clean" - Output="$(ProjectDir)\..\bin\gpdfwin32c.exe" + Output="$(ProjectDir)\..\bin\gpdfwin32.exe" PreprocessorDefinitions="WIN32;NDEBUG;HAVE_SSE2=1" IncludeSearchPath="" ForcedIncludes="" @@ -289,7 +289,7 @@ BuildCommandLine="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" ReBuildCommandLine="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" CleanCommandLine="cd .. && nmake -f psi\msvc32.mak WIN64= WITH_CONTRIB=1 DEVSTUDIO= clean" - Output="$(ProjectDir)\..\bin\gpdfwin64c.exe" + Output="$(ProjectDir)\..\bin\gpdfwin64.exe" PreprocessorDefinitions="WIN32;NDEBUG;" IncludeSearchPath="" ForcedIncludes="" diff --git a/windows/ghostpdf.vcxproj b/windows/ghostpdf.vcxproj index cfcce87ec..f02931d3c 100644 --- a/windows/ghostpdf.vcxproj +++ b/windows/ghostpdf.vcxproj @@ -175,7 +175,7 @@ <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> + <NMakeOutput>$(ProjectDir)\..\debugbin\gpdfwin32.exe</NMakeOutput> <NMakePreprocessorDefinitions>WIN32;_DEBUG;DEBUG=1;TDEBUG=1;HAVE_SSE2=1;$(NMakePreprocessorDefinitions)</NMakePreprocessorDefinitions> </PropertyGroup> <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'"> |