• R/O
  • SSH

GM: Commit

Main GraphicsMagick source repository


Commit MetaInfo

Révision0c762d64a474a0d7dedb32bfbae0bffb31593f1c (tree)
l'heure2022-08-11 01:36:36
AuteurJaroslav Fojtik
CommiterJaroslav Fojtik

Message de Log

New rebuild of VisualMagick/configure/configure.exe.

Change Summary

Modification

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 @@
1+2022-08-10 Fojtik Jaroslav <JaFojtik@yandex.com>
2+ * VisualMagick/configure/stdafx.h Added define WIN32_LEAN_AND_MEAN
3+ * VisualMagick/configure/configure.exe New rebuild.
4+
15 2022-08-08 Bob Friesenhahn <bfriesen@simple.dallas.tx.us>
26
37 * 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 @@
1-Microsoft Visual Studio Solution File, Format Version 10.00
2-# Visual Studio 2008
3-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "configure", "configure.vcproj", "{59748030-D529-4B65-A3B4-2A4B5520524A}"
1+Microsoft Visual Studio Solution File, Format Version 8.00
2+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "configure", "configure.vcproj", "{6EB95BC9-9560-45D3-BA53-A265B16D85FC}"
3+ ProjectSection(ProjectDependencies) = postProject
4+ EndProjectSection
45 EndProject
56 Global
6- GlobalSection(SolutionConfigurationPlatforms) = preSolution
7- Debug|Win32 = Debug|Win32
8- Release|Win32 = Release|Win32
7+ GlobalSection(SolutionConfiguration) = preSolution
8+ Debug = Debug
9+ Release = Release
910 EndGlobalSection
10- GlobalSection(ProjectConfigurationPlatforms) = postSolution
11- {59748030-D529-4B65-A3B4-2A4B5520524A}.Debug|Win32.ActiveCfg = Debug|Win32
12- {59748030-D529-4B65-A3B4-2A4B5520524A}.Debug|Win32.Build.0 = Debug|Win32
13- {59748030-D529-4B65-A3B4-2A4B5520524A}.Release|Win32.ActiveCfg = Release|Win32
14- {59748030-D529-4B65-A3B4-2A4B5520524A}.Release|Win32.Build.0 = Release|Win32
11+ GlobalSection(ProjectDependencies) = postSolution
1512 EndGlobalSection
16- GlobalSection(SolutionProperties) = preSolution
17- HideSolutionNode = FALSE
13+ GlobalSection(ProjectConfiguration) = postSolution
14+ {6EB95BC9-9560-45D3-BA53-A265B16D85FC}.Debug.ActiveCfg = Debug|Win32
15+ {6EB95BC9-9560-45D3-BA53-A265B16D85FC}.Debug.Build.0 = Debug|Win32
16+ {6EB95BC9-9560-45D3-BA53-A265B16D85FC}.Release.ActiveCfg = Release|Win32
17+ {6EB95BC9-9560-45D3-BA53-A265B16D85FC}.Release.Build.0 = Release|Win32
18+ EndGlobalSection
19+ GlobalSection(ExtensibilityGlobals) = postSolution
20+ EndGlobalSection
21+ GlobalSection(ExtensibilityAddIns) = postSolution
1822 EndGlobalSection
1923 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 @@
1-<?xml version="1.0" encoding="Windows-1252"?>
1+<?xml version="1.0" encoding="windows-1250"?>
22 <VisualStudioProject
33 ProjectType="Visual C++"
4- Version="9,00"
4+ Version="7.10"
55 Name="configure"
6- ProjectGUID="{59748030-D529-4B65-A3B4-2A4B5520524A}"
7- Keyword="MFCProj"
8- TargetFrameworkVersion="131072"
9- >
6+ SccProjectName=""
7+ SccLocalPath=""
8+ Keyword="MFCProj">
109 <Platforms>
1110 <Platform
12- Name="Win32"
13- />
11+ Name="Win32"/>
1412 </Platforms>
15- <ToolFiles>
16- </ToolFiles>
1713 <Configurations>
1814 <Configuration
1915 Name="Debug|Win32"
2016 OutputDirectory=".\Debug\configure"
2117 IntermediateDirectory=".\Debug\configure"
2218 ConfigurationType="1"
23- InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC70.vsprops"
2419 UseOfMFC="2"
25- ATLMinimizesCRunTimeLibraryUsage="false"
26- CharacterSet="2"
27- >
28- <Tool
29- Name="VCPreBuildEventTool"
30- />
31- <Tool
32- Name="VCCustomBuildTool"
33- />
34- <Tool
35- Name="VCXMLDataGeneratorTool"
36- />
37- <Tool
38- Name="VCWebServiceProxyGeneratorTool"
39- />
40- <Tool
41- Name="VCMIDLTool"
42- PreprocessorDefinitions="_DEBUG"
43- MkTypLibCompatible="true"
44- SuppressStartupBanner="true"
45- TargetEnvironment="1"
46- TypeLibraryName=".\Debug\configure/configure.tlb"
47- />
20+ ATLMinimizesCRunTimeLibraryUsage="FALSE"
21+ CharacterSet="2">
4822 <Tool
4923 Name="VCCLCompilerTool"
50- AdditionalOptions="/Zm200"
5124 Optimization="0"
52- PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;WINVER=0x0501"
25+ PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS"
5326 BasicRuntimeChecks="3"
5427 RuntimeLibrary="3"
5528 PrecompiledHeaderFile=".\Debug\configure/configure.pch"
@@ -57,146 +30,111 @@
5730 ObjectFile=".\Debug\configure/"
5831 ProgramDataBaseFileName=".\Debug\configure/"
5932 WarningLevel="3"
60- SuppressStartupBanner="true"
61- DebugInformationFormat="4"
62- />
63- <Tool
64- Name="VCManagedResourceCompilerTool"
65- />
33+ SuppressStartupBanner="TRUE"
34+ DebugInformationFormat="4"/>
6635 <Tool
67- Name="VCResourceCompilerTool"
68- PreprocessorDefinitions="_AFXDLL;_DEBUG"
69- Culture="1030"
70- />
71- <Tool
72- Name="VCPreLinkEventTool"
73- />
36+ Name="VCCustomBuildTool"/>
7437 <Tool
7538 Name="VCLinkerTool"
76- AdditionalOptions="/MACHINE:I386"
7739 AdditionalDependencies="rpcrt4.lib"
7840 OutputFile="configure_d.exe"
79- LinkIncremental="2"
80- SuppressStartupBanner="true"
81- GenerateDebugInformation="true"
82- ProgramDatabaseFile=".\Debug\configure/configure.pdb"
41+ LinkIncremental="1"
42+ SuppressStartupBanner="TRUE"
43+ GenerateDebugInformation="TRUE"
44+ ProgramDatabaseFile=".\Debug\configure/configure_d.pdb"
8345 SubSystem="2"
84- RandomizedBaseAddress="1"
85- DataExecutionPrevention="0"
86- />
87- <Tool
88- Name="VCALinkTool"
89- />
46+ TargetMachine="1"/>
9047 <Tool
91- Name="VCManifestTool"
92- />
93- <Tool
94- Name="VCXDCMakeTool"
95- />
48+ Name="VCMIDLTool"
49+ PreprocessorDefinitions="_DEBUG"
50+ MkTypLibCompatible="TRUE"
51+ SuppressStartupBanner="TRUE"
52+ TargetEnvironment="1"
53+ TypeLibraryName=".\Debug\configure/configure.tlb"
54+ HeaderFileName=""/>
9655 <Tool
97- Name="VCBscMakeTool"
98- />
56+ Name="VCPostBuildEventTool"/>
9957 <Tool
100- Name="VCFxCopTool"
101- />
58+ Name="VCPreBuildEventTool"/>
10259 <Tool
103- Name="VCAppVerifierTool"
104- />
60+ Name="VCPreLinkEventTool"/>
10561 <Tool
106- Name="VCPostBuildEventTool"
107- />
62+ Name="VCResourceCompilerTool"
63+ PreprocessorDefinitions="_DEBUG"
64+ Culture="1030"/>
65+ <Tool
66+ Name="VCWebServiceProxyGeneratorTool"/>
67+ <Tool
68+ Name="VCXMLDataGeneratorTool"/>
69+ <Tool
70+ Name="VCWebDeploymentTool"/>
71+ <Tool
72+ Name="VCManagedWrapperGeneratorTool"/>
73+ <Tool
74+ Name="VCAuxiliaryManagedWrapperGeneratorTool"/>
10875 </Configuration>
10976 <Configuration
11077 Name="Release|Win32"
11178 OutputDirectory=".\Release\configure"
11279 IntermediateDirectory=".\Release\configure"
11380 ConfigurationType="1"
114- InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC70.vsprops"
11581 UseOfMFC="1"
116- ATLMinimizesCRunTimeLibraryUsage="false"
117- CharacterSet="2"
118- >
119- <Tool
120- Name="VCPreBuildEventTool"
121- />
122- <Tool
123- Name="VCCustomBuildTool"
124- />
125- <Tool
126- Name="VCXMLDataGeneratorTool"
127- />
128- <Tool
129- Name="VCWebServiceProxyGeneratorTool"
130- />
131- <Tool
132- Name="VCMIDLTool"
133- PreprocessorDefinitions="NDEBUG"
134- MkTypLibCompatible="true"
135- SuppressStartupBanner="true"
136- TargetEnvironment="1"
137- TypeLibraryName=".\Release\configure/configure.tlb"
138- />
82+ ATLMinimizesCRunTimeLibraryUsage="FALSE"
83+ CharacterSet="2">
13984 <Tool
14085 Name="VCCLCompilerTool"
141- AdditionalOptions="/Zm200"
142- Optimization="1"
86+ Optimization="2"
14387 InlineFunctionExpansion="1"
144- FavorSizeOrSpeed="2"
145- PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;WINVER=0x0501"
146- StringPooling="true"
88+ AdditionalIncludeDirectories=""
89+ PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;WINVER=0x500"
90+ StringPooling="TRUE"
14791 RuntimeLibrary="0"
148- EnableFunctionLevelLinking="true"
92+ EnableFunctionLevelLinking="TRUE"
14993 PrecompiledHeaderFile=".\Release\configure/configure.pch"
15094 AssemblerListingLocation=".\Release\configure/"
15195 ObjectFile=".\Release\configure/"
15296 ProgramDataBaseFileName=".\Release\configure/"
15397 WarningLevel="3"
154- SuppressStartupBanner="true"
155- />
156- <Tool
157- Name="VCManagedResourceCompilerTool"
158- />
98+ SuppressStartupBanner="TRUE"/>
15999 <Tool
160- Name="VCResourceCompilerTool"
161- PreprocessorDefinitions="_AFXDLL;NDEBUG"
162- Culture="1030"
163- />
164- <Tool
165- Name="VCPreLinkEventTool"
166- />
100+ Name="VCCustomBuildTool"/>
167101 <Tool
168102 Name="VCLinkerTool"
169- AdditionalOptions="/MACHINE:I386"
170103 AdditionalDependencies="rpcrt4.lib"
171104 OutputFile="configure.exe"
172105 LinkIncremental="1"
173- SuppressStartupBanner="true"
106+ SuppressStartupBanner="TRUE"
174107 ProgramDatabaseFile=".\Release\configure/configure.pdb"
175108 SubSystem="2"
176- RandomizedBaseAddress="1"
177- DataExecutionPrevention="0"
178- />
179- <Tool
180- Name="VCALinkTool"
181- />
182- <Tool
183- Name="VCManifestTool"
184- />
109+ TargetMachine="1"/>
185110 <Tool
186- Name="VCXDCMakeTool"
187- />
188- <Tool
189- Name="VCBscMakeTool"
190- />
111+ Name="VCMIDLTool"
112+ PreprocessorDefinitions="NDEBUG"
113+ MkTypLibCompatible="TRUE"
114+ SuppressStartupBanner="TRUE"
115+ TargetEnvironment="1"
116+ TypeLibraryName=".\Release\configure/configure.tlb"
117+ HeaderFileName=""/>
191118 <Tool
192- Name="VCFxCopTool"
193- />
119+ Name="VCPostBuildEventTool"/>
194120 <Tool
195- Name="VCAppVerifierTool"
196- />
121+ Name="VCPreBuildEventTool"/>
197122 <Tool
198- Name="VCPostBuildEventTool"
199- />
123+ Name="VCPreLinkEventTool"/>
124+ <Tool
125+ Name="VCResourceCompilerTool"
126+ PreprocessorDefinitions="NDEBUG"
127+ Culture="1030"/>
128+ <Tool
129+ Name="VCWebServiceProxyGeneratorTool"/>
130+ <Tool
131+ Name="VCXMLDataGeneratorTool"/>
132+ <Tool
133+ Name="VCWebDeploymentTool"/>
134+ <Tool
135+ Name="VCManagedWrapperGeneratorTool"/>
136+ <Tool
137+ Name="VCAuxiliaryManagedWrapperGeneratorTool"/>
200138 </Configuration>
201139 </Configurations>
202140 <References>
@@ -204,126 +142,204 @@
204142 <Files>
205143 <Filter
206144 Name="Source Files"
207- Filter="cpp;c;cxx;rc;def;r;odl;idl;hpj;bat"
208- >
209- <File
210- RelativePath=".\configure.cpp"
211- >
212- </File>
213- <File
214- RelativePath=".\configure.rc"
215- >
216- </File>
145+ Filter="cpp;c;cxx;rc;def;r;odl;idl;hpj;bat">
217146 <File
218- RelativePath=".\configure_wizard.cpp"
219- >
220- </File>
221- <File
222- RelativePath=".\finished_page.cpp"
223- >
224- </File>
225- <File
226- RelativePath=".\stdafx.cpp"
227- >
147+ RelativePath="configure.cpp">
228148 <FileConfiguration
229- Name="Debug|Win32"
230- >
149+ Name="Debug|Win32">
231150 <Tool
232151 Name="VCCLCompilerTool"
233- UsePrecompiledHeader="1"
234- PrecompiledHeaderThrough="stdafx.h"
235- />
152+ Optimization="0"
153+ PreprocessorDefinitions=""
154+ BasicRuntimeChecks="3"/>
236155 </FileConfiguration>
237156 <FileConfiguration
238- Name="Release|Win32"
239- >
157+ Name="Release|Win32">
240158 <Tool
241159 Name="VCCLCompilerTool"
242- UsePrecompiledHeader="1"
243- PrecompiledHeaderThrough="stdafx.h"
244- />
160+ Optimization="2"
161+ PreprocessorDefinitions=""/>
245162 </FileConfiguration>
246163 </File>
247164 <File
248- RelativePath=".\system_page.cpp"
249- >
165+ RelativePath="configure.rc">
250166 </File>
251167 <File
252- RelativePath=".\target_page.cpp"
253- >
168+ RelativePath="configure_wizard.cpp">
169+ <FileConfiguration
170+ Name="Debug|Win32">
171+ <Tool
172+ Name="VCCLCompilerTool"
173+ Optimization="0"
174+ PreprocessorDefinitions=""
175+ BasicRuntimeChecks="3"/>
176+ </FileConfiguration>
177+ <FileConfiguration
178+ Name="Release|Win32">
179+ <Tool
180+ Name="VCCLCompilerTool"
181+ Optimization="2"
182+ PreprocessorDefinitions=""/>
183+ </FileConfiguration>
254184 </File>
255185 <File
256- RelativePath=".\WaitDlg.cpp"
257- >
186+ RelativePath="finished_page.cpp">
187+ <FileConfiguration
188+ Name="Debug|Win32">
189+ <Tool
190+ Name="VCCLCompilerTool"
191+ Optimization="0"
192+ PreprocessorDefinitions=""
193+ BasicRuntimeChecks="3"/>
194+ </FileConfiguration>
195+ <FileConfiguration
196+ Name="Release|Win32">
197+ <Tool
198+ Name="VCCLCompilerTool"
199+ Optimization="2"
200+ PreprocessorDefinitions=""/>
201+ </FileConfiguration>
258202 </File>
259203 <File
260- RelativePath=".\welcome_page.cpp"
261- >
204+ RelativePath="stdafx.cpp">
205+ <FileConfiguration
206+ Name="Debug|Win32">
207+ <Tool
208+ Name="VCCLCompilerTool"
209+ Optimization="0"
210+ PreprocessorDefinitions=""
211+ BasicRuntimeChecks="3"
212+ UsePrecompiledHeader="1"
213+ PrecompiledHeaderThrough="stdafx.h"/>
214+ </FileConfiguration>
215+ <FileConfiguration
216+ Name="Release|Win32">
217+ <Tool
218+ Name="VCCLCompilerTool"
219+ Optimization="2"
220+ PreprocessorDefinitions=""
221+ UsePrecompiledHeader="1"
222+ PrecompiledHeaderThrough="stdafx.h"/>
223+ </FileConfiguration>
224+ </File>
225+ <File
226+ RelativePath="system_page.cpp">
227+ <FileConfiguration
228+ Name="Debug|Win32">
229+ <Tool
230+ Name="VCCLCompilerTool"
231+ Optimization="0"
232+ PreprocessorDefinitions=""
233+ BasicRuntimeChecks="3"/>
234+ </FileConfiguration>
235+ <FileConfiguration
236+ Name="Release|Win32">
237+ <Tool
238+ Name="VCCLCompilerTool"
239+ Optimization="2"
240+ PreprocessorDefinitions=""/>
241+ </FileConfiguration>
242+ </File>
243+ <File
244+ RelativePath="target_page.cpp">
245+ <FileConfiguration
246+ Name="Debug|Win32">
247+ <Tool
248+ Name="VCCLCompilerTool"
249+ Optimization="0"
250+ PreprocessorDefinitions=""
251+ BasicRuntimeChecks="3"/>
252+ </FileConfiguration>
253+ <FileConfiguration
254+ Name="Release|Win32">
255+ <Tool
256+ Name="VCCLCompilerTool"
257+ Optimization="2"
258+ PreprocessorDefinitions=""/>
259+ </FileConfiguration>
260+ </File>
261+ <File
262+ RelativePath="WaitDlg.cpp">
263+ <FileConfiguration
264+ Name="Debug|Win32">
265+ <Tool
266+ Name="VCCLCompilerTool"
267+ Optimization="0"
268+ PreprocessorDefinitions=""
269+ BasicRuntimeChecks="3"/>
270+ </FileConfiguration>
271+ <FileConfiguration
272+ Name="Release|Win32">
273+ <Tool
274+ Name="VCCLCompilerTool"
275+ Optimization="2"
276+ PreprocessorDefinitions=""/>
277+ </FileConfiguration>
278+ </File>
279+ <File
280+ RelativePath="welcome_page.cpp">
281+ <FileConfiguration
282+ Name="Debug|Win32">
283+ <Tool
284+ Name="VCCLCompilerTool"
285+ Optimization="0"
286+ PreprocessorDefinitions=""
287+ BasicRuntimeChecks="3"/>
288+ </FileConfiguration>
289+ <FileConfiguration
290+ Name="Release|Win32">
291+ <Tool
292+ Name="VCCLCompilerTool"
293+ Optimization="2"
294+ PreprocessorDefinitions=""/>
295+ </FileConfiguration>
262296 </File>
263297 </Filter>
264298 <Filter
265299 Name="Header Files"
266- Filter="h;hpp;hxx;hm;inl"
267- >
300+ Filter="h;hpp;hxx;hm;inl">
268301 <File
269- RelativePath=".\configure.h"
270- >
271- </File>
272- <File
273- RelativePath=".\configure_wizard.h"
274- >
275- </File>
276- <File
277- RelativePath=".\finished_page.h"
278- >
302+ RelativePath="configure.h">
279303 </File>
280304 <File
281- RelativePath=".\resource.h"
282- >
283- </File>
284- <File
285- RelativePath=".\stdafx.h"
286- >
305+ RelativePath="configure_wizard.h">
287306 </File>
288307 <File
289- RelativePath=".\system_page.h"
290- >
308+ RelativePath="finished_page.h">
291309 </File>
292310 <File
293- RelativePath=".\target_page.h"
294- >
311+ RelativePath="resource.h">
295312 </File>
296313 <File
297- RelativePath=".\WaitDlg.h"
298- >
314+ RelativePath="stdafx.h">
299315 </File>
300316 <File
301- RelativePath=".\welcome_page.h"
302- >
317+ RelativePath="system_page.h">
318+ </File>
319+ <File
320+ RelativePath="target_page.h">
321+ </File>
322+ <File
323+ RelativePath="WaitDlg.h">
324+ </File>
325+ <File
326+ RelativePath="welcome_page.h">
303327 </File>
304328 </Filter>
305329 <Filter
306330 Name="Resource Files"
307- Filter="ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe"
308- >
331+ Filter="ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe">
309332 <File
310- RelativePath=".\res\configure.ico"
311- >
333+ RelativePath="res\configure.ico">
312334 </File>
313335 <File
314- RelativePath=".\res\configure.rc2"
315- >
336+ RelativePath="res\configure.rc2">
316337 </File>
317338 <File
318- RelativePath=".\res\magick.bmp"
319- >
339+ RelativePath="res\magick.bmp">
320340 </File>
321341 </Filter>
322342 </Files>
323343 <Globals>
324- <Global
325- Name="RESOURCE_FILE"
326- Value="configure.rc"
327- />
328344 </Globals>
329345 </VisualStudioProject>
diff -r 4ff76a689757 -r 0c762d64a474 VisualMagick/configure/stdafx.h
--- a/VisualMagick/configure/stdafx.h Mon Aug 08 08:02:41 2022 -0500
+++ b/VisualMagick/configure/stdafx.h Wed Aug 10 18:36:36 2022 +0200
@@ -10,7 +10,9 @@
1010 #pragma once
1111 #endif // _MSC_VER > 1000
1212
13-#define VC_EXTRALEAN // Exclude rarely-used stuff from Windows headers
13+#define VC_EXTRALEAN // Exclude rarely-used stuff from Windows headers for MFC
14+#define WIN32_LEAN_AND_MEAN // Exclude rarely-used stuff from Windows headers
15+
1416
1517 #include <afxwin.h> // MFC core and standard components
1618 #include <afxext.h> // MFC extensions
Afficher sur ancien navigateur de dépôt.