GraphicsMagick: New rebuild of VisualMagick/configure/configure....
GraphicsMagick Commits <[email protected]>
| Newsgroups | gmane.comp.video.graphicsmagick.cvs |
|---|---|
| Message-ID | <mailman.22824.1660149473.1524.graphicsmagick-commit@lists.sourceforge.net> |
changeset 0c762d64a474 in /hg/GraphicsMagick details: http://hg.GraphicsMagick.org/hg/GraphicsMagick?cmd=changeset;node=0c762d64a474 summary: New rebuild of VisualMagick/configure/configure.exe. diffstat: ChangeLog | 4 + VisualMagick/configure/configure.exe | Bin VisualMagick/configure/configure.sln | 30 +- VisualMagick/configure/configure.vcproj | 412 ++++++++++++++++--------------- VisualMagick/configure/stdafx.h | 4 +- 5 files changed, 238 insertions(+), 212 deletions(-) diffs (truncated from 614 to 500 lines): diff -r 4ff76a689757 -r 0c762d64a474 ChangeLog --- a/ChangeLog Mon Aug 08 08:02:41 2022 -0500 +++ b/ChangeLog Wed Aug 10 18:36:36 2022 +0200 @@ -1,3 +1,7 @@ +2022-08-10 Fojtik Jaroslav <[email protected]> + * VisualMagick/configure/stdafx.h Added define WIN32_LEAN_AND_MEAN + * VisualMagick/configure/configure.exe New rebuild. + 2022-08-08 Bob Friesenhahn <[email protected]> * fuzzing/oss-fuzz-build.sh (MAGICK_LIBS): Add libsharpyuv.a to diff -r 4ff76a689757 -r 0c762d64a474 VisualMagick/configure/configure.exe Binary file VisualMagick/configure/configure.exe has changed diff -r 4ff76a689757 -r 0c762d64a474 VisualMagick/configure/configure.sln --- a/VisualMagick/configure/configure.sln Mon Aug 08 08:02:41 2022 -0500 +++ b/VisualMagick/configure/configure.sln Wed Aug 10 18:36:36 2022 +0200 @@ -1,19 +1,23 @@ -Microsoft Visual Studio Solution File, Format Version 10.00 -# Visual Studio 2008 -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "configure", "configure.vcproj", "{59748030-D529-4B65-A3B4-2A4B5520524A}" +Microsoft Visual Studio Solution File, Format Version 8.00 +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "configure", "configure.vcproj", "{6EB95BC9-9560-45D3-BA53-A265B16D85FC}" + ProjectSection(ProjectDependencies) = postProject + EndProjectSection EndProject Global - GlobalSection(SolutionConfigurationPlatforms) = preSolution - Debug|Win32 = Debug|Win32 - Release|Win32 = Release|Win32 + GlobalSection(SolutionConfiguration) = preSolution + Debug = Debug + Release = Release + EndGlobalSection + GlobalSection(ProjectDependencies) = postSolution EndGlobalSection - GlobalSection(ProjectConfigurationPlatforms) = postSolution - {59748030-D529-4B65-A3B4-2A4B5520524A}.Debug|Win32.ActiveCfg = Debug|Win32 - {59748030-D529-4B65-A3B4-2A4B5520524A}.Debug|Win32.Build.0 = Debug|Win32 - {59748030-D529-4B65-A3B4-2A4B5520524A}.Release|Win32.ActiveCfg = Release|Win32 - {59748030-D529-4B65-A3B4-2A4B5520524A}.Release|Win32.Build.0 = Release|Win32 + GlobalSection(ProjectConfiguration) = postSolution + {6EB95BC9-9560-45D3-BA53-A265B16D85FC}.Debug.ActiveCfg = Debug|Win32 + {6EB95BC9-9560-45D3-BA53-A265B16D85FC}.Debug.Build.0 = Debug|Win32 + {6EB95BC9-9560-45D3-BA53-A265B16D85FC}.Release.ActiveCfg = Release|Win32 + {6EB95BC9-9560-45D3-BA53-A265B16D85FC}.Release.Build.0 = Release|Win32 EndGlobalSection - GlobalSection(SolutionProperties) = preSolution - HideSolutionNode = FALSE + GlobalSection(ExtensibilityGlobals) = postSolution + EndGlobalSection + GlobalSection(ExtensibilityAddIns) = postSolution EndGlobalSection EndGlobal diff -r 4ff76a689757 -r 0c762d64a474 VisualMagick/configure/configure.vcproj --- a/VisualMagick/configure/configure.vcproj Mon Aug 08 08:02:41 2022 -0500 +++ b/VisualMagick/configure/configure.vcproj Wed Aug 10 18:36:36 2022 +0200 @@ -1,55 +1,28 @@ -<?xml version="1.0" encoding="Windows-1252"?> +<?xml version="1.0" encoding="windows-1250"?> <VisualStudioProject ProjectType="Visual C++" - Version="9,00" + Version="7.10" Name="configure" - ProjectGUID="{59748030-D529-4B65-A3B4-2A4B5520524A}" - Keyword="MFCProj" - TargetFrameworkVersion="131072" - > + SccProjectName="" + SccLocalPath="" + Keyword="MFCProj"> <Platforms> <Platform - Name="Win32" - /> + Name="Win32"/> </Platforms> - <ToolFiles> - </ToolFiles> <Configurations> <Configuration Name="Debug|Win32" OutputDirectory=".\Debug\configure" IntermediateDirectory=".\Debug\configure" ConfigurationType="1" - InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC70.vsprops" UseOfMFC="2" - ATLMinimizesCRunTimeLibraryUsage="false" - CharacterSet="2" - > - <Tool - Name="VCPreBuildEventTool" - /> - <Tool - Name="VCCustomBuildTool" - /> - <Tool - Name="VCXMLDataGeneratorTool" - /> - <Tool - Name="VCWebServiceProxyGeneratorTool" - /> - <Tool - Name="VCMIDLTool" - PreprocessorDefinitions="_DEBUG" - MkTypLibCompatible="true" - SuppressStartupBanner="true" - TargetEnvironment="1" - TypeLibraryName=".\Debug\configure/configure.tlb" - /> + ATLMinimizesCRunTimeLibraryUsage="FALSE" + CharacterSet="2"> <Tool Name="VCCLCompilerTool" - AdditionalOptions="/Zm200" Optimization="0" - PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;WINVER=0x0501" + PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS" BasicRuntimeChecks="3" RuntimeLibrary="3" PrecompiledHeaderFile=".\Debug\configure/configure.pch" @@ -57,146 +30,111 @@ ObjectFile=".\Debug\configure/" ProgramDataBaseFileName=".\Debug\configure/" WarningLevel="3" - SuppressStartupBanner="true" - DebugInformationFormat="4" - /> - <Tool - Name="VCManagedResourceCompilerTool" - /> + SuppressStartupBanner="TRUE" + DebugInformationFormat="4"/> <Tool - Name="VCResourceCompilerTool" - PreprocessorDefinitions="_AFXDLL;_DEBUG" - Culture="1030" - /> - <Tool - Name="VCPreLinkEventTool" - /> + Name="VCCustomBuildTool"/> <Tool Name="VCLinkerTool" - AdditionalOptions="/MACHINE:I386" AdditionalDependencies="rpcrt4.lib" OutputFile="configure_d.exe" - LinkIncremental="2" - SuppressStartupBanner="true" - GenerateDebugInformation="true" - ProgramDatabaseFile=".\Debug\configure/configure.pdb" + LinkIncremental="1" + SuppressStartupBanner="TRUE" + GenerateDebugInformation="TRUE" + ProgramDatabaseFile=".\Debug\configure/configure_d.pdb" SubSystem="2" - RandomizedBaseAddress="1" - DataExecutionPrevention="0" - /> + TargetMachine="1"/> <Tool - Name="VCALinkTool" - /> + Name="VCMIDLTool" + PreprocessorDefinitions="_DEBUG" + MkTypLibCompatible="TRUE" + SuppressStartupBanner="TRUE" + TargetEnvironment="1" + TypeLibraryName=".\Debug\configure/configure.tlb" + HeaderFileName=""/> <Tool - Name="VCManifestTool" - /> + Name="VCPostBuildEventTool"/> <Tool - Name="VCXDCMakeTool" - /> + Name="VCPreBuildEventTool"/> + <Tool + Name="VCPreLinkEventTool"/> <Tool - Name="VCBscMakeTool" - /> + Name="VCResourceCompilerTool" + PreprocessorDefinitions="_DEBUG" + Culture="1030"/> <Tool - Name="VCFxCopTool" - /> + Name="VCWebServiceProxyGeneratorTool"/> + <Tool + Name="VCXMLDataGeneratorTool"/> <Tool - Name="VCAppVerifierTool" - /> + Name="VCWebDeploymentTool"/> <Tool - Name="VCPostBuildEventTool" - /> + Name="VCManagedWrapperGeneratorTool"/> + <Tool + Name="VCAuxiliaryManagedWrapperGeneratorTool"/> </Configuration> <Configuration Name="Release|Win32" OutputDirectory=".\Release\configure" IntermediateDirectory=".\Release\configure" ConfigurationType="1" - InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC70.vsprops" UseOfMFC="1" - ATLMinimizesCRunTimeLibraryUsage="false" - CharacterSet="2" - > - <Tool - Name="VCPreBuildEventTool" - /> - <Tool - Name="VCCustomBuildTool" - /> - <Tool - Name="VCXMLDataGeneratorTool" - /> - <Tool - Name="VCWebServiceProxyGeneratorTool" - /> - <Tool - Name="VCMIDLTool" - PreprocessorDefinitions="NDEBUG" - MkTypLibCompatible="true" - SuppressStartupBanner="true" - TargetEnvironment="1" - TypeLibraryName=".\Release\configure/configure.tlb" - /> + ATLMinimizesCRunTimeLibraryUsage="FALSE" + CharacterSet="2"> <Tool Name="VCCLCompilerTool" - AdditionalOptions="/Zm200" - Optimization="1" + Optimization="2" InlineFunctionExpansion="1" - FavorSizeOrSpeed="2" - PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;WINVER=0x0501" - StringPooling="true" + AdditionalIncludeDirectories="" + PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;WINVER=0x500" + StringPooling="TRUE" RuntimeLibrary="0" - EnableFunctionLevelLinking="true" + EnableFunctionLevelLinking="TRUE" PrecompiledHeaderFile=".\Release\configure/configure.pch" AssemblerListingLocation=".\Release\configure/" ObjectFile=".\Release\configure/" ProgramDataBaseFileName=".\Release\configure/" WarningLevel="3" - SuppressStartupBanner="true" - /> - <Tool - Name="VCManagedResourceCompilerTool" - /> + SuppressStartupBanner="TRUE"/> <Tool - Name="VCResourceCompilerTool" - PreprocessorDefinitions="_AFXDLL;NDEBUG" - Culture="1030" - /> - <Tool - Name="VCPreLinkEventTool" - /> + Name="VCCustomBuildTool"/> <Tool Name="VCLinkerTool" - AdditionalOptions="/MACHINE:I386" AdditionalDependencies="rpcrt4.lib" OutputFile="configure.exe" LinkIncremental="1" - SuppressStartupBanner="true" + SuppressStartupBanner="TRUE" ProgramDatabaseFile=".\Release\configure/configure.pdb" SubSystem="2" - RandomizedBaseAddress="1" - DataExecutionPrevention="0" - /> + TargetMachine="1"/> <Tool - Name="VCALinkTool" - /> + Name="VCMIDLTool" + PreprocessorDefinitions="NDEBUG" + MkTypLibCompatible="TRUE" + SuppressStartupBanner="TRUE" + TargetEnvironment="1" + TypeLibraryName=".\Release\configure/configure.tlb" + HeaderFileName=""/> <Tool - Name="VCManifestTool" - /> + Name="VCPostBuildEventTool"/> + <Tool + Name="VCPreBuildEventTool"/> <Tool - Name="VCXDCMakeTool" - /> + Name="VCPreLinkEventTool"/> <Tool - Name="VCBscMakeTool" - /> + Name="VCResourceCompilerTool" + PreprocessorDefinitions="NDEBUG" + Culture="1030"/> + <Tool + Name="VCWebServiceProxyGeneratorTool"/> <Tool - Name="VCFxCopTool" - /> + Name="VCXMLDataGeneratorTool"/> + <Tool + Name="VCWebDeploymentTool"/> <Tool - Name="VCAppVerifierTool" - /> + Name="VCManagedWrapperGeneratorTool"/> <Tool - Name="VCPostBuildEventTool" - /> + Name="VCAuxiliaryManagedWrapperGeneratorTool"/> </Configuration> </Configurations> <References> @@ -204,126 +142,204 @@ <Files> <Filter Name="Source Files" - Filter="cpp;c;cxx;rc;def;r;odl;idl;hpj;bat" - > + Filter="cpp;c;cxx;rc;def;r;odl;idl;hpj;bat"> <File - RelativePath=".\configure.cpp" - > + RelativePath="configure.cpp"> + <FileConfiguration + Name="Debug|Win32"> + <Tool + Name="VCCLCompilerTool" + Optimization="0" + PreprocessorDefinitions="" + BasicRuntimeChecks="3"/> + </FileConfiguration> + <FileConfiguration + Name="Release|Win32"> + <Tool + Name="VCCLCompilerTool" + Optimization="2" + PreprocessorDefinitions=""/> + </FileConfiguration> </File> <File - RelativePath=".\configure.rc" - > - </File> - <File - RelativePath=".\configure_wizard.cpp" - > - </File> - <File - RelativePath=".\finished_page.cpp" - > + RelativePath="configure.rc"> </File> <File - RelativePath=".\stdafx.cpp" - > + RelativePath="configure_wizard.cpp"> <FileConfiguration - Name="Debug|Win32" - > + Name="Debug|Win32"> + <Tool + Name="VCCLCompilerTool" + Optimization="0" + PreprocessorDefinitions="" + BasicRuntimeChecks="3"/> + </FileConfiguration> + <FileConfiguration + Name="Release|Win32"> <Tool Name="VCCLCompilerTool" - UsePrecompiledHeader="1" - PrecompiledHeaderThrough="stdafx.h" - /> + Optimization="2" + PreprocessorDefinitions=""/> + </FileConfiguration> + </File> + <File + RelativePath="finished_page.cpp"> + <FileConfiguration + Name="Debug|Win32"> + <Tool + Name="VCCLCompilerTool" + Optimization="0" + PreprocessorDefinitions="" + BasicRuntimeChecks="3"/> </FileConfiguration> <FileConfiguration - Name="Release|Win32" - > + Name="Release|Win32"> <Tool Name="VCCLCompilerTool" - UsePrecompiledHeader="1" - PrecompiledHeaderThrough="stdafx.h" - /> + Optimization="2" + PreprocessorDefinitions=""/> </FileConfiguration> </File> <File - RelativePath=".\system_page.cpp" - > + RelativePath="stdafx.cpp"> + <FileConfiguration + Name="Debug|Win32"> + <Tool + Name="VCCLCompilerTool" + Optimization="0" + PreprocessorDefinitions="" + BasicRuntimeChecks="3" + UsePrecompiledHeader="1" + PrecompiledHeaderThrough="stdafx.h"/> + </FileConfiguration> + <FileConfiguration + Name="Release|Win32"> + <Tool + Name="VCCLCompilerTool" + Optimization="2" + PreprocessorDefinitions="" + UsePrecompiledHeader="1" + PrecompiledHeaderThrough="stdafx.h"/> + </FileConfiguration> + </File> + <File + RelativePath="system_page.cpp"> + <FileConfiguration + Name="Debug|Win32"> + <Tool + Name="VCCLCompilerTool" + Optimization="0" + PreprocessorDefinitions="" + BasicRuntimeChecks="3"/> + </FileConfiguration> + <FileConfiguration + Name="Release|Win32"> + <Tool + Name="VCCLCompilerTool" + Optimization="2" + PreprocessorDefinitions=""/> + </FileConfiguration> </File> <File - RelativePath=".\target_page.cpp" - > + RelativePath="target_page.cpp"> + <FileConfiguration + Name="Debug|Win32"> + <Tool + Name="VCCLCompilerTool" + Optimization="0" + PreprocessorDefinitions="" + BasicRuntimeChecks="3"/> + </FileConfiguration> + <FileConfiguration + Name="Release|Win32"> + <Tool + Name="VCCLCompilerTool" + Optimization="2" + PreprocessorDefinitions=""/> + </FileConfiguration> </File> <File - RelativePath=".\WaitDlg.cpp" - > + RelativePath="WaitDlg.cpp"> + <FileConfiguration + Name="Debug|Win32"> + <Tool + Name="VCCLCompilerTool" + Optimization="0" + PreprocessorDefinitions="" + BasicRuntimeChecks="3"/> + </FileConfiguration> + <FileConfiguration + Name="Release|Win32"> + <Tool + Name="VCCLCompilerTool" + Optimization="2" + PreprocessorDefinitions=""/> + </FileConfiguration> </File> <File