Upgrade bundled zlib to 1.2.8.

[wxWidgets.git] / build / msw / wx_vc10_net.vcxproj

diff --git a/build/msw/wx_vc10_net.vcxproj b/build/msw/wx_vc10_net.vcxproj
index e99b99953ea0bb90ee2f8c40c918238522b8176e..155986596772d253f06a686e537dc679b9bf7918 100644 (file)
--- a/build/msw/wx_vc10_net.vcxproj
+++ b/build/msw/wx_vc10_net.vcxproj
@@ -73,9 +73,10 @@
     <IntDir Condition="'$(Configuration)|$(Platform)'=='DLL Release|Win32'">vc_mswudll\net\</IntDir>\r
     <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='DLL Release|Win32'">false</LinkIncremental>\r
     <GenerateManifest Condition="'$(Configuration)|$(Platform)'=='DLL Release|Win32'">true</GenerateManifest>\r
     <IntDir Condition="'$(Configuration)|$(Platform)'=='DLL Release|Win32'">vc_mswudll\net\</IntDir>\r
     <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='DLL Release|Win32'">false</LinkIncremental>\r
     <GenerateManifest Condition="'$(Configuration)|$(Platform)'=='DLL Release|Win32'">true</GenerateManifest>\r

-    <TargetName Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">wxbase29ud_net</TargetName>\r
-    <TargetName Condition="'$(Configuration)|$(Platform)'=='DLL Debug|Win32'">wxbase295ud_$(ProjectName)_vc_custom</TargetName>
-    <TargetName Condition="'$(Configuration)|$(Platform)'=='DLL Release|Win32'">wxbase295u_$(ProjectName)_vc_custom</TargetName>
+    <TargetName Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">wxbase30ud_net</TargetName>\r
+    <TargetName Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">wxbase30u_net</TargetName>\r
+    <TargetName Condition="'$(Configuration)|$(Platform)'=='DLL Debug|Win32'">wxbase30ud_$(ProjectName)_vc_custom</TargetName>\r
+    <TargetName Condition="'$(Configuration)|$(Platform)'=='DLL Release|Win32'">wxbase30u_$(ProjectName)_vc_custom</TargetName>\r

   </PropertyGroup>\r
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">\r
     <Midl>\r
   </PropertyGroup>\r
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">\r
     <Midl>\r


@@ -96,7 +97,7 @@
       <PrecompiledHeaderFile>wx/wxprec.h</PrecompiledHeaderFile>\r
       <PrecompiledHeaderOutputFile>vc_mswud\wxprec_netlib.pch</PrecompiledHeaderOutputFile>\r
       <ObjectFileName>vc_mswud\net\</ObjectFileName>\r
       <PrecompiledHeaderFile>wx/wxprec.h</PrecompiledHeaderFile>\r
       <PrecompiledHeaderOutputFile>vc_mswud\wxprec_netlib.pch</PrecompiledHeaderOutputFile>\r
       <ObjectFileName>vc_mswud\net\</ObjectFileName>\r

-      <ProgramDataBaseFileName>$(OutDir)wxbase29ud_net.pdb</ProgramDataBaseFileName>\r
+      <ProgramDataBaseFileName>$(OutDir)wxbase30ud_net.pdb</ProgramDataBaseFileName>\r

       <WarningLevel>Level4</WarningLevel>\r
       <SuppressStartupBanner>true</SuppressStartupBanner>\r
       <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>\r
       <WarningLevel>Level4</WarningLevel>\r
       <SuppressStartupBanner>true</SuppressStartupBanner>\r
       <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>\r


@@ -107,7 +108,7 @@
       <AdditionalIncludeDirectories>$(OutDir)mswud;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>\r
     </ResourceCompile>\r
     <Lib>\r
       <AdditionalIncludeDirectories>$(OutDir)mswud;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>\r
     </ResourceCompile>\r
     <Lib>\r

-      <OutputFile>$(OutDir)wxbase29ud_net.lib</OutputFile>\r
+      <OutputFile>$(OutDir)wxbase30ud_net.lib</OutputFile>\r

       <SuppressStartupBanner>true</SuppressStartupBanner>\r
     </Lib>\r
     <Bscmake>\r
       <SuppressStartupBanner>true</SuppressStartupBanner>\r
     </Lib>\r
     <Bscmake>\r


@@ -132,7 +133,7 @@
       <PrecompiledHeaderFile>wx/wxprec.h</PrecompiledHeaderFile>\r
       <PrecompiledHeaderOutputFile>vc_mswu\wxprec_netlib.pch</PrecompiledHeaderOutputFile>\r
       <ObjectFileName>vc_mswu\net\</ObjectFileName>\r
       <PrecompiledHeaderFile>wx/wxprec.h</PrecompiledHeaderFile>\r
       <PrecompiledHeaderOutputFile>vc_mswu\wxprec_netlib.pch</PrecompiledHeaderOutputFile>\r
       <ObjectFileName>vc_mswu\net\</ObjectFileName>\r

-      <ProgramDataBaseFileName>$(OutDir)wxbase29u_net.pdb</ProgramDataBaseFileName>\r
+      <ProgramDataBaseFileName>$(OutDir)wxbase30u_net.pdb</ProgramDataBaseFileName>\r

       <WarningLevel>Level4</WarningLevel>\r
       <SuppressStartupBanner>true</SuppressStartupBanner>\r
       <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>\r
       <WarningLevel>Level4</WarningLevel>\r
       <SuppressStartupBanner>true</SuppressStartupBanner>\r
       <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>\r


@@ -143,7 +144,7 @@
       <AdditionalIncludeDirectories>$(OutDir)mswu;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>\r
     </ResourceCompile>\r
     <Lib>\r
       <AdditionalIncludeDirectories>$(OutDir)mswu;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>\r
     </ResourceCompile>\r
     <Lib>\r

-      <OutputFile>$(OutDir)wxbase29u_net.lib</OutputFile>\r
+      <OutputFile>$(OutDir)wxbase30u_net.lib</OutputFile>\r

       <SuppressStartupBanner>true</SuppressStartupBanner>\r
     </Lib>\r
     <Bscmake>\r
       <SuppressStartupBanner>true</SuppressStartupBanner>\r
     </Lib>\r
     <Bscmake>\r


@@ -170,25 +171,25 @@
       <PrecompiledHeaderFile>wx/wxprec.h</PrecompiledHeaderFile>\r
       <PrecompiledHeaderOutputFile>vc_mswuddll\wxprec_netdll.pch</PrecompiledHeaderOutputFile>\r
       <ObjectFileName>vc_mswuddll\net\</ObjectFileName>\r
       <PrecompiledHeaderFile>wx/wxprec.h</PrecompiledHeaderFile>\r
       <PrecompiledHeaderOutputFile>vc_mswuddll\wxprec_netdll.pch</PrecompiledHeaderOutputFile>\r
       <ObjectFileName>vc_mswuddll\net\</ObjectFileName>\r

-      <ProgramDataBaseFileName>$(OutDir)wxbase295ud_net_vc_custom.pdb</ProgramDataBaseFileName>\r
+      <ProgramDataBaseFileName>$(OutDir)wxbase30ud_net_vc_custom.pdb</ProgramDataBaseFileName>\r

       <WarningLevel>Level4</WarningLevel>\r
       <SuppressStartupBanner>true</SuppressStartupBanner>\r
       <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>\r
     </ClCompile>\r
     <ResourceCompile>\r
       <WarningLevel>Level4</WarningLevel>\r
       <SuppressStartupBanner>true</SuppressStartupBanner>\r
       <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>\r
     </ClCompile>\r
     <ResourceCompile>\r

-      <PreprocessorDefinitions>_DEBUG;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;_UNICODE;WXBUILDING;WXDLLNAME=wxbase295ud_net_vc_custom;wxUSE_GUI=0;WXUSINGDLL;WXMAKINGDLL_NET;%(PreprocessorDefinitions)</PreprocessorDefinitions>\r
+      <PreprocessorDefinitions>_DEBUG;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;_UNICODE;WXBUILDING;WXDLLNAME=wxbase30ud_net_vc_custom;wxUSE_GUI=0;WXUSINGDLL;WXMAKINGDLL_NET;%(PreprocessorDefinitions)</PreprocessorDefinitions>\r

       <Culture>0x0409</Culture>\r
       <AdditionalIncludeDirectories>$(OutDir)mswud;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>\r
     </ResourceCompile>\r
     <Link>\r
       <AdditionalOptions>%(AdditionalOptions)</AdditionalOptions>\r
       <Culture>0x0409</Culture>\r
       <AdditionalIncludeDirectories>$(OutDir)mswud;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>\r
     </ResourceCompile>\r
     <Link>\r
       <AdditionalOptions>%(AdditionalOptions)</AdditionalOptions>\r

-      <AdditionalDependencies>wxzlibd.lib;wxregexud.lib;wxexpatd.lib;kernel32.lib;user32.lib;gdi32.lib;comdlg32.lib;winspool.lib;winmm.lib;shell32.lib;comctl32.lib;ole32.lib;oleaut32.lib;uuid.lib;rpcrt4.lib;advapi32.lib;wsock32.lib;wininet.lib;$(OutDir)wxbase29ud.lib;%(AdditionalDependencies)</AdditionalDependencies>\r
-      <OutputFile>$(OutDir)wxbase295ud_net_vc_custom.dll</OutputFile>\r
-      <ImportLibrary>$(OutDir)wxbase29ud_net.lib</ImportLibrary>\r
+      <AdditionalDependencies>wxzlibd.lib;wxregexud.lib;wxexpatd.lib;kernel32.lib;user32.lib;gdi32.lib;comdlg32.lib;winspool.lib;winmm.lib;shell32.lib;comctl32.lib;ole32.lib;oleaut32.lib;uuid.lib;rpcrt4.lib;advapi32.lib;wsock32.lib;wininet.lib;$(OutDir)wxbase30ud.lib;%(AdditionalDependencies)</AdditionalDependencies>\r
+      <OutputFile>$(OutDir)wxbase30ud_net_vc_custom.dll</OutputFile>\r
+      <ImportLibrary>$(OutDir)wxbase30ud_net.lib</ImportLibrary>\r

       <SuppressStartupBanner>true</SuppressStartupBanner>\r
       <AdditionalLibraryDirectories>$(OutDir);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>\r
       <GenerateDebugInformation>true</GenerateDebugInformation>\r
       <SuppressStartupBanner>true</SuppressStartupBanner>\r
       <AdditionalLibraryDirectories>$(OutDir);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>\r
       <GenerateDebugInformation>true</GenerateDebugInformation>\r

-      <ProgramDatabaseFile>$(OutDir)wxbase295ud_net_vc_custom.pdb</ProgramDatabaseFile>\r
+      <ProgramDatabaseFile>$(OutDir)wxbase30ud_net_vc_custom.pdb</ProgramDatabaseFile>\r

       <TargetMachine>MachineX86</TargetMachine>\r
     </Link>\r
     <Bscmake>\r
       <TargetMachine>MachineX86</TargetMachine>\r
     </Link>\r
     <Bscmake>\r


@@ -213,25 +214,25 @@
       <PrecompiledHeaderFile>wx/wxprec.h</PrecompiledHeaderFile>\r
       <PrecompiledHeaderOutputFile>vc_mswudll\wxprec_netdll.pch</PrecompiledHeaderOutputFile>\r
       <ObjectFileName>vc_mswudll\net\</ObjectFileName>\r
       <PrecompiledHeaderFile>wx/wxprec.h</PrecompiledHeaderFile>\r
       <PrecompiledHeaderOutputFile>vc_mswudll\wxprec_netdll.pch</PrecompiledHeaderOutputFile>\r
       <ObjectFileName>vc_mswudll\net\</ObjectFileName>\r

-      <ProgramDataBaseFileName>$(OutDir)wxbase295u_net_vc_custom.pdb</ProgramDataBaseFileName>\r
+      <ProgramDataBaseFileName>$(OutDir)wxbase30u_net_vc_custom.pdb</ProgramDataBaseFileName>\r

       <WarningLevel>Level4</WarningLevel>\r
       <SuppressStartupBanner>true</SuppressStartupBanner>\r
       <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>\r
     </ClCompile>\r
     <ResourceCompile>\r
       <WarningLevel>Level4</WarningLevel>\r
       <SuppressStartupBanner>true</SuppressStartupBanner>\r
       <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>\r
     </ClCompile>\r
     <ResourceCompile>\r

-      <PreprocessorDefinitions>_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;NDEBUG;_UNICODE;WXBUILDING;WXDLLNAME=wxbase295u_net_vc_custom;wxUSE_GUI=0;WXUSINGDLL;WXMAKINGDLL_NET;%(PreprocessorDefinitions)</PreprocessorDefinitions>\r
+      <PreprocessorDefinitions>_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;NDEBUG;_UNICODE;WXBUILDING;WXDLLNAME=wxbase30u_net_vc_custom;wxUSE_GUI=0;WXUSINGDLL;WXMAKINGDLL_NET;%(PreprocessorDefinitions)</PreprocessorDefinitions>\r

       <Culture>0x0409</Culture>\r
       <AdditionalIncludeDirectories>$(OutDir)mswu;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>\r
     </ResourceCompile>\r
     <Link>\r
       <AdditionalOptions>%(AdditionalOptions)</AdditionalOptions>\r
       <Culture>0x0409</Culture>\r
       <AdditionalIncludeDirectories>$(OutDir)mswu;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>\r
     </ResourceCompile>\r
     <Link>\r
       <AdditionalOptions>%(AdditionalOptions)</AdditionalOptions>\r

-      <AdditionalDependencies>wxzlib.lib;wxregexu.lib;wxexpat.lib;kernel32.lib;user32.lib;gdi32.lib;comdlg32.lib;winspool.lib;winmm.lib;shell32.lib;comctl32.lib;ole32.lib;oleaut32.lib;uuid.lib;rpcrt4.lib;advapi32.lib;wsock32.lib;wininet.lib;$(OutDir)wxbase29u.lib;%(AdditionalDependencies)</AdditionalDependencies>\r
-      <OutputFile>$(OutDir)wxbase295u_net_vc_custom.dll</OutputFile>\r
-      <ImportLibrary>$(OutDir)wxbase29u_net.lib</ImportLibrary>\r
+      <AdditionalDependencies>wxzlib.lib;wxregexu.lib;wxexpat.lib;kernel32.lib;user32.lib;gdi32.lib;comdlg32.lib;winspool.lib;winmm.lib;shell32.lib;comctl32.lib;ole32.lib;oleaut32.lib;uuid.lib;rpcrt4.lib;advapi32.lib;wsock32.lib;wininet.lib;$(OutDir)wxbase30u.lib;%(AdditionalDependencies)</AdditionalDependencies>\r
+      <OutputFile>$(OutDir)wxbase30u_net_vc_custom.dll</OutputFile>\r
+      <ImportLibrary>$(OutDir)wxbase30u_net.lib</ImportLibrary>\r

       <SuppressStartupBanner>true</SuppressStartupBanner>\r
       <AdditionalLibraryDirectories>$(OutDir);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>\r
       <GenerateDebugInformation>true</GenerateDebugInformation>\r
       <SuppressStartupBanner>true</SuppressStartupBanner>\r
       <AdditionalLibraryDirectories>$(OutDir);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>\r
       <GenerateDebugInformation>true</GenerateDebugInformation>\r

-      <ProgramDatabaseFile>$(OutDir)wxbase295u_net_vc_custom.pdb</ProgramDatabaseFile>\r
+      <ProgramDatabaseFile>$(OutDir)wxbase30u_net_vc_custom.pdb</ProgramDatabaseFile>\r

       <TargetMachine>MachineX86</TargetMachine>\r
       <OptimizeReferences>true</OptimizeReferences>\r
       <EnableCOMDATFolding>true</EnableCOMDATFolding>\r
       <TargetMachine>MachineX86</TargetMachine>\r
       <OptimizeReferences>true</OptimizeReferences>\r
       <EnableCOMDATFolding>true</EnableCOMDATFolding>\r