Define _CRT_NONSTDC_NO_WARNINGS for zlib compilation with MSVC.

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

diff --git a/build/msw/wx_vc10_ribbon.vcxproj b/build/msw/wx_vc10_ribbon.vcxproj
index 97f36ad13b8904247af91b8d7a5095b5c92e48d8..6ebc8825c1f411aaa21de22ad6813c9881bb72e4 100644 (file)
--- a/build/msw/wx_vc10_ribbon.vcxproj
+++ b/build/msw/wx_vc10_ribbon.vcxproj
@@ -73,10 +73,10 @@
     <IntDir Condition="'$(Configuration)|$(Platform)'=='DLL Release|Win32'">vc_mswudll\ribbon\</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\ribbon\</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'">wxmsw29ud_ribbon</TargetName>\r
-    <TargetName Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">wxmsw29u_ribbon</TargetName>\r
-    <TargetName Condition="'$(Configuration)|$(Platform)'=='DLL Debug|Win32'">wxmsw295ud_$(ProjectName)_vc_custom</TargetName>\r
-    <TargetName Condition="'$(Configuration)|$(Platform)'=='DLL Release|Win32'">wxmsw295u_$(ProjectName)_vc_custom</TargetName>\r
+    <TargetName Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">wxmsw30ud_ribbon</TargetName>\r
+    <TargetName Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">wxmsw30u_ribbon</TargetName>\r
+    <TargetName Condition="'$(Configuration)|$(Platform)'=='DLL Debug|Win32'">wxmsw30ud_$(ProjectName)_vc_custom</TargetName>\r
+    <TargetName Condition="'$(Configuration)|$(Platform)'=='DLL Release|Win32'">wxmsw30u_$(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


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

-      <ProgramDataBaseFileName>$(OutDir)wxmsw29ud_ribbon.pdb</ProgramDataBaseFileName>\r
+      <ProgramDataBaseFileName>$(OutDir)wxmsw30ud_ribbon.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


@@ -108,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)wxmsw29ud_ribbon.lib</OutputFile>\r
+      <OutputFile>$(OutDir)wxmsw30ud_ribbon.lib</OutputFile>\r

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


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

-      <ProgramDataBaseFileName>$(OutDir)wxmsw29u_ribbon.pdb</ProgramDataBaseFileName>\r
+      <ProgramDataBaseFileName>$(OutDir)wxmsw30u_ribbon.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


@@ -144,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)wxmsw29u_ribbon.lib</OutputFile>\r
+      <OutputFile>$(OutDir)wxmsw30u_ribbon.lib</OutputFile>\r

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


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

-      <ProgramDataBaseFileName>$(OutDir)wxmsw295ud_ribbon_vc_custom.pdb</ProgramDataBaseFileName>\r
+      <ProgramDataBaseFileName>$(OutDir)wxmsw30ud_ribbon_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=wxmsw295ud_ribbon_vc_custom;WXUSINGDLL;WXMAKINGDLL_RIBBON;%(PreprocessorDefinitions)</PreprocessorDefinitions>\r
+      <PreprocessorDefinitions>_DEBUG;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;_UNICODE;WXBUILDING;WXDLLNAME=wxmsw30ud_ribbon_vc_custom;WXUSINGDLL;WXMAKINGDLL_RIBBON;%(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>wxtiffd.lib;wxjpegd.lib;wxpngd.lib;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)wxmsw29ud_adv.lib;$(OutDir)wxmsw29ud_core.lib;$(OutDir)wxbase29ud.lib;%(AdditionalDependencies)</AdditionalDependencies>\r
-      <OutputFile>$(OutDir)wxmsw295ud_ribbon_vc_custom.dll</OutputFile>\r
-      <ImportLibrary>$(OutDir)wxmsw29ud_ribbon.lib</ImportLibrary>\r
+      <AdditionalDependencies>wxtiffd.lib;wxjpegd.lib;wxpngd.lib;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)wxmsw30ud_adv.lib;$(OutDir)wxmsw30ud_core.lib;$(OutDir)wxbase30ud.lib;%(AdditionalDependencies)</AdditionalDependencies>\r
+      <OutputFile>$(OutDir)wxmsw30ud_ribbon_vc_custom.dll</OutputFile>\r
+      <ImportLibrary>$(OutDir)wxmsw30ud_ribbon.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)wxmsw295ud_ribbon_vc_custom.pdb</ProgramDatabaseFile>\r
+      <ProgramDatabaseFile>$(OutDir)wxmsw30ud_ribbon_vc_custom.pdb</ProgramDatabaseFile>\r

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


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

-      <ProgramDataBaseFileName>$(OutDir)wxmsw295u_ribbon_vc_custom.pdb</ProgramDataBaseFileName>\r
+      <ProgramDataBaseFileName>$(OutDir)wxmsw30u_ribbon_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=wxmsw295u_ribbon_vc_custom;WXUSINGDLL;WXMAKINGDLL_RIBBON;%(PreprocessorDefinitions)</PreprocessorDefinitions>\r
+      <PreprocessorDefinitions>_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;NDEBUG;_UNICODE;WXBUILDING;WXDLLNAME=wxmsw30u_ribbon_vc_custom;WXUSINGDLL;WXMAKINGDLL_RIBBON;%(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>wxtiff.lib;wxjpeg.lib;wxpng.lib;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)wxmsw29u_adv.lib;$(OutDir)wxmsw29u_core.lib;$(OutDir)wxbase29u.lib;%(AdditionalDependencies)</AdditionalDependencies>\r
-      <OutputFile>$(OutDir)wxmsw295u_ribbon_vc_custom.dll</OutputFile>\r
-      <ImportLibrary>$(OutDir)wxmsw29u_ribbon.lib</ImportLibrary>\r
+      <AdditionalDependencies>wxtiff.lib;wxjpeg.lib;wxpng.lib;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)wxmsw30u_adv.lib;$(OutDir)wxmsw30u_core.lib;$(OutDir)wxbase30u.lib;%(AdditionalDependencies)</AdditionalDependencies>\r
+      <OutputFile>$(OutDir)wxmsw30u_ribbon_vc_custom.dll</OutputFile>\r
+      <ImportLibrary>$(OutDir)wxmsw30u_ribbon.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)wxmsw295u_ribbon_vc_custom.pdb</ProgramDatabaseFile>\r
+      <ProgramDatabaseFile>$(OutDir)wxmsw30u_ribbon_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