wxMessageBox off the main thread lost result code.

[wxWidgets.git] / src / png / projects / vstudio / pngvalid / pngvalid.vcxproj

diff --git a/src/png/projects/vstudio/pngvalid/pngvalid.vcxproj b/src/png/projects/vstudio/pngvalid/pngvalid.vcxproj
index ea5f30a61f984acb2babbbe2b8a66ee20bddcd81..a87283aa953d27da32be2643276ce0d939657b14 100644 (file)
--- a/src/png/projects/vstudio/pngvalid/pngvalid.vcxproj
+++ b/src/png/projects/vstudio/pngvalid/pngvalid.vcxproj
@@ -23,8 +23,8 @@
     <Keyword>Win32Proj</Keyword>\r
     <RootNamespace>pngvalid</RootNamespace>\r
   </PropertyGroup>\r
     <Keyword>Win32Proj</Keyword>\r
     <RootNamespace>pngvalid</RootNamespace>\r
   </PropertyGroup>\r

-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />\r

   <Import Project="$(SolutionDir)\zlib.props" />\r
   <Import Project="$(SolutionDir)\zlib.props" />\r

+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />\r

   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">\r
     <ConfigurationType>Application</ConfigurationType>\r
     <CharacterSet>Unicode</CharacterSet>\r
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">\r
     <ConfigurationType>Application</ConfigurationType>\r
     <CharacterSet>Unicode</CharacterSet>\r


@@ -91,11 +91,12 @@
       <FunctionLevelLinking>false</FunctionLevelLinking>\r
       <BrowseInformation>true</BrowseInformation>\r
       <FloatingPointExceptions>false</FloatingPointExceptions>\r
       <FunctionLevelLinking>false</FunctionLevelLinking>\r
       <BrowseInformation>true</BrowseInformation>\r
       <FloatingPointExceptions>false</FloatingPointExceptions>\r

+      <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>\r

     </ClCompile>\r
     <Link>\r
       <SubSystem>Console</SubSystem>\r
       <GenerateDebugInformation>true</GenerateDebugInformation>\r
     </ClCompile>\r
     <Link>\r
       <SubSystem>Console</SubSystem>\r
       <GenerateDebugInformation>true</GenerateDebugInformation>\r

-      <AdditionalDependencies>libpng15.lib;zlib.lib</AdditionalDependencies>\r
+      <AdditionalDependencies>libpng16.lib;zlib.lib</AdditionalDependencies>\r

       <AdditionalLibraryDirectories>$(OutDir)</AdditionalLibraryDirectories>\r
     </Link>\r
     <CustomBuildStep>\r
       <AdditionalLibraryDirectories>$(OutDir)</AdditionalLibraryDirectories>\r
     </Link>\r
     <CustomBuildStep>\r


@@ -128,7 +129,7 @@
     <Link>\r
       <SubSystem>Console</SubSystem>\r
       <GenerateDebugInformation>true</GenerateDebugInformation>\r
     <Link>\r
       <SubSystem>Console</SubSystem>\r
       <GenerateDebugInformation>true</GenerateDebugInformation>\r

-      <AdditionalDependencies>libpng15.lib;zlib.lib</AdditionalDependencies>\r
+      <AdditionalDependencies>libpng16.lib;zlib.lib</AdditionalDependencies>\r

       <AdditionalLibraryDirectories>$(OutDir)</AdditionalLibraryDirectories>\r
     </Link>\r
     <CustomBuildStep>\r
       <AdditionalLibraryDirectories>$(OutDir)</AdditionalLibraryDirectories>\r
     </Link>\r
     <CustomBuildStep>\r


@@ -162,7 +163,7 @@
       <GenerateDebugInformation>true</GenerateDebugInformation>\r
       <EnableCOMDATFolding>true</EnableCOMDATFolding>\r
       <OptimizeReferences>true</OptimizeReferences>\r
       <GenerateDebugInformation>true</GenerateDebugInformation>\r
       <EnableCOMDATFolding>true</EnableCOMDATFolding>\r
       <OptimizeReferences>true</OptimizeReferences>\r

-      <AdditionalDependencies>libpng15.lib;zlib.lib</AdditionalDependencies>\r
+      <AdditionalDependencies>libpng16.lib;zlib.lib</AdditionalDependencies>\r

       <AdditionalLibraryDirectories>$(OutDir)</AdditionalLibraryDirectories>\r
       <LinkTimeCodeGeneration>UseLinkTimeCodeGeneration</LinkTimeCodeGeneration>\r
     </Link>\r
       <AdditionalLibraryDirectories>$(OutDir)</AdditionalLibraryDirectories>\r
       <LinkTimeCodeGeneration>UseLinkTimeCodeGeneration</LinkTimeCodeGeneration>\r
     </Link>\r


@@ -198,20 +199,19 @@
       <GenerateDebugInformation>true</GenerateDebugInformation>\r
       <EnableCOMDATFolding>true</EnableCOMDATFolding>\r
       <OptimizeReferences>true</OptimizeReferences>\r
       <GenerateDebugInformation>true</GenerateDebugInformation>\r
       <EnableCOMDATFolding>true</EnableCOMDATFolding>\r
       <OptimizeReferences>true</OptimizeReferences>\r

-      <AdditionalDependencies>libpng15.lib;zlib.lib</AdditionalDependencies>\r
+      <AdditionalDependencies>libpng16.lib;zlib.lib</AdditionalDependencies>\r

       <AdditionalLibraryDirectories>$(OutDir)</AdditionalLibraryDirectories>\r
       <LinkTimeCodeGeneration>UseLinkTimeCodeGeneration</LinkTimeCodeGeneration>\r
     </Link>\r
     <CustomBuildStep>\r
       <Message>Executing PNG validation program</Message>\r
       <AdditionalLibraryDirectories>$(OutDir)</AdditionalLibraryDirectories>\r
       <LinkTimeCodeGeneration>UseLinkTimeCodeGeneration</LinkTimeCodeGeneration>\r
     </Link>\r
     <CustomBuildStep>\r
       <Message>Executing PNG validation program</Message>\r

-      <Command>$(OutDir)pngvalid.exe ..\..\..\pngvalid.png $(IntDir)pngout.png</Command>\r

       <Command>"$(OutDir)pngvalid.exe" --touch "$(IntDir)pngvalid.out"</Command>\r
       <Outputs>$(IntDir)pngvalid.out</Outputs>\r
       <Inputs>$(OutDir)pngvalid.exe</Inputs>\r
     </CustomBuildStep>\r
   </ItemDefinitionGroup>\r
   <ItemGroup>\r
       <Command>"$(OutDir)pngvalid.exe" --touch "$(IntDir)pngvalid.out"</Command>\r
       <Outputs>$(IntDir)pngvalid.out</Outputs>\r
       <Inputs>$(OutDir)pngvalid.exe</Inputs>\r
     </CustomBuildStep>\r
   </ItemDefinitionGroup>\r
   <ItemGroup>\r

-    <ClCompile Include="..\..\..\pngvalid.c" />\r
+    <ClCompile Include="..\..\..\contrib\libtests\pngvalid.c" />\r

   </ItemGroup>\r
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />\r
   <ImportGroup Label="ExtensionTargets">\r
   </ItemGroup>\r
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />\r
   <ImportGroup Label="ExtensionTargets">\r