update wxpresets for new osx_carbon and osx_cocoa names provided by the wx-config...

[wxWidgets.git] / build / msw / wx_vc7_adv.vcproj

diff --git a/build/msw/wx_vc7_adv.vcproj b/build/msw/wx_vc7_adv.vcproj
index aa30ddbe51d19bdb43c0b11c5f61b3702c7c4b9f..6efa6bf4689ec9740805de7e3a80c26b705add74 100644 (file)
--- a/build/msw/wx_vc7_adv.vcproj
+++ b/build/msw/wx_vc7_adv.vcproj
@@ -350,13 +350,15 @@
                                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 ..\..\lib\vc_dll\wxmsw29u_core.lib ..\..\lib\vc_dll\wxbase29u.lib"\r
                                OutputFile="..\..\lib\vc_dll\wxmsw291u_adv_vc_custom.dll"\r
-                               LinkIncremental="2"\r
+                               LinkIncremental="1"\r
                                ImportLibrary="..\..\lib\vc_dll\wxmsw29u_adv.lib"\r
                                SuppressStartupBanner="TRUE"\r
                                AdditionalLibraryDirectories="..\..\lib\vc_dll"\r
                                GenerateDebugInformation="TRUE"\r
                                ProgramDatabaseFile="..\..\lib\vc_dll\wxmsw291u_adv_vc_custom.pdb"\r
-                               TargetMachine="1"/>\r
+                               TargetMachine="1"\r
+                               OptimizeReferences="2"\r
+                               EnableCOMDATFolding="2"/>\r
                        <Tool\r
                                Name="VCMIDLTool"\r
                                PreprocessorDefinitions="WIN32;_USRDLL;DLL_EXPORTS;__WXMSW__;_UNICODE;WXBUILDING;WXUSINGDLL;WXMAKINGDLL_ADV"\r
@@ -483,13 +485,15 @@
                                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 ..\..\lib\vc_dll\wxmswuniv29u_core.lib ..\..\lib\vc_dll\wxbase29u.lib"\r
                                OutputFile="..\..\lib\vc_dll\wxmswuniv291u_adv_vc_custom.dll"\r
-                               LinkIncremental="2"\r
+                               LinkIncremental="1"\r
                                ImportLibrary="..\..\lib\vc_dll\wxmswuniv29u_adv.lib"\r
                                SuppressStartupBanner="TRUE"\r
                                AdditionalLibraryDirectories="..\..\lib\vc_dll"\r
                                GenerateDebugInformation="TRUE"\r
                                ProgramDatabaseFile="..\..\lib\vc_dll\wxmswuniv291u_adv_vc_custom.pdb"\r
-                               TargetMachine="1"/>\r
+                               TargetMachine="1"\r
+                               OptimizeReferences="2"\r
+                               EnableCOMDATFolding="2"/>\r
                        <Tool\r
                                Name="VCMIDLTool"\r
                                PreprocessorDefinitions="WIN32;_USRDLL;DLL_EXPORTS;__WXMSW__;__WXUNIVERSAL__;_UNICODE;WXBUILDING;WXUSINGDLL;WXMAKINGDLL_ADV"\r
@@ -730,6 +734,9 @@
                        <File\r
                                RelativePath="..\..\src\generic\hyperlinkg.cpp">\r
                        </File>\r
+                       <File\r
+                               RelativePath="..\..\src\generic\infobar.cpp">\r
+                       </File>\r
                        <File\r
                                RelativePath="..\..\src\generic\laywin.cpp">\r
                        </File>\r
@@ -992,6 +999,9 @@
                        <File\r
                                RelativePath="..\..\include\wx\generic\hyperlink.h">\r
                        </File>\r
+                       <File\r
+                               RelativePath="..\..\include\wx\generic\infobar.h">\r
+                       </File>\r
                        <File\r
                                RelativePath="..\..\include\wx\generic\laywin.h">\r
                        </File>\r
@@ -1047,6 +1057,9 @@
                        <File\r
                                RelativePath="..\..\include\wx\hyperlink.h">\r
                        </File>\r
+                       <File\r
+                               RelativePath="..\..\include\wx\infobar.h">\r
+                       </File>\r
                        <File\r
                                RelativePath="..\..\include\wx\joystick.h">\r
                        </File>\r