diff --git a/ANNOUNCE b/ANNOUNCE
index 3b07fd0b4..df504ed7b 100644
--- a/ANNOUNCE
+++ b/ANNOUNCE
@@ -378,6 +378,11 @@ Version 1.5.0beta44 [August 24, 2010]
Turn on progressive reader in pngvalid.c by default and tidy code.
Version 1.5.0beta45 [August 24, 2010]
+ Added an explicit make step to projects/vstudio for pnglibconf.h
+ Also corrected zlib.vcxproj into which Visual Studio had introduced
+ what it calls an "authoring error". The change to make pnglibconf.h
+ simply copies the file; in the future it may actually generate the
+ file from scripts/pnglibconf.dfa as the other build systems do.
Send comments/corrections/commendations to png-mng-implement at lists.sf.net:
(subscription required; visit
diff --git a/CHANGES b/CHANGES
index d1000d238..965e1d5a3 100644
--- a/CHANGES
+++ b/CHANGES
@@ -3015,6 +3015,11 @@ Version 1.5.0beta44 [August 24, 2010]
Turn on progressive reader in pngvalid.c by default and tidy code.
Version 1.5.0beta45 [August 24, 2010]
+ Added an explicit make step to projects/vstudio for pnglibconf.h
+ Also corrected zlib.vcxproj into which Visual Studio had introduced
+ what it calls an "authoring error". The change to make pnglibconf.h
+ simply copies the file; in the future it may actually generate the
+ file from scripts/pnglibconf.dfa as the other build systems do.
Send comments/corrections/commendations to png-mng-implement at lists.sf.net
(subscription required; visit
diff --git a/projects/vstudio/libpng/libpng.vcxproj b/projects/vstudio/libpng/libpng.vcxproj
index a25bad09f..69779007c 100644
--- a/projects/vstudio/libpng/libpng.vcxproj
+++ b/projects/vstudio/libpng/libpng.vcxproj
@@ -98,7 +98,7 @@
CompileAsC
true
4996;4127
- $(ZLibSrcDir);..\..\..\scripts;%(AdditionalIncludeDirectories)
+ $(ZLibSrcDir);%(AdditionalIncludeDirectories)
true
Disabled
@@ -128,7 +128,7 @@
CompileAsC
true
4996;4127
- $(ZLibSrcDir);..\..\..\scripts;%(AdditionalIncludeDirectories)
+ $(ZLibSrcDir);%(AdditionalIncludeDirectories)
true
MultiThreadedDebug
@@ -153,7 +153,7 @@
true
false
4996;4127
- $(ZLibSrcDir);..\..\..\scripts;%(AdditionalIncludeDirectories)
+ $(ZLibSrcDir);%(AdditionalIncludeDirectories)
true
Full
@@ -184,7 +184,7 @@
true
false
4996;4127
- $(ZLibSrcDir);..\..\..\scripts;%(AdditionalIncludeDirectories)
+ $(ZLibSrcDir);%(AdditionalIncludeDirectories)
true
Full
true
diff --git a/projects/vstudio/pnglibconf/pnglibconf.vcxproj b/projects/vstudio/pnglibconf/pnglibconf.vcxproj
new file mode 100644
index 000000000..39bfaed0f
--- /dev/null
+++ b/projects/vstudio/pnglibconf/pnglibconf.vcxproj
@@ -0,0 +1,120 @@
+
+
+
+
+ Release
+ Win32
+
+
+
+ {EB33566E-DA7F-4D28-9077-88C0B7C77E35}
+ pnglibconf
+
+
+
+ Application
+ false
+ true
+ MultiByte
+
+
+
+
+
+
+
+
+
+ Build
+
+
+
+ Level3
+ MaxSpeed
+ true
+ true
+
+
+ true
+ true
+ true
+
+
+ copy ..\..\..\scripts\pnglibconf.h ..\..\..\pnglibconf.h
+
+
+ Generating pnglibconf.h
+
+
+ ..\..\..\pnglibconf.h
+
+
+ ..\..\..\scripts\pnglibconf.h
+
+
+
+
+
+
+
+
+
+
+
+
+ Release
+ Win32
+
+
+
+ {EB33566E-DA7F-4D28-9077-88C0B7C77E35}
+ pnglibconf
+
+
+
+ Application
+ false
+ true
+ MultiByte
+
+
+
+
+
+
+
+
+
+ Build
+
+
+
+ Level3
+ MaxSpeed
+ true
+ true
+
+
+ true
+ true
+ true
+
+
+ copy ..\..\..\scripts\pnglibconf.h ..\..\..\pnglibconf.h
+
+
+ Generating pnglibconf.h
+
+
+ ..\..\..\pnglibconf.h
+
+
+ ..\..\..\scripts\pnglibconf.h
+
+
+
+
+
+
+
+
diff --git a/projects/vstudio/vstudio.sln b/projects/vstudio/vstudio.sln
index abf59de31..fad771b1f 100644
--- a/projects/vstudio/vstudio.sln
+++ b/projects/vstudio/vstudio.sln
@@ -3,11 +3,13 @@ Microsoft Visual Studio Solution File, Format Version 11.00
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libpng", "libpng\libpng.vcxproj", "{D6973076-9317-4EF2-A0B8-B7A18AC0713E}"
ProjectSection(ProjectDependencies) = postProject
{64CE4900-97EA-2DD5-4226-F2E36FFF2867} = {64CE4900-97EA-2DD5-4226-F2E36FFF2867}
+ {EB33566E-DA7F-4D28-9077-88C0B7C77E35} = {EB33566E-DA7F-4D28-9077-88C0B7C77E35}
EndProjectSection
EndProject
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "pngtest", "pngtest\pngtest.vcxproj", "{228BA965-50D5-42B2-8BCF-AFCC227E3C1D}"
ProjectSection(ProjectDependencies) = postProject
{64CE4900-97EA-2DD5-4226-F2E36FFF2867} = {64CE4900-97EA-2DD5-4226-F2E36FFF2867}
+ {EB33566E-DA7F-4D28-9077-88C0B7C77E35} = {EB33566E-DA7F-4D28-9077-88C0B7C77E35}
{D6973076-9317-4EF2-A0B8-B7A18AC0713E} = {D6973076-9317-4EF2-A0B8-B7A18AC0713E}
EndProjectSection
EndProject
@@ -16,9 +18,12 @@ EndProject
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "pngvalid", "pngvalid\pngvalid.vcxproj", "{9B36B6FE-7FC0-434F-A71F-BBEF8099F1D8}"
ProjectSection(ProjectDependencies) = postProject
{64CE4900-97EA-2DD5-4226-F2E36FFF2867} = {64CE4900-97EA-2DD5-4226-F2E36FFF2867}
+ {EB33566E-DA7F-4D28-9077-88C0B7C77E35} = {EB33566E-DA7F-4D28-9077-88C0B7C77E35}
{D6973076-9317-4EF2-A0B8-B7A18AC0713E} = {D6973076-9317-4EF2-A0B8-B7A18AC0713E}
EndProjectSection
EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "pnglibconf", "pnglibconf\pnglibconf.vcxproj", "{EB33566E-DA7F-4D28-9077-88C0B7C77E35}"
+EndProject
Global
GlobalSection(SolutionConfigurationPlatforms) = preSolution
Debug Library|Win32 = Debug Library|Win32
@@ -59,6 +64,14 @@ Global
{9B36B6FE-7FC0-434F-A71F-BBEF8099F1D8}.Release Library|Win32.Build.0 = Release Library|Win32
{9B36B6FE-7FC0-434F-A71F-BBEF8099F1D8}.Release|Win32.ActiveCfg = Release|Win32
{9B36B6FE-7FC0-434F-A71F-BBEF8099F1D8}.Release|Win32.Build.0 = Release|Win32
+ {EB33566E-DA7F-4D28-9077-88C0B7C77E35}.Debug Library|Win32.ActiveCfg = Release|Win32
+ {EB33566E-DA7F-4D28-9077-88C0B7C77E35}.Debug Library|Win32.Build.0 = Release|Win32
+ {EB33566E-DA7F-4D28-9077-88C0B7C77E35}.Debug|Win32.ActiveCfg = Release|Win32
+ {EB33566E-DA7F-4D28-9077-88C0B7C77E35}.Debug|Win32.Build.0 = Release|Win32
+ {EB33566E-DA7F-4D28-9077-88C0B7C77E35}.Release Library|Win32.ActiveCfg = Release|Win32
+ {EB33566E-DA7F-4D28-9077-88C0B7C77E35}.Release Library|Win32.Build.0 = Release|Win32
+ {EB33566E-DA7F-4D28-9077-88C0B7C77E35}.Release|Win32.ActiveCfg = Release|Win32
+ {EB33566E-DA7F-4D28-9077-88C0B7C77E35}.Release|Win32.Build.0 = Release|Win32
EndGlobalSection
GlobalSection(SolutionProperties) = preSolution
HideSolutionNode = FALSE
diff --git a/projects/vstudio/zlib/zlib.vcxproj b/projects/vstudio/zlib/zlib.vcxproj
index c16fd8223..aa125defe 100644
--- a/projects/vstudio/zlib/zlib.vcxproj
+++ b/projects/vstudio/zlib/zlib.vcxproj
@@ -64,9 +64,6 @@
-
-
-