Just doing a rebake of latest trunk.

author Kevin Ollivier <kevino@theolliviers.com>

Sun, 18 Oct 2009 22:38:22 +0000 (22:38 +0000)

committer Kevin Ollivier <kevino@theolliviers.com>

Sun, 18 Oct 2009 22:38:22 +0000 (22:38 +0000)
author Kevin Ollivier <kevino@theolliviers.com>
Sun, 18 Oct 2009 22:38:22 +0000 (22:38 +0000)
committer Kevin Ollivier <kevino@theolliviers.com>
Sun, 18 Oct 2009 22:38:22 +0000 (22:38 +0000)
diff --git a/build/msw/wx_adv.dsp b/build/msw/wx_adv.dsp

index 59a4f71ca99d90f71e309be753d6c3cf2027f231..fa36d2fb32c27b382d3b800a407b9e9257fffa6c 100644 (file)
--- a/build/msw/wx_adv.dsp
+++ b/build/msw/wx_adv.dsp
@@ -47,8 +47,8 @@ RSC=rc.exe
  # PROP Output_Dir "..\..\lib\vc_dll"\r
  # PROP Intermediate_Dir "vc_mswunivudll\adv"\r
  # PROP Target_Dir ""\r
-# ADD BASE CPP /nologo /FD /MD /O2 /GR /EHsc /I "..\..\lib\vc_dll\mswunivu" /I "..\..\include" /W4 /Yu"wx/wxprec.h" /Fp"vc_mswunivudll\wxprec_advdll.pch" /Zi /Fd..\..\lib\vc_dll\wxmswuniv291u_adv_vc_custom.pdb /I "..\..\src\tiff\libtiff" /I "..\..\src\jpeg" /I "..\..\src\png" /I "..\..\src\zlib" /I "..\..\src\regex" /I "..\..\src\expat\lib" /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "WXBUILDING" /D "WXUSINGDLL" /D "WXMAKINGDLL_ADV" /c\r
-# ADD CPP /nologo /FD /MD /O2 /GR /EHsc /I "..\..\lib\vc_dll\mswunivu" /I "..\..\include" /W4 /Yu"wx/wxprec.h" /Fp"vc_mswunivudll\wxprec_advdll.pch" /Zi /Fd..\..\lib\vc_dll\wxmswuniv291u_adv_vc_custom.pdb /I "..\..\src\tiff\libtiff" /I "..\..\src\jpeg" /I "..\..\src\png" /I "..\..\src\zlib" /I "..\..\src\regex" /I "..\..\src\expat\lib" /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "WXBUILDING" /D "WXUSINGDLL" /D "WXMAKINGDLL_ADV" /c\r
+# ADD BASE CPP /nologo /FD /MD /O2 /GR /EHsc /I "..\..\lib\vc_dll\mswunivu" /I "..\..\include" /W4 /Yu"wx/wxprec.h" /Fp"vc_mswunivudll\wxprec_advdll.pch" /Zi /Fd..\..\lib\vc_dll\wxmswuniv291u_adv_vc_custom.pdb /opt:ref /opt:icf /I "..\..\src\tiff\libtiff" /I "..\..\src\jpeg" /I "..\..\src\png" /I "..\..\src\zlib" /I "..\..\src\regex" /I "..\..\src\expat\lib" /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "WXBUILDING" /D "WXUSINGDLL" /D "WXMAKINGDLL_ADV" /c\r
+# ADD CPP /nologo /FD /MD /O2 /GR /EHsc /I "..\..\lib\vc_dll\mswunivu" /I "..\..\include" /W4 /Yu"wx/wxprec.h" /Fp"vc_mswunivudll\wxprec_advdll.pch" /Zi /Fd..\..\lib\vc_dll\wxmswuniv291u_adv_vc_custom.pdb /opt:ref /opt:icf /I "..\..\src\tiff\libtiff" /I "..\..\src\jpeg" /I "..\..\src\png" /I "..\..\src\zlib" /I "..\..\src\regex" /I "..\..\src\expat\lib" /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "WXBUILDING" /D "WXUSINGDLL" /D "WXMAKINGDLL_ADV" /c\r
  # ADD BASE MTL /nologo /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "WXBUILDING" /D "WXUSINGDLL" /D "WXMAKINGDLL_ADV" /mktyplib203 /win32\r
  # ADD MTL /nologo /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "WXBUILDING" /D "WXUSINGDLL" /D "WXMAKINGDLL_ADV" /mktyplib203 /win32\r
  # ADD BASE RSC /l 0x409 /d "__WXMSW__" /d "__WXUNIVERSAL__" /d "_UNICODE" /i "..\..\lib\vc_dll\mswunivu" /i "..\..\include" /d "WXBUILDING" /d WXDLLNAME=wxmswuniv291u_adv_vc_custom /i "..\..\src\tiff\libtiff" /i "..\..\src\jpeg" /i "..\..\src\png" /i "..\..\src\zlib" /i "..\..\src\regex" /i "..\..\src\expat\lib" /d "WXUSINGDLL" /d WXMAKINGDLL_ADV\r
@@ -97,8 +97,8 @@ LINK32=link.exe
  # PROP Output_Dir "..\..\lib\vc_dll"\r
  # PROP Intermediate_Dir "vc_mswudll\adv"\r
  # PROP Target_Dir ""\r
-# ADD BASE CPP /nologo /FD /MD /O2 /GR /EHsc /I "..\..\lib\vc_dll\mswu" /I "..\..\include" /W4 /Yu"wx/wxprec.h" /Fp"vc_mswudll\wxprec_advdll.pch" /Zi /Fd..\..\lib\vc_dll\wxmsw291u_adv_vc_custom.pdb /I "..\..\src\tiff\libtiff" /I "..\..\src\jpeg" /I "..\..\src\png" /I "..\..\src\zlib" /I "..\..\src\regex" /I "..\..\src\expat\lib" /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "__WXMSW__" /D "_UNICODE" /D "WXBUILDING" /D "WXUSINGDLL" /D "WXMAKINGDLL_ADV" /c\r
-# ADD CPP /nologo /FD /MD /O2 /GR /EHsc /I "..\..\lib\vc_dll\mswu" /I "..\..\include" /W4 /Yu"wx/wxprec.h" /Fp"vc_mswudll\wxprec_advdll.pch" /Zi /Fd..\..\lib\vc_dll\wxmsw291u_adv_vc_custom.pdb /I "..\..\src\tiff\libtiff" /I "..\..\src\jpeg" /I "..\..\src\png" /I "..\..\src\zlib" /I "..\..\src\regex" /I "..\..\src\expat\lib" /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "__WXMSW__" /D "_UNICODE" /D "WXBUILDING" /D "WXUSINGDLL" /D "WXMAKINGDLL_ADV" /c\r
+# ADD BASE CPP /nologo /FD /MD /O2 /GR /EHsc /I "..\..\lib\vc_dll\mswu" /I "..\..\include" /W4 /Yu"wx/wxprec.h" /Fp"vc_mswudll\wxprec_advdll.pch" /Zi /Fd..\..\lib\vc_dll\wxmsw291u_adv_vc_custom.pdb /opt:ref /opt:icf /I "..\..\src\tiff\libtiff" /I "..\..\src\jpeg" /I "..\..\src\png" /I "..\..\src\zlib" /I "..\..\src\regex" /I "..\..\src\expat\lib" /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "__WXMSW__" /D "_UNICODE" /D "WXBUILDING" /D "WXUSINGDLL" /D "WXMAKINGDLL_ADV" /c\r
+# ADD CPP /nologo /FD /MD /O2 /GR /EHsc /I "..\..\lib\vc_dll\mswu" /I "..\..\include" /W4 /Yu"wx/wxprec.h" /Fp"vc_mswudll\wxprec_advdll.pch" /Zi /Fd..\..\lib\vc_dll\wxmsw291u_adv_vc_custom.pdb /opt:ref /opt:icf /I "..\..\src\tiff\libtiff" /I "..\..\src\jpeg" /I "..\..\src\png" /I "..\..\src\zlib" /I "..\..\src\regex" /I "..\..\src\expat\lib" /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "__WXMSW__" /D "_UNICODE" /D "WXBUILDING" /D "WXUSINGDLL" /D "WXMAKINGDLL_ADV" /c\r
  # ADD BASE MTL /nologo /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "__WXMSW__" /D "_UNICODE" /D "WXBUILDING" /D "WXUSINGDLL" /D "WXMAKINGDLL_ADV" /mktyplib203 /win32\r
  # ADD MTL /nologo /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "__WXMSW__" /D "_UNICODE" /D "WXBUILDING" /D "WXUSINGDLL" /D "WXMAKINGDLL_ADV" /mktyplib203 /win32\r
  # ADD BASE RSC /l 0x409 /d "__WXMSW__" /d "_UNICODE" /i "..\..\lib\vc_dll\mswu" /i "..\..\include" /d "WXBUILDING" /d WXDLLNAME=wxmsw291u_adv_vc_custom /i "..\..\src\tiff\libtiff" /i "..\..\src\jpeg" /i "..\..\src\png" /i "..\..\src\zlib" /i "..\..\src\regex" /i "..\..\src\expat\lib" /d "WXUSINGDLL" /d WXMAKINGDLL_ADV\r
@@ -147,8 +147,8 @@ LINK32=link.exe
  # PROP Output_Dir "..\..\lib\vc_lib"\r
  # PROP Intermediate_Dir "vc_mswunivu\adv"\r
  # PROP Target_Dir ""\r
-# ADD BASE CPP /nologo /FD /MD /O2 /GR /EHsc /I "..\..\lib\vc_lib\mswunivu" /I "..\..\include" /W4 /Zi /Fd..\..\lib\vc_lib\wxmswuniv29u_adv.pdb /Yu"wx/wxprec.h" /Fp"vc_mswunivu\wxprec_advlib.pch" /I "..\..\src\tiff\libtiff" /I "..\..\src\jpeg" /I "..\..\src\png" /I "..\..\src\zlib" /I "..\..\src\regex" /I "..\..\src\expat\lib" /D "WIN32" /D "_LIB" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "WXBUILDING" /c\r
-# ADD CPP /nologo /FD /MD /O2 /GR /EHsc /I "..\..\lib\vc_lib\mswunivu" /I "..\..\include" /W4 /Zi /Fd..\..\lib\vc_lib\wxmswuniv29u_adv.pdb /Yu"wx/wxprec.h" /Fp"vc_mswunivu\wxprec_advlib.pch" /I "..\..\src\tiff\libtiff" /I "..\..\src\jpeg" /I "..\..\src\png" /I "..\..\src\zlib" /I "..\..\src\regex" /I "..\..\src\expat\lib" /D "WIN32" /D "_LIB" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "WXBUILDING" /c\r
+# ADD BASE CPP /nologo /FD /MD /O2 /GR /EHsc /I "..\..\lib\vc_lib\mswunivu" /I "..\..\include" /W4 /Zi /Fd..\..\lib\vc_lib\wxmswuniv29u_adv.pdb /opt:ref /opt:icf /Yu"wx/wxprec.h" /Fp"vc_mswunivu\wxprec_advlib.pch" /I "..\..\src\tiff\libtiff" /I "..\..\src\jpeg" /I "..\..\src\png" /I "..\..\src\zlib" /I "..\..\src\regex" /I "..\..\src\expat\lib" /D "WIN32" /D "_LIB" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "WXBUILDING" /c\r
+# ADD CPP /nologo /FD /MD /O2 /GR /EHsc /I "..\..\lib\vc_lib\mswunivu" /I "..\..\include" /W4 /Zi /Fd..\..\lib\vc_lib\wxmswuniv29u_adv.pdb /opt:ref /opt:icf /Yu"wx/wxprec.h" /Fp"vc_mswunivu\wxprec_advlib.pch" /I "..\..\src\tiff\libtiff" /I "..\..\src\jpeg" /I "..\..\src\png" /I "..\..\src\zlib" /I "..\..\src\regex" /I "..\..\src\expat\lib" /D "WIN32" /D "_LIB" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "WXBUILDING" /c\r
  # ADD BASE RSC /l 0x409\r
  # ADD RSC /l 0x409\r
  BSC32=bscmake.exe\r
@@ -193,8 +193,8 @@ LIB32=link.exe -lib
  # PROP Output_Dir "..\..\lib\vc_lib"\r
  # PROP Intermediate_Dir "vc_mswu\adv"\r
  # PROP Target_Dir ""\r
-# ADD BASE CPP /nologo /FD /MD /O2 /GR /EHsc /I "..\..\lib\vc_lib\mswu" /I "..\..\include" /W4 /Zi /Fd..\..\lib\vc_lib\wxmsw29u_adv.pdb /Yu"wx/wxprec.h" /Fp"vc_mswu\wxprec_advlib.pch" /I "..\..\src\tiff\libtiff" /I "..\..\src\jpeg" /I "..\..\src\png" /I "..\..\src\zlib" /I "..\..\src\regex" /I "..\..\src\expat\lib" /D "WIN32" /D "_LIB" /D "__WXMSW__" /D "_UNICODE" /D "WXBUILDING" /c\r
-# ADD CPP /nologo /FD /MD /O2 /GR /EHsc /I "..\..\lib\vc_lib\mswu" /I "..\..\include" /W4 /Zi /Fd..\..\lib\vc_lib\wxmsw29u_adv.pdb /Yu"wx/wxprec.h" /Fp"vc_mswu\wxprec_advlib.pch" /I "..\..\src\tiff\libtiff" /I "..\..\src\jpeg" /I "..\..\src\png" /I "..\..\src\zlib" /I "..\..\src\regex" /I "..\..\src\expat\lib" /D "WIN32" /D "_LIB" /D "__WXMSW__" /D "_UNICODE" /D "WXBUILDING" /c\r
+# ADD BASE CPP /nologo /FD /MD /O2 /GR /EHsc /I "..\..\lib\vc_lib\mswu" /I "..\..\include" /W4 /Zi /Fd..\..\lib\vc_lib\wxmsw29u_adv.pdb /opt:ref /opt:icf /Yu"wx/wxprec.h" /Fp"vc_mswu\wxprec_advlib.pch" /I "..\..\src\tiff\libtiff" /I "..\..\src\jpeg" /I "..\..\src\png" /I "..\..\src\zlib" /I "..\..\src\regex" /I "..\..\src\expat\lib" /D "WIN32" /D "_LIB" /D "__WXMSW__" /D "_UNICODE" /D "WXBUILDING" /c\r
+# ADD CPP /nologo /FD /MD /O2 /GR /EHsc /I "..\..\lib\vc_lib\mswu" /I "..\..\include" /W4 /Zi /Fd..\..\lib\vc_lib\wxmsw29u_adv.pdb /opt:ref /opt:icf /Yu"wx/wxprec.h" /Fp"vc_mswu\wxprec_advlib.pch" /I "..\..\src\tiff\libtiff" /I "..\..\src\jpeg" /I "..\..\src\png" /I "..\..\src\zlib" /I "..\..\src\regex" /I "..\..\src\expat\lib" /D "WIN32" /D "_LIB" /D "__WXMSW__" /D "_UNICODE" /D "WXBUILDING" /c\r
  # ADD BASE RSC /l 0x409\r
  # ADD RSC /l 0x409\r
  BSC32=bscmake.exe\r
@@ -529,10 +529,10 @@ SOURCE=..\..\src\generic\hyperlinkg.cpp
  # End Source File\r
  # Begin Source File\r
  \r
-SOURCE=..\..\src\generic\infobar.cpp
-# End Source File
-# Begin Source File
-
+SOURCE=..\..\src\generic\infobar.cpp\r
+# End Source File\r
+# Begin Source File\r
+\r
  SOURCE=..\..\src\generic\laywin.cpp\r
  # End Source File\r
  # Begin Source File\r
@@ -882,10 +882,10 @@ SOURCE=..\..\include\wx\generic\hyperlink.h
  # End Source File\r
  # Begin Source File\r
  \r
-SOURCE=..\..\include\wx\generic\infobar.h
-# End Source File
-# Begin Source File
-
+SOURCE=..\..\include\wx\generic\infobar.h\r
+# End Source File\r
+# Begin Source File\r
+\r
  SOURCE=..\..\include\wx\generic\laywin.h\r
  # End Source File\r
  # Begin Source File\r
@@ -958,10 +958,10 @@ SOURCE=..\..\include\wx\hyperlink.h
  # End Source File\r
  # Begin Source File\r
  \r
-SOURCE=..\..\include\wx\infobar.h
-# End Source File
-# Begin Source File
-
+SOURCE=..\..\include\wx\infobar.h\r
+# End Source File\r
+# Begin Source File\r
+\r
  SOURCE=..\..\include\wx\joystick.h\r
  # End Source File\r
  # Begin Source File\r
diff --git a/build/msw/wx_aui.dsp b/build/msw/wx_aui.dsp

index 91f3c86edd16f5d2b91d4019900c50eb2c9b1220..d7757ee0ff71765bb1b42730a6a85cf10392de1f 100644 (file)
--- a/build/msw/wx_aui.dsp
+++ b/build/msw/wx_aui.dsp
@@ -47,8 +47,8 @@ RSC=rc.exe
  # PROP Output_Dir "..\..\lib\vc_dll"\r
  # PROP Intermediate_Dir "vc_mswunivudll\aui"\r
  # PROP Target_Dir ""\r
-# ADD BASE CPP /nologo /FD /MD /O2 /GR /EHsc /I "..\..\lib\vc_dll\mswunivu" /I "..\..\include" /W4 /Yu"wx/wxprec.h" /Fp"vc_mswunivudll\wxprec_auidll.pch" /Zi /Fd..\..\lib\vc_dll\wxmswuniv291u_aui_vc_custom.pdb /I "..\..\src\tiff\libtiff" /I "..\..\src\jpeg" /I "..\..\src\png" /I "..\..\src\zlib" /I "..\..\src\regex" /I "..\..\src\expat\lib" /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "WXBUILDING" /D "WXUSINGDLL" /D "WXMAKINGDLL_AUI" /c\r
-# ADD CPP /nologo /FD /MD /O2 /GR /EHsc /I "..\..\lib\vc_dll\mswunivu" /I "..\..\include" /W4 /Yu"wx/wxprec.h" /Fp"vc_mswunivudll\wxprec_auidll.pch" /Zi /Fd..\..\lib\vc_dll\wxmswuniv291u_aui_vc_custom.pdb /I "..\..\src\tiff\libtiff" /I "..\..\src\jpeg" /I "..\..\src\png" /I "..\..\src\zlib" /I "..\..\src\regex" /I "..\..\src\expat\lib" /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "WXBUILDING" /D "WXUSINGDLL" /D "WXMAKINGDLL_AUI" /c\r
+# ADD BASE CPP /nologo /FD /MD /O2 /GR /EHsc /I "..\..\lib\vc_dll\mswunivu" /I "..\..\include" /W4 /Yu"wx/wxprec.h" /Fp"vc_mswunivudll\wxprec_auidll.pch" /Zi /Fd..\..\lib\vc_dll\wxmswuniv291u_aui_vc_custom.pdb /opt:ref /opt:icf /I "..\..\src\tiff\libtiff" /I "..\..\src\jpeg" /I "..\..\src\png" /I "..\..\src\zlib" /I "..\..\src\regex" /I "..\..\src\expat\lib" /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "WXBUILDING" /D "WXUSINGDLL" /D "WXMAKINGDLL_AUI" /c\r
+# ADD CPP /nologo /FD /MD /O2 /GR /EHsc /I "..\..\lib\vc_dll\mswunivu" /I "..\..\include" /W4 /Yu"wx/wxprec.h" /Fp"vc_mswunivudll\wxprec_auidll.pch" /Zi /Fd..\..\lib\vc_dll\wxmswuniv291u_aui_vc_custom.pdb /opt:ref /opt:icf /I "..\..\src\tiff\libtiff" /I "..\..\src\jpeg" /I "..\..\src\png" /I "..\..\src\zlib" /I "..\..\src\regex" /I "..\..\src\expat\lib" /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "WXBUILDING" /D "WXUSINGDLL" /D "WXMAKINGDLL_AUI" /c\r
  # ADD BASE MTL /nologo /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "WXBUILDING" /D "WXUSINGDLL" /D "WXMAKINGDLL_AUI" /mktyplib203 /win32\r
  # ADD MTL /nologo /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "WXBUILDING" /D "WXUSINGDLL" /D "WXMAKINGDLL_AUI" /mktyplib203 /win32\r
  # ADD BASE RSC /l 0x409 /d "__WXMSW__" /d "__WXUNIVERSAL__" /d "_UNICODE" /i "..\..\lib\vc_dll\mswunivu" /i "..\..\include" /d "WXBUILDING" /d WXDLLNAME=wxmswuniv291u_aui_vc_custom /i "..\..\src\tiff\libtiff" /i "..\..\src\jpeg" /i "..\..\src\png" /i "..\..\src\zlib" /i "..\..\src\regex" /i "..\..\src\expat\lib" /d "WXUSINGDLL" /d WXMAKINGDLL_AUI\r
@@ -97,8 +97,8 @@ LINK32=link.exe
  # PROP Output_Dir "..\..\lib\vc_dll"\r
  # PROP Intermediate_Dir "vc_mswudll\aui"\r
  # PROP Target_Dir ""\r
-# ADD BASE CPP /nologo /FD /MD /O2 /GR /EHsc /I "..\..\lib\vc_dll\mswu" /I "..\..\include" /W4 /Yu"wx/wxprec.h" /Fp"vc_mswudll\wxprec_auidll.pch" /Zi /Fd..\..\lib\vc_dll\wxmsw291u_aui_vc_custom.pdb /I "..\..\src\tiff\libtiff" /I "..\..\src\jpeg" /I "..\..\src\png" /I "..\..\src\zlib" /I "..\..\src\regex" /I "..\..\src\expat\lib" /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "__WXMSW__" /D "_UNICODE" /D "WXBUILDING" /D "WXUSINGDLL" /D "WXMAKINGDLL_AUI" /c\r
-# ADD CPP /nologo /FD /MD /O2 /GR /EHsc /I "..\..\lib\vc_dll\mswu" /I "..\..\include" /W4 /Yu"wx/wxprec.h" /Fp"vc_mswudll\wxprec_auidll.pch" /Zi /Fd..\..\lib\vc_dll\wxmsw291u_aui_vc_custom.pdb /I "..\..\src\tiff\libtiff" /I "..\..\src\jpeg" /I "..\..\src\png" /I "..\..\src\zlib" /I "..\..\src\regex" /I "..\..\src\expat\lib" /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "__WXMSW__" /D "_UNICODE" /D "WXBUILDING" /D "WXUSINGDLL" /D "WXMAKINGDLL_AUI" /c\r
+# ADD BASE CPP /nologo /FD /MD /O2 /GR /EHsc /I "..\..\lib\vc_dll\mswu" /I "..\..\include" /W4 /Yu"wx/wxprec.h" /Fp"vc_mswudll\wxprec_auidll.pch" /Zi /Fd..\..\lib\vc_dll\wxmsw291u_aui_vc_custom.pdb /opt:ref /opt:icf /I "..\..\src\tiff\libtiff" /I "..\..\src\jpeg" /I "..\..\src\png" /I "..\..\src\zlib" /I "..\..\src\regex" /I "..\..\src\expat\lib" /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "__WXMSW__" /D "_UNICODE" /D "WXBUILDING" /D "WXUSINGDLL" /D "WXMAKINGDLL_AUI" /c\r
+# ADD CPP /nologo /FD /MD /O2 /GR /EHsc /I "..\..\lib\vc_dll\mswu" /I "..\..\include" /W4 /Yu"wx/wxprec.h" /Fp"vc_mswudll\wxprec_auidll.pch" /Zi /Fd..\..\lib\vc_dll\wxmsw291u_aui_vc_custom.pdb /opt:ref /opt:icf /I "..\..\src\tiff\libtiff" /I "..\..\src\jpeg" /I "..\..\src\png" /I "..\..\src\zlib" /I "..\..\src\regex" /I "..\..\src\expat\lib" /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "__WXMSW__" /D "_UNICODE" /D "WXBUILDING" /D "WXUSINGDLL" /D "WXMAKINGDLL_AUI" /c\r
  # ADD BASE MTL /nologo /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "__WXMSW__" /D "_UNICODE" /D "WXBUILDING" /D "WXUSINGDLL" /D "WXMAKINGDLL_AUI" /mktyplib203 /win32\r
  # ADD MTL /nologo /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "__WXMSW__" /D "_UNICODE" /D "WXBUILDING" /D "WXUSINGDLL" /D "WXMAKINGDLL_AUI" /mktyplib203 /win32\r
  # ADD BASE RSC /l 0x409 /d "__WXMSW__" /d "_UNICODE" /i "..\..\lib\vc_dll\mswu" /i "..\..\include" /d "WXBUILDING" /d WXDLLNAME=wxmsw291u_aui_vc_custom /i "..\..\src\tiff\libtiff" /i "..\..\src\jpeg" /i "..\..\src\png" /i "..\..\src\zlib" /i "..\..\src\regex" /i "..\..\src\expat\lib" /d "WXUSINGDLL" /d WXMAKINGDLL_AUI\r
@@ -147,8 +147,8 @@ LINK32=link.exe
  # PROP Output_Dir "..\..\lib\vc_lib"\r
  # PROP Intermediate_Dir "vc_mswunivu\aui"\r
  # PROP Target_Dir ""\r
-# ADD BASE CPP /nologo /FD /MD /O2 /GR /EHsc /I "..\..\lib\vc_lib\mswunivu" /I "..\..\include" /W4 /Zi /Fd..\..\lib\vc_lib\wxmswuniv29u_aui.pdb /Yu"wx/wxprec.h" /Fp"vc_mswunivu\wxprec_auilib.pch" /I "..\..\src\tiff\libtiff" /I "..\..\src\jpeg" /I "..\..\src\png" /I "..\..\src\zlib" /I "..\..\src\regex" /I "..\..\src\expat\lib" /D "WIN32" /D "_LIB" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "WXBUILDING" /c\r
-# ADD CPP /nologo /FD /MD /O2 /GR /EHsc /I "..\..\lib\vc_lib\mswunivu" /I "..\..\include" /W4 /Zi /Fd..\..\lib\vc_lib\wxmswuniv29u_aui.pdb /Yu"wx/wxprec.h" /Fp"vc_mswunivu\wxprec_auilib.pch" /I "..\..\src\tiff\libtiff" /I "..\..\src\jpeg" /I "..\..\src\png" /I "..\..\src\zlib" /I "..\..\src\regex" /I "..\..\src\expat\lib" /D "WIN32" /D "_LIB" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "WXBUILDING" /c\r
+# ADD BASE CPP /nologo /FD /MD /O2 /GR /EHsc /I "..\..\lib\vc_lib\mswunivu" /I "..\..\include" /W4 /Zi /Fd..\..\lib\vc_lib\wxmswuniv29u_aui.pdb /opt:ref /opt:icf /Yu"wx/wxprec.h" /Fp"vc_mswunivu\wxprec_auilib.pch" /I "..\..\src\tiff\libtiff" /I "..\..\src\jpeg" /I "..\..\src\png" /I "..\..\src\zlib" /I "..\..\src\regex" /I "..\..\src\expat\lib" /D "WIN32" /D "_LIB" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "WXBUILDING" /c\r
+# ADD CPP /nologo /FD /MD /O2 /GR /EHsc /I "..\..\lib\vc_lib\mswunivu" /I "..\..\include" /W4 /Zi /Fd..\..\lib\vc_lib\wxmswuniv29u_aui.pdb /opt:ref /opt:icf /Yu"wx/wxprec.h" /Fp"vc_mswunivu\wxprec_auilib.pch" /I "..\..\src\tiff\libtiff" /I "..\..\src\jpeg" /I "..\..\src\png" /I "..\..\src\zlib" /I "..\..\src\regex" /I "..\..\src\expat\lib" /D "WIN32" /D "_LIB" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "WXBUILDING" /c\r
  # ADD BASE RSC /l 0x409\r
  # ADD RSC /l 0x409\r
  BSC32=bscmake.exe\r
@@ -193,8 +193,8 @@ LIB32=link.exe -lib
  # PROP Output_Dir "..\..\lib\vc_lib"\r
  # PROP Intermediate_Dir "vc_mswu\aui"\r
  # PROP Target_Dir ""\r
-# ADD BASE CPP /nologo /FD /MD /O2 /GR /EHsc /I "..\..\lib\vc_lib\mswu" /I "..\..\include" /W4 /Zi /Fd..\..\lib\vc_lib\wxmsw29u_aui.pdb /Yu"wx/wxprec.h" /Fp"vc_mswu\wxprec_auilib.pch" /I "..\..\src\tiff\libtiff" /I "..\..\src\jpeg" /I "..\..\src\png" /I "..\..\src\zlib" /I "..\..\src\regex" /I "..\..\src\expat\lib" /D "WIN32" /D "_LIB" /D "__WXMSW__" /D "_UNICODE" /D "WXBUILDING" /c\r
-# ADD CPP /nologo /FD /MD /O2 /GR /EHsc /I "..\..\lib\vc_lib\mswu" /I "..\..\include" /W4 /Zi /Fd..\..\lib\vc_lib\wxmsw29u_aui.pdb /Yu"wx/wxprec.h" /Fp"vc_mswu\wxprec_auilib.pch" /I "..\..\src\tiff\libtiff" /I "..\..\src\jpeg" /I "..\..\src\png" /I "..\..\src\zlib" /I "..\..\src\regex" /I "..\..\src\expat\lib" /D "WIN32" /D "_LIB" /D "__WXMSW__" /D "_UNICODE" /D "WXBUILDING" /c\r
+# ADD BASE CPP /nologo /FD /MD /O2 /GR /EHsc /I "..\..\lib\vc_lib\mswu" /I "..\..\include" /W4 /Zi /Fd..\..\lib\vc_lib\wxmsw29u_aui.pdb /opt:ref /opt:icf /Yu"wx/wxprec.h" /Fp"vc_mswu\wxprec_auilib.pch" /I "..\..\src\tiff\libtiff" /I "..\..\src\jpeg" /I "..\..\src\png" /I "..\..\src\zlib" /I "..\..\src\regex" /I "..\..\src\expat\lib" /D "WIN32" /D "_LIB" /D "__WXMSW__" /D "_UNICODE" /D "WXBUILDING" /c\r
+# ADD CPP /nologo /FD /MD /O2 /GR /EHsc /I "..\..\lib\vc_lib\mswu" /I "..\..\include" /W4 /Zi /Fd..\..\lib\vc_lib\wxmsw29u_aui.pdb /opt:ref /opt:icf /Yu"wx/wxprec.h" /Fp"vc_mswu\wxprec_auilib.pch" /I "..\..\src\tiff\libtiff" /I "..\..\src\jpeg" /I "..\..\src\png" /I "..\..\src\zlib" /I "..\..\src\regex" /I "..\..\src\expat\lib" /D "WIN32" /D "_LIB" /D "__WXMSW__" /D "_UNICODE" /D "WXBUILDING" /c\r
  # ADD BASE RSC /l 0x409\r
  # ADD RSC /l 0x409\r
  BSC32=bscmake.exe\r
diff --git a/build/msw/wx_base.dsp b/build/msw/wx_base.dsp

index 52301226198b31f830077ba30dfb2b2d3b3db277..fb3481c75e7b833ca7b251a6e27f6d7ca621b87b 100644 (file)
--- a/build/msw/wx_base.dsp
+++ b/build/msw/wx_base.dsp
@@ -47,8 +47,8 @@ RSC=rc.exe
  # PROP Output_Dir "..\..\lib\vc_dll"\r
  # PROP Intermediate_Dir "vc_mswunivudll\base"\r
  # PROP Target_Dir ""\r
-# ADD BASE CPP /nologo /FD /MD /O2 /GR /EHsc /I "..\..\lib\vc_dll\mswunivu" /I "..\..\include" /W4 /Yu"wx/wxprec.h" /Fp"vc_mswunivudll\wxprec_basedll.pch" /Zi /Fd..\..\lib\vc_dll\wxbase291u_vc_custom.pdb /I "..\..\src\tiff\libtiff" /I "..\..\src\jpeg" /I "..\..\src\png" /I "..\..\src\zlib" /I "..\..\src\regex" /I "..\..\src\expat\lib" /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "WXBUILDING" /D wxUSE_GUI=0 /D "WXMAKINGDLL_BASE" /D wxUSE_BASE=1 /c\r
-# ADD CPP /nologo /FD /MD /O2 /GR /EHsc /I "..\..\lib\vc_dll\mswunivu" /I "..\..\include" /W4 /Yu"wx/wxprec.h" /Fp"vc_mswunivudll\wxprec_basedll.pch" /Zi /Fd..\..\lib\vc_dll\wxbase291u_vc_custom.pdb /I "..\..\src\tiff\libtiff" /I "..\..\src\jpeg" /I "..\..\src\png" /I "..\..\src\zlib" /I "..\..\src\regex" /I "..\..\src\expat\lib" /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "WXBUILDING" /D wxUSE_GUI=0 /D "WXMAKINGDLL_BASE" /D wxUSE_BASE=1 /c\r
+# ADD BASE CPP /nologo /FD /MD /O2 /GR /EHsc /I "..\..\lib\vc_dll\mswunivu" /I "..\..\include" /W4 /Yu"wx/wxprec.h" /Fp"vc_mswunivudll\wxprec_basedll.pch" /Zi /Fd..\..\lib\vc_dll\wxbase291u_vc_custom.pdb /opt:ref /opt:icf /I "..\..\src\tiff\libtiff" /I "..\..\src\jpeg" /I "..\..\src\png" /I "..\..\src\zlib" /I "..\..\src\regex" /I "..\..\src\expat\lib" /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "WXBUILDING" /D wxUSE_GUI=0 /D "WXMAKINGDLL_BASE" /D wxUSE_BASE=1 /c\r
+# ADD CPP /nologo /FD /MD /O2 /GR /EHsc /I "..\..\lib\vc_dll\mswunivu" /I "..\..\include" /W4 /Yu"wx/wxprec.h" /Fp"vc_mswunivudll\wxprec_basedll.pch" /Zi /Fd..\..\lib\vc_dll\wxbase291u_vc_custom.pdb /opt:ref /opt:icf /I "..\..\src\tiff\libtiff" /I "..\..\src\jpeg" /I "..\..\src\png" /I "..\..\src\zlib" /I "..\..\src\regex" /I "..\..\src\expat\lib" /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "WXBUILDING" /D wxUSE_GUI=0 /D "WXMAKINGDLL_BASE" /D wxUSE_BASE=1 /c\r
  # ADD BASE MTL /nologo /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "WXBUILDING" /D wxUSE_GUI=0 /D "WXMAKINGDLL_BASE" /D wxUSE_BASE=1 /mktyplib203 /win32\r
  # ADD MTL /nologo /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "WXBUILDING" /D wxUSE_GUI=0 /D "WXMAKINGDLL_BASE" /D wxUSE_BASE=1 /mktyplib203 /win32\r
  # ADD BASE RSC /l 0x409 /d "__WXMSW__" /d "__WXUNIVERSAL__" /d "_UNICODE" /i "..\..\lib\vc_dll\mswunivu" /i "..\..\include" /d "WXBUILDING" /d WXDLLNAME=wxbase291u_vc_custom /i "..\..\src\tiff\libtiff" /i "..\..\src\jpeg" /i "..\..\src\png" /i "..\..\src\zlib" /i "..\..\src\regex" /i "..\..\src\expat\lib" /d wxUSE_GUI=0 /d "WXMAKINGDLL_BASE" /d wxUSE_BASE=1\r
@@ -97,8 +97,8 @@ LINK32=link.exe
  # PROP Output_Dir "..\..\lib\vc_dll"\r
  # PROP Intermediate_Dir "vc_mswudll\base"\r
  # PROP Target_Dir ""\r
-# ADD BASE CPP /nologo /FD /MD /O2 /GR /EHsc /I "..\..\lib\vc_dll\mswu" /I "..\..\include" /W4 /Yu"wx/wxprec.h" /Fp"vc_mswudll\wxprec_basedll.pch" /Zi /Fd..\..\lib\vc_dll\wxbase291u_vc_custom.pdb /I "..\..\src\tiff\libtiff" /I "..\..\src\jpeg" /I "..\..\src\png" /I "..\..\src\zlib" /I "..\..\src\regex" /I "..\..\src\expat\lib" /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "__WXMSW__" /D "_UNICODE" /D "WXBUILDING" /D wxUSE_GUI=0 /D "WXMAKINGDLL_BASE" /D wxUSE_BASE=1 /c\r
-# ADD CPP /nologo /FD /MD /O2 /GR /EHsc /I "..\..\lib\vc_dll\mswu" /I "..\..\include" /W4 /Yu"wx/wxprec.h" /Fp"vc_mswudll\wxprec_basedll.pch" /Zi /Fd..\..\lib\vc_dll\wxbase291u_vc_custom.pdb /I "..\..\src\tiff\libtiff" /I "..\..\src\jpeg" /I "..\..\src\png" /I "..\..\src\zlib" /I "..\..\src\regex" /I "..\..\src\expat\lib" /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "__WXMSW__" /D "_UNICODE" /D "WXBUILDING" /D wxUSE_GUI=0 /D "WXMAKINGDLL_BASE" /D wxUSE_BASE=1 /c\r
+# ADD BASE CPP /nologo /FD /MD /O2 /GR /EHsc /I "..\..\lib\vc_dll\mswu" /I "..\..\include" /W4 /Yu"wx/wxprec.h" /Fp"vc_mswudll\wxprec_basedll.pch" /Zi /Fd..\..\lib\vc_dll\wxbase291u_vc_custom.pdb /opt:ref /opt:icf /I "..\..\src\tiff\libtiff" /I "..\..\src\jpeg" /I "..\..\src\png" /I "..\..\src\zlib" /I "..\..\src\regex" /I "..\..\src\expat\lib" /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "__WXMSW__" /D "_UNICODE" /D "WXBUILDING" /D wxUSE_GUI=0 /D "WXMAKINGDLL_BASE" /D wxUSE_BASE=1 /c\r
+# ADD CPP /nologo /FD /MD /O2 /GR /EHsc /I "..\..\lib\vc_dll\mswu" /I "..\..\include" /W4 /Yu"wx/wxprec.h" /Fp"vc_mswudll\wxprec_basedll.pch" /Zi /Fd..\..\lib\vc_dll\wxbase291u_vc_custom.pdb /opt:ref /opt:icf /I "..\..\src\tiff\libtiff" /I "..\..\src\jpeg" /I "..\..\src\png" /I "..\..\src\zlib" /I "..\..\src\regex" /I "..\..\src\expat\lib" /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "__WXMSW__" /D "_UNICODE" /D "WXBUILDING" /D wxUSE_GUI=0 /D "WXMAKINGDLL_BASE" /D wxUSE_BASE=1 /c\r
  # ADD BASE MTL /nologo /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "__WXMSW__" /D "_UNICODE" /D "WXBUILDING" /D wxUSE_GUI=0 /D "WXMAKINGDLL_BASE" /D wxUSE_BASE=1 /mktyplib203 /win32\r
  # ADD MTL /nologo /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "__WXMSW__" /D "_UNICODE" /D "WXBUILDING" /D wxUSE_GUI=0 /D "WXMAKINGDLL_BASE" /D wxUSE_BASE=1 /mktyplib203 /win32\r
  # ADD BASE RSC /l 0x409 /d "__WXMSW__" /d "_UNICODE" /i "..\..\lib\vc_dll\mswu" /i "..\..\include" /d "WXBUILDING" /d WXDLLNAME=wxbase291u_vc_custom /i "..\..\src\tiff\libtiff" /i "..\..\src\jpeg" /i "..\..\src\png" /i "..\..\src\zlib" /i "..\..\src\regex" /i "..\..\src\expat\lib" /d wxUSE_GUI=0 /d "WXMAKINGDLL_BASE" /d wxUSE_BASE=1\r
@@ -147,8 +147,8 @@ LINK32=link.exe
  # PROP Output_Dir "..\..\lib\vc_lib"\r
  # PROP Intermediate_Dir "vc_mswunivu\base"\r
  # PROP Target_Dir ""\r
-# ADD BASE CPP /nologo /FD /MD /O2 /GR /EHsc /I "..\..\lib\vc_lib\mswunivu" /I "..\..\include" /W4 /Zi /Fd..\..\lib\vc_lib\wxbase29u.pdb /Yu"wx/wxprec.h" /Fp"vc_mswunivu\wxprec_baselib.pch" /I "..\..\src\tiff\libtiff" /I "..\..\src\jpeg" /I "..\..\src\png" /I "..\..\src\zlib" /I "..\..\src\regex" /I "..\..\src\expat\lib" /D "WIN32" /D "_LIB" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "WXBUILDING" /D wxUSE_GUI=0 /D wxUSE_BASE=1 /c\r
-# ADD CPP /nologo /FD /MD /O2 /GR /EHsc /I "..\..\lib\vc_lib\mswunivu" /I "..\..\include" /W4 /Zi /Fd..\..\lib\vc_lib\wxbase29u.pdb /Yu"wx/wxprec.h" /Fp"vc_mswunivu\wxprec_baselib.pch" /I "..\..\src\tiff\libtiff" /I "..\..\src\jpeg" /I "..\..\src\png" /I "..\..\src\zlib" /I "..\..\src\regex" /I "..\..\src\expat\lib" /D "WIN32" /D "_LIB" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "WXBUILDING" /D wxUSE_GUI=0 /D wxUSE_BASE=1 /c\r
+# ADD BASE CPP /nologo /FD /MD /O2 /GR /EHsc /I "..\..\lib\vc_lib\mswunivu" /I "..\..\include" /W4 /Zi /Fd..\..\lib\vc_lib\wxbase29u.pdb /opt:ref /opt:icf /Yu"wx/wxprec.h" /Fp"vc_mswunivu\wxprec_baselib.pch" /I "..\..\src\tiff\libtiff" /I "..\..\src\jpeg" /I "..\..\src\png" /I "..\..\src\zlib" /I "..\..\src\regex" /I "..\..\src\expat\lib" /D "WIN32" /D "_LIB" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "WXBUILDING" /D wxUSE_GUI=0 /D wxUSE_BASE=1 /c\r
+# ADD CPP /nologo /FD /MD /O2 /GR /EHsc /I "..\..\lib\vc_lib\mswunivu" /I "..\..\include" /W4 /Zi /Fd..\..\lib\vc_lib\wxbase29u.pdb /opt:ref /opt:icf /Yu"wx/wxprec.h" /Fp"vc_mswunivu\wxprec_baselib.pch" /I "..\..\src\tiff\libtiff" /I "..\..\src\jpeg" /I "..\..\src\png" /I "..\..\src\zlib" /I "..\..\src\regex" /I "..\..\src\expat\lib" /D "WIN32" /D "_LIB" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "WXBUILDING" /D wxUSE_GUI=0 /D wxUSE_BASE=1 /c\r
  # ADD BASE RSC /l 0x409\r
  # ADD RSC /l 0x409\r
  BSC32=bscmake.exe\r
@@ -193,8 +193,8 @@ LIB32=link.exe -lib
  # PROP Output_Dir "..\..\lib\vc_lib"\r
  # PROP Intermediate_Dir "vc_mswu\base"\r
  # PROP Target_Dir ""\r
-# ADD BASE CPP /nologo /FD /MD /O2 /GR /EHsc /I "..\..\lib\vc_lib\mswu" /I "..\..\include" /W4 /Zi /Fd..\..\lib\vc_lib\wxbase29u.pdb /Yu"wx/wxprec.h" /Fp"vc_mswu\wxprec_baselib.pch" /I "..\..\src\tiff\libtiff" /I "..\..\src\jpeg" /I "..\..\src\png" /I "..\..\src\zlib" /I "..\..\src\regex" /I "..\..\src\expat\lib" /D "WIN32" /D "_LIB" /D "__WXMSW__" /D "_UNICODE" /D "WXBUILDING" /D wxUSE_GUI=0 /D wxUSE_BASE=1 /c\r
-# ADD CPP /nologo /FD /MD /O2 /GR /EHsc /I "..\..\lib\vc_lib\mswu" /I "..\..\include" /W4 /Zi /Fd..\..\lib\vc_lib\wxbase29u.pdb /Yu"wx/wxprec.h" /Fp"vc_mswu\wxprec_baselib.pch" /I "..\..\src\tiff\libtiff" /I "..\..\src\jpeg" /I "..\..\src\png" /I "..\..\src\zlib" /I "..\..\src\regex" /I "..\..\src\expat\lib" /D "WIN32" /D "_LIB" /D "__WXMSW__" /D "_UNICODE" /D "WXBUILDING" /D wxUSE_GUI=0 /D wxUSE_BASE=1 /c\r
+# ADD BASE CPP /nologo /FD /MD /O2 /GR /EHsc /I "..\..\lib\vc_lib\mswu" /I "..\..\include" /W4 /Zi /Fd..\..\lib\vc_lib\wxbase29u.pdb /opt:ref /opt:icf /Yu"wx/wxprec.h" /Fp"vc_mswu\wxprec_baselib.pch" /I "..\..\src\tiff\libtiff" /I "..\..\src\jpeg" /I "..\..\src\png" /I "..\..\src\zlib" /I "..\..\src\regex" /I "..\..\src\expat\lib" /D "WIN32" /D "_LIB" /D "__WXMSW__" /D "_UNICODE" /D "WXBUILDING" /D wxUSE_GUI=0 /D wxUSE_BASE=1 /c\r
+# ADD CPP /nologo /FD /MD /O2 /GR /EHsc /I "..\..\lib\vc_lib\mswu" /I "..\..\include" /W4 /Zi /Fd..\..\lib\vc_lib\wxbase29u.pdb /opt:ref /opt:icf /Yu"wx/wxprec.h" /Fp"vc_mswu\wxprec_baselib.pch" /I "..\..\src\tiff\libtiff" /I "..\..\src\jpeg" /I "..\..\src\png" /I "..\..\src\zlib" /I "..\..\src\regex" /I "..\..\src\expat\lib" /D "WIN32" /D "_LIB" /D "__WXMSW__" /D "_UNICODE" /D "WXBUILDING" /D wxUSE_GUI=0 /D wxUSE_BASE=1 /c\r
  # ADD BASE RSC /l 0x409\r
  # ADD RSC /l 0x409\r
  BSC32=bscmake.exe\r
diff --git a/build/msw/wx_core.dsp b/build/msw/wx_core.dsp

index 99b2a21a4b8faed2a63f30cbc642cbc15531a607..d54fcec9292cb548b8bd513cbabd8b8d4d7f896f 100644 (file)
--- a/build/msw/wx_core.dsp
+++ b/build/msw/wx_core.dsp
@@ -47,8 +47,8 @@ RSC=rc.exe
  # PROP Output_Dir "..\..\lib\vc_dll"\r
  # PROP Intermediate_Dir "vc_mswunivudll\core"\r
  # PROP Target_Dir ""\r
-# ADD BASE CPP /nologo /FD /MD /O2 /GR /EHsc /I "..\..\lib\vc_dll\mswunivu" /I "..\..\include" /W4 /Yu"wx/wxprec.h" /Fp"vc_mswunivudll\wxprec_coredll.pch" /Zi /Fd..\..\lib\vc_dll\wxmswuniv291u_core_vc_custom.pdb /I "..\..\src\tiff\libtiff" /I "..\..\src\jpeg" /I "..\..\src\png" /I "..\..\src\zlib" /I "..\..\src\regex" /I "..\..\src\expat\lib" /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "WXBUILDING" /D "WXUSINGDLL" /D "WXMAKINGDLL_CORE" /D wxUSE_BASE=0 /c\r
-# ADD CPP /nologo /FD /MD /O2 /GR /EHsc /I "..\..\lib\vc_dll\mswunivu" /I "..\..\include" /W4 /Yu"wx/wxprec.h" /Fp"vc_mswunivudll\wxprec_coredll.pch" /Zi /Fd..\..\lib\vc_dll\wxmswuniv291u_core_vc_custom.pdb /I "..\..\src\tiff\libtiff" /I "..\..\src\jpeg" /I "..\..\src\png" /I "..\..\src\zlib" /I "..\..\src\regex" /I "..\..\src\expat\lib" /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "WXBUILDING" /D "WXUSINGDLL" /D "WXMAKINGDLL_CORE" /D wxUSE_BASE=0 /c\r
+# ADD BASE CPP /nologo /FD /MD /O2 /GR /EHsc /I "..\..\lib\vc_dll\mswunivu" /I "..\..\include" /W4 /Yu"wx/wxprec.h" /Fp"vc_mswunivudll\wxprec_coredll.pch" /Zi /Fd..\..\lib\vc_dll\wxmswuniv291u_core_vc_custom.pdb /opt:ref /opt:icf /I "..\..\src\tiff\libtiff" /I "..\..\src\jpeg" /I "..\..\src\png" /I "..\..\src\zlib" /I "..\..\src\regex" /I "..\..\src\expat\lib" /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "WXBUILDING" /D "WXUSINGDLL" /D "WXMAKINGDLL_CORE" /D wxUSE_BASE=0 /c\r
+# ADD CPP /nologo /FD /MD /O2 /GR /EHsc /I "..\..\lib\vc_dll\mswunivu" /I "..\..\include" /W4 /Yu"wx/wxprec.h" /Fp"vc_mswunivudll\wxprec_coredll.pch" /Zi /Fd..\..\lib\vc_dll\wxmswuniv291u_core_vc_custom.pdb /opt:ref /opt:icf /I "..\..\src\tiff\libtiff" /I "..\..\src\jpeg" /I "..\..\src\png" /I "..\..\src\zlib" /I "..\..\src\regex" /I "..\..\src\expat\lib" /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "WXBUILDING" /D "WXUSINGDLL" /D "WXMAKINGDLL_CORE" /D wxUSE_BASE=0 /c\r
  # ADD BASE MTL /nologo /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "WXBUILDING" /D "WXUSINGDLL" /D "WXMAKINGDLL_CORE" /D wxUSE_BASE=0 /mktyplib203 /win32\r
  # ADD MTL /nologo /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "WXBUILDING" /D "WXUSINGDLL" /D "WXMAKINGDLL_CORE" /D wxUSE_BASE=0 /mktyplib203 /win32\r
  # ADD BASE RSC /l 0x409 /d "__WXMSW__" /d "__WXUNIVERSAL__" /d "_UNICODE" /i "..\..\lib\vc_dll\mswunivu" /i "..\..\include" /d "WXBUILDING" /d WXDLLNAME=wxmswuniv291u_core_vc_custom /i "..\..\src\tiff\libtiff" /i "..\..\src\jpeg" /i "..\..\src\png" /i "..\..\src\zlib" /i "..\..\src\regex" /i "..\..\src\expat\lib" /d "WXUSINGDLL" /d "WXMAKINGDLL_CORE" /d wxUSE_BASE=0\r
@@ -97,8 +97,8 @@ LINK32=link.exe
  # PROP Output_Dir "..\..\lib\vc_dll"\r
  # PROP Intermediate_Dir "vc_mswudll\core"\r
  # PROP Target_Dir ""\r
-# ADD BASE CPP /nologo /FD /MD /O2 /GR /EHsc /I "..\..\lib\vc_dll\mswu" /I "..\..\include" /W4 /Yu"wx/wxprec.h" /Fp"vc_mswudll\wxprec_coredll.pch" /Zi /Fd..\..\lib\vc_dll\wxmsw291u_core_vc_custom.pdb /I "..\..\src\tiff\libtiff" /I "..\..\src\jpeg" /I "..\..\src\png" /I "..\..\src\zlib" /I "..\..\src\regex" /I "..\..\src\expat\lib" /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "__WXMSW__" /D "_UNICODE" /D "WXBUILDING" /D "WXUSINGDLL" /D "WXMAKINGDLL_CORE" /D wxUSE_BASE=0 /c\r
-# ADD CPP /nologo /FD /MD /O2 /GR /EHsc /I "..\..\lib\vc_dll\mswu" /I "..\..\include" /W4 /Yu"wx/wxprec.h" /Fp"vc_mswudll\wxprec_coredll.pch" /Zi /Fd..\..\lib\vc_dll\wxmsw291u_core_vc_custom.pdb /I "..\..\src\tiff\libtiff" /I "..\..\src\jpeg" /I "..\..\src\png" /I "..\..\src\zlib" /I "..\..\src\regex" /I "..\..\src\expat\lib" /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "__WXMSW__" /D "_UNICODE" /D "WXBUILDING" /D "WXUSINGDLL" /D "WXMAKINGDLL_CORE" /D wxUSE_BASE=0 /c\r
+# ADD BASE CPP /nologo /FD /MD /O2 /GR /EHsc /I "..\..\lib\vc_dll\mswu" /I "..\..\include" /W4 /Yu"wx/wxprec.h" /Fp"vc_mswudll\wxprec_coredll.pch" /Zi /Fd..\..\lib\vc_dll\wxmsw291u_core_vc_custom.pdb /opt:ref /opt:icf /I "..\..\src\tiff\libtiff" /I "..\..\src\jpeg" /I "..\..\src\png" /I "..\..\src\zlib" /I "..\..\src\regex" /I "..\..\src\expat\lib" /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "__WXMSW__" /D "_UNICODE" /D "WXBUILDING" /D "WXUSINGDLL" /D "WXMAKINGDLL_CORE" /D wxUSE_BASE=0 /c\r
+# ADD CPP /nologo /FD /MD /O2 /GR /EHsc /I "..\..\lib\vc_dll\mswu" /I "..\..\include" /W4 /Yu"wx/wxprec.h" /Fp"vc_mswudll\wxprec_coredll.pch" /Zi /Fd..\..\lib\vc_dll\wxmsw291u_core_vc_custom.pdb /opt:ref /opt:icf /I "..\..\src\tiff\libtiff" /I "..\..\src\jpeg" /I "..\..\src\png" /I "..\..\src\zlib" /I "..\..\src\regex" /I "..\..\src\expat\lib" /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "__WXMSW__" /D "_UNICODE" /D "WXBUILDING" /D "WXUSINGDLL" /D "WXMAKINGDLL_CORE" /D wxUSE_BASE=0 /c\r
  # ADD BASE MTL /nologo /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "__WXMSW__" /D "_UNICODE" /D "WXBUILDING" /D "WXUSINGDLL" /D "WXMAKINGDLL_CORE" /D wxUSE_BASE=0 /mktyplib203 /win32\r
  # ADD MTL /nologo /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "__WXMSW__" /D "_UNICODE" /D "WXBUILDING" /D "WXUSINGDLL" /D "WXMAKINGDLL_CORE" /D wxUSE_BASE=0 /mktyplib203 /win32\r
  # ADD BASE RSC /l 0x409 /d "__WXMSW__" /d "_UNICODE" /i "..\..\lib\vc_dll\mswu" /i "..\..\include" /d "WXBUILDING" /d WXDLLNAME=wxmsw291u_core_vc_custom /i "..\..\src\tiff\libtiff" /i "..\..\src\jpeg" /i "..\..\src\png" /i "..\..\src\zlib" /i "..\..\src\regex" /i "..\..\src\expat\lib" /d "WXUSINGDLL" /d "WXMAKINGDLL_CORE" /d wxUSE_BASE=0\r
@@ -147,8 +147,8 @@ LINK32=link.exe
  # PROP Output_Dir "..\..\lib\vc_lib"\r
  # PROP Intermediate_Dir "vc_mswunivu\core"\r
  # PROP Target_Dir ""\r
-# ADD BASE CPP /nologo /FD /MD /O2 /GR /EHsc /I "..\..\lib\vc_lib\mswunivu" /I "..\..\include" /W4 /Zi /Fd..\..\lib\vc_lib\wxmswuniv29u_core.pdb /Yu"wx/wxprec.h" /Fp"vc_mswunivu\wxprec_corelib.pch" /I "..\..\src\tiff\libtiff" /I "..\..\src\jpeg" /I "..\..\src\png" /I "..\..\src\zlib" /I "..\..\src\regex" /I "..\..\src\expat\lib" /D "WIN32" /D "_LIB" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "WXBUILDING" /D wxUSE_BASE=0 /c\r
-# ADD CPP /nologo /FD /MD /O2 /GR /EHsc /I "..\..\lib\vc_lib\mswunivu" /I "..\..\include" /W4 /Zi /Fd..\..\lib\vc_lib\wxmswuniv29u_core.pdb /Yu"wx/wxprec.h" /Fp"vc_mswunivu\wxprec_corelib.pch" /I "..\..\src\tiff\libtiff" /I "..\..\src\jpeg" /I "..\..\src\png" /I "..\..\src\zlib" /I "..\..\src\regex" /I "..\..\src\expat\lib" /D "WIN32" /D "_LIB" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "WXBUILDING" /D wxUSE_BASE=0 /c\r
+# ADD BASE CPP /nologo /FD /MD /O2 /GR /EHsc /I "..\..\lib\vc_lib\mswunivu" /I "..\..\include" /W4 /Zi /Fd..\..\lib\vc_lib\wxmswuniv29u_core.pdb /opt:ref /opt:icf /Yu"wx/wxprec.h" /Fp"vc_mswunivu\wxprec_corelib.pch" /I "..\..\src\tiff\libtiff" /I "..\..\src\jpeg" /I "..\..\src\png" /I "..\..\src\zlib" /I "..\..\src\regex" /I "..\..\src\expat\lib" /D "WIN32" /D "_LIB" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "WXBUILDING" /D wxUSE_BASE=0 /c\r
+# ADD CPP /nologo /FD /MD /O2 /GR /EHsc /I "..\..\lib\vc_lib\mswunivu" /I "..\..\include" /W4 /Zi /Fd..\..\lib\vc_lib\wxmswuniv29u_core.pdb /opt:ref /opt:icf /Yu"wx/wxprec.h" /Fp"vc_mswunivu\wxprec_corelib.pch" /I "..\..\src\tiff\libtiff" /I "..\..\src\jpeg" /I "..\..\src\png" /I "..\..\src\zlib" /I "..\..\src\regex" /I "..\..\src\expat\lib" /D "WIN32" /D "_LIB" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "WXBUILDING" /D wxUSE_BASE=0 /c\r
  # ADD BASE RSC /l 0x409\r
  # ADD RSC /l 0x409\r
  BSC32=bscmake.exe\r
@@ -193,8 +193,8 @@ LIB32=link.exe -lib
  # PROP Output_Dir "..\..\lib\vc_lib"\r
  # PROP Intermediate_Dir "vc_mswu\core"\r
  # PROP Target_Dir ""\r
-# ADD BASE CPP /nologo /FD /MD /O2 /GR /EHsc /I "..\..\lib\vc_lib\mswu" /I "..\..\include" /W4 /Zi /Fd..\..\lib\vc_lib\wxmsw29u_core.pdb /Yu"wx/wxprec.h" /Fp"vc_mswu\wxprec_corelib.pch" /I "..\..\src\tiff\libtiff" /I "..\..\src\jpeg" /I "..\..\src\png" /I "..\..\src\zlib" /I "..\..\src\regex" /I "..\..\src\expat\lib" /D "WIN32" /D "_LIB" /D "__WXMSW__" /D "_UNICODE" /D "WXBUILDING" /D wxUSE_BASE=0 /c\r
-# ADD CPP /nologo /FD /MD /O2 /GR /EHsc /I "..\..\lib\vc_lib\mswu" /I "..\..\include" /W4 /Zi /Fd..\..\lib\vc_lib\wxmsw29u_core.pdb /Yu"wx/wxprec.h" /Fp"vc_mswu\wxprec_corelib.pch" /I "..\..\src\tiff\libtiff" /I "..\..\src\jpeg" /I "..\..\src\png" /I "..\..\src\zlib" /I "..\..\src\regex" /I "..\..\src\expat\lib" /D "WIN32" /D "_LIB" /D "__WXMSW__" /D "_UNICODE" /D "WXBUILDING" /D wxUSE_BASE=0 /c\r
+# ADD BASE CPP /nologo /FD /MD /O2 /GR /EHsc /I "..\..\lib\vc_lib\mswu" /I "..\..\include" /W4 /Zi /Fd..\..\lib\vc_lib\wxmsw29u_core.pdb /opt:ref /opt:icf /Yu"wx/wxprec.h" /Fp"vc_mswu\wxprec_corelib.pch" /I "..\..\src\tiff\libtiff" /I "..\..\src\jpeg" /I "..\..\src\png" /I "..\..\src\zlib" /I "..\..\src\regex" /I "..\..\src\expat\lib" /D "WIN32" /D "_LIB" /D "__WXMSW__" /D "_UNICODE" /D "WXBUILDING" /D wxUSE_BASE=0 /c\r
+# ADD CPP /nologo /FD /MD /O2 /GR /EHsc /I "..\..\lib\vc_lib\mswu" /I "..\..\include" /W4 /Zi /Fd..\..\lib\vc_lib\wxmsw29u_core.pdb /opt:ref /opt:icf /Yu"wx/wxprec.h" /Fp"vc_mswu\wxprec_corelib.pch" /I "..\..\src\tiff\libtiff" /I "..\..\src\jpeg" /I "..\..\src\png" /I "..\..\src\zlib" /I "..\..\src\regex" /I "..\..\src\expat\lib" /D "WIN32" /D "_LIB" /D "__WXMSW__" /D "_UNICODE" /D "WXBUILDING" /D wxUSE_BASE=0 /c\r
  # ADD BASE RSC /l 0x409\r
  # ADD RSC /l 0x409\r
  BSC32=bscmake.exe\r
@@ -5327,10 +5327,10 @@ SOURCE=..\..\include\wx\generic\hyperlink.h
  # End Source File\r
  # Begin Source File\r
  \r
-SOURCE=..\..\include\wx\generic\infobar.h
-# End Source File
-# Begin Source File
-
+SOURCE=..\..\include\wx\generic\infobar.h\r
+# End Source File\r
+# Begin Source File\r
+\r
  SOURCE=..\..\include\wx\generic\laywin.h\r
  # End Source File\r
  # Begin Source File\r
@@ -6123,10 +6123,10 @@ SOURCE=..\..\include\wx\imagxpm.h
  # End Source File\r
  # Begin Source File\r
  \r
-SOURCE=..\..\include\wx\infobar.h
-# End Source File
-# Begin Source File
-
+SOURCE=..\..\include\wx\infobar.h\r
+# End Source File\r
+# Begin Source File\r
+\r
  SOURCE=..\..\include\wx\joystick.h\r
  # End Source File\r
  # Begin Source File\r
diff --git a/build/msw/wx_gl.dsp b/build/msw/wx_gl.dsp

index a3871bf82c663abedb4575f4e6a3b882914bb790..b6cf7733b017277a72f82910f00573431df5d04d 100644 (file)
--- a/build/msw/wx_gl.dsp
+++ b/build/msw/wx_gl.dsp
@@ -47,8 +47,8 @@ RSC=rc.exe
  # PROP Output_Dir "..\..\lib\vc_dll"\r
  # PROP Intermediate_Dir "vc_mswunivudll\gl"\r
  # PROP Target_Dir ""\r
-# ADD BASE CPP /nologo /FD /MD /O2 /GR /EHsc /I "..\..\lib\vc_dll\mswunivu" /I "..\..\include" /W4 /Yu"wx/wxprec.h" /Fp"vc_mswunivudll\wxprec_gldll.pch" /Zi /Fd..\..\lib\vc_dll\wxmswuniv291u_gl_vc_custom.pdb /I "..\..\src\tiff\libtiff" /I "..\..\src\jpeg" /I "..\..\src\png" /I "..\..\src\zlib" /I "..\..\src\regex" /I "..\..\src\expat\lib" /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "WXBUILDING" /D "WXUSINGDLL" /D "WXMAKINGDLL_GL" /c\r
-# ADD CPP /nologo /FD /MD /O2 /GR /EHsc /I "..\..\lib\vc_dll\mswunivu" /I "..\..\include" /W4 /Yu"wx/wxprec.h" /Fp"vc_mswunivudll\wxprec_gldll.pch" /Zi /Fd..\..\lib\vc_dll\wxmswuniv291u_gl_vc_custom.pdb /I "..\..\src\tiff\libtiff" /I "..\..\src\jpeg" /I "..\..\src\png" /I "..\..\src\zlib" /I "..\..\src\regex" /I "..\..\src\expat\lib" /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "WXBUILDING" /D "WXUSINGDLL" /D "WXMAKINGDLL_GL" /c\r
+# ADD BASE CPP /nologo /FD /MD /O2 /GR /EHsc /I "..\..\lib\vc_dll\mswunivu" /I "..\..\include" /W4 /Yu"wx/wxprec.h" /Fp"vc_mswunivudll\wxprec_gldll.pch" /Zi /Fd..\..\lib\vc_dll\wxmswuniv291u_gl_vc_custom.pdb /opt:ref /opt:icf /I "..\..\src\tiff\libtiff" /I "..\..\src\jpeg" /I "..\..\src\png" /I "..\..\src\zlib" /I "..\..\src\regex" /I "..\..\src\expat\lib" /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "WXBUILDING" /D "WXUSINGDLL" /D "WXMAKINGDLL_GL" /c\r
+# ADD CPP /nologo /FD /MD /O2 /GR /EHsc /I "..\..\lib\vc_dll\mswunivu" /I "..\..\include" /W4 /Yu"wx/wxprec.h" /Fp"vc_mswunivudll\wxprec_gldll.pch" /Zi /Fd..\..\lib\vc_dll\wxmswuniv291u_gl_vc_custom.pdb /opt:ref /opt:icf /I "..\..\src\tiff\libtiff" /I "..\..\src\jpeg" /I "..\..\src\png" /I "..\..\src\zlib" /I "..\..\src\regex" /I "..\..\src\expat\lib" /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "WXBUILDING" /D "WXUSINGDLL" /D "WXMAKINGDLL_GL" /c\r
  # ADD BASE MTL /nologo /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "WXBUILDING" /D "WXUSINGDLL" /D "WXMAKINGDLL_GL" /mktyplib203 /win32\r
  # ADD MTL /nologo /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "WXBUILDING" /D "WXUSINGDLL" /D "WXMAKINGDLL_GL" /mktyplib203 /win32\r
  # ADD BASE RSC /l 0x409 /d "__WXMSW__" /d "__WXUNIVERSAL__" /d "_UNICODE" /i "..\..\lib\vc_dll\mswunivu" /i "..\..\include" /d "WXBUILDING" /d WXDLLNAME=wxmswuniv291u_gl_vc_custom /i "..\..\src\tiff\libtiff" /i "..\..\src\jpeg" /i "..\..\src\png" /i "..\..\src\zlib" /i "..\..\src\regex" /i "..\..\src\expat\lib" /d "WXUSINGDLL" /d WXMAKINGDLL_GL\r
@@ -97,8 +97,8 @@ LINK32=link.exe
  # PROP Output_Dir "..\..\lib\vc_dll"\r
  # PROP Intermediate_Dir "vc_mswudll\gl"\r
  # PROP Target_Dir ""\r
-# ADD BASE CPP /nologo /FD /MD /O2 /GR /EHsc /I "..\..\lib\vc_dll\mswu" /I "..\..\include" /W4 /Yu"wx/wxprec.h" /Fp"vc_mswudll\wxprec_gldll.pch" /Zi /Fd..\..\lib\vc_dll\wxmsw291u_gl_vc_custom.pdb /I "..\..\src\tiff\libtiff" /I "..\..\src\jpeg" /I "..\..\src\png" /I "..\..\src\zlib" /I "..\..\src\regex" /I "..\..\src\expat\lib" /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "__WXMSW__" /D "_UNICODE" /D "WXBUILDING" /D "WXUSINGDLL" /D "WXMAKINGDLL_GL" /c\r
-# ADD CPP /nologo /FD /MD /O2 /GR /EHsc /I "..\..\lib\vc_dll\mswu" /I "..\..\include" /W4 /Yu"wx/wxprec.h" /Fp"vc_mswudll\wxprec_gldll.pch" /Zi /Fd..\..\lib\vc_dll\wxmsw291u_gl_vc_custom.pdb /I "..\..\src\tiff\libtiff" /I "..\..\src\jpeg" /I "..\..\src\png" /I "..\..\src\zlib" /I "..\..\src\regex" /I "..\..\src\expat\lib" /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "__WXMSW__" /D "_UNICODE" /D "WXBUILDING" /D "WXUSINGDLL" /D "WXMAKINGDLL_GL" /c\r
+# ADD BASE CPP /nologo /FD /MD /O2 /GR /EHsc /I "..\..\lib\vc_dll\mswu" /I "..\..\include" /W4 /Yu"wx/wxprec.h" /Fp"vc_mswudll\wxprec_gldll.pch" /Zi /Fd..\..\lib\vc_dll\wxmsw291u_gl_vc_custom.pdb /opt:ref /opt:icf /I "..\..\src\tiff\libtiff" /I "..\..\src\jpeg" /I "..\..\src\png" /I "..\..\src\zlib" /I "..\..\src\regex" /I "..\..\src\expat\lib" /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "__WXMSW__" /D "_UNICODE" /D "WXBUILDING" /D "WXUSINGDLL" /D "WXMAKINGDLL_GL" /c\r
+# ADD CPP /nologo /FD /MD /O2 /GR /EHsc /I "..\..\lib\vc_dll\mswu" /I "..\..\include" /W4 /Yu"wx/wxprec.h" /Fp"vc_mswudll\wxprec_gldll.pch" /Zi /Fd..\..\lib\vc_dll\wxmsw291u_gl_vc_custom.pdb /opt:ref /opt:icf /I "..\..\src\tiff\libtiff" /I "..\..\src\jpeg" /I "..\..\src\png" /I "..\..\src\zlib" /I "..\..\src\regex" /I "..\..\src\expat\lib" /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "__WXMSW__" /D "_UNICODE" /D "WXBUILDING" /D "WXUSINGDLL" /D "WXMAKINGDLL_GL" /c\r
  # ADD BASE MTL /nologo /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "__WXMSW__" /D "_UNICODE" /D "WXBUILDING" /D "WXUSINGDLL" /D "WXMAKINGDLL_GL" /mktyplib203 /win32\r
  # ADD MTL /nologo /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "__WXMSW__" /D "_UNICODE" /D "WXBUILDING" /D "WXUSINGDLL" /D "WXMAKINGDLL_GL" /mktyplib203 /win32\r
  # ADD BASE RSC /l 0x409 /d "__WXMSW__" /d "_UNICODE" /i "..\..\lib\vc_dll\mswu" /i "..\..\include" /d "WXBUILDING" /d WXDLLNAME=wxmsw291u_gl_vc_custom /i "..\..\src\tiff\libtiff" /i "..\..\src\jpeg" /i "..\..\src\png" /i "..\..\src\zlib" /i "..\..\src\regex" /i "..\..\src\expat\lib" /d "WXUSINGDLL" /d WXMAKINGDLL_GL\r
@@ -147,8 +147,8 @@ LINK32=link.exe
  # PROP Output_Dir "..\..\lib\vc_lib"\r
  # PROP Intermediate_Dir "vc_mswunivu\gl"\r
  # PROP Target_Dir ""\r
-# ADD BASE CPP /nologo /FD /MD /O2 /GR /EHsc /I "..\..\lib\vc_lib\mswunivu" /I "..\..\include" /W4 /Zi /Fd..\..\lib\vc_lib\wxmswuniv29u_gl.pdb /Yu"wx/wxprec.h" /Fp"vc_mswunivu\wxprec_gllib.pch" /I "..\..\src\tiff\libtiff" /I "..\..\src\jpeg" /I "..\..\src\png" /I "..\..\src\zlib" /I "..\..\src\regex" /I "..\..\src\expat\lib" /D "WIN32" /D "_LIB" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "WXBUILDING" /c\r
-# ADD CPP /nologo /FD /MD /O2 /GR /EHsc /I "..\..\lib\vc_lib\mswunivu" /I "..\..\include" /W4 /Zi /Fd..\..\lib\vc_lib\wxmswuniv29u_gl.pdb /Yu"wx/wxprec.h" /Fp"vc_mswunivu\wxprec_gllib.pch" /I "..\..\src\tiff\libtiff" /I "..\..\src\jpeg" /I "..\..\src\png" /I "..\..\src\zlib" /I "..\..\src\regex" /I "..\..\src\expat\lib" /D "WIN32" /D "_LIB" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "WXBUILDING" /c\r
+# ADD BASE CPP /nologo /FD /MD /O2 /GR /EHsc /I "..\..\lib\vc_lib\mswunivu" /I "..\..\include" /W4 /Zi /Fd..\..\lib\vc_lib\wxmswuniv29u_gl.pdb /opt:ref /opt:icf /Yu"wx/wxprec.h" /Fp"vc_mswunivu\wxprec_gllib.pch" /I "..\..\src\tiff\libtiff" /I "..\..\src\jpeg" /I "..\..\src\png" /I "..\..\src\zlib" /I "..\..\src\regex" /I "..\..\src\expat\lib" /D "WIN32" /D "_LIB" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "WXBUILDING" /c\r
+# ADD CPP /nologo /FD /MD /O2 /GR /EHsc /I "..\..\lib\vc_lib\mswunivu" /I "..\..\include" /W4 /Zi /Fd..\..\lib\vc_lib\wxmswuniv29u_gl.pdb /opt:ref /opt:icf /Yu"wx/wxprec.h" /Fp"vc_mswunivu\wxprec_gllib.pch" /I "..\..\src\tiff\libtiff" /I "..\..\src\jpeg" /I "..\..\src\png" /I "..\..\src\zlib" /I "..\..\src\regex" /I "..\..\src\expat\lib" /D "WIN32" /D "_LIB" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "WXBUILDING" /c\r
  # ADD BASE RSC /l 0x409\r
  # ADD RSC /l 0x409\r
  BSC32=bscmake.exe\r
@@ -193,8 +193,8 @@ LIB32=link.exe -lib
  # PROP Output_Dir "..\..\lib\vc_lib"\r
  # PROP Intermediate_Dir "vc_mswu\gl"\r
  # PROP Target_Dir ""\r
-# ADD BASE CPP /nologo /FD /MD /O2 /GR /EHsc /I "..\..\lib\vc_lib\mswu" /I "..\..\include" /W4 /Zi /Fd..\..\lib\vc_lib\wxmsw29u_gl.pdb /Yu"wx/wxprec.h" /Fp"vc_mswu\wxprec_gllib.pch" /I "..\..\src\tiff\libtiff" /I "..\..\src\jpeg" /I "..\..\src\png" /I "..\..\src\zlib" /I "..\..\src\regex" /I "..\..\src\expat\lib" /D "WIN32" /D "_LIB" /D "__WXMSW__" /D "_UNICODE" /D "WXBUILDING" /c\r
-# ADD CPP /nologo /FD /MD /O2 /GR /EHsc /I "..\..\lib\vc_lib\mswu" /I "..\..\include" /W4 /Zi /Fd..\..\lib\vc_lib\wxmsw29u_gl.pdb /Yu"wx/wxprec.h" /Fp"vc_mswu\wxprec_gllib.pch" /I "..\..\src\tiff\libtiff" /I "..\..\src\jpeg" /I "..\..\src\png" /I "..\..\src\zlib" /I "..\..\src\regex" /I "..\..\src\expat\lib" /D "WIN32" /D "_LIB" /D "__WXMSW__" /D "_UNICODE" /D "WXBUILDING" /c\r
+# ADD BASE CPP /nologo /FD /MD /O2 /GR /EHsc /I "..\..\lib\vc_lib\mswu" /I "..\..\include" /W4 /Zi /Fd..\..\lib\vc_lib\wxmsw29u_gl.pdb /opt:ref /opt:icf /Yu"wx/wxprec.h" /Fp"vc_mswu\wxprec_gllib.pch" /I "..\..\src\tiff\libtiff" /I "..\..\src\jpeg" /I "..\..\src\png" /I "..\..\src\zlib" /I "..\..\src\regex" /I "..\..\src\expat\lib" /D "WIN32" /D "_LIB" /D "__WXMSW__" /D "_UNICODE" /D "WXBUILDING" /c\r
+# ADD CPP /nologo /FD /MD /O2 /GR /EHsc /I "..\..\lib\vc_lib\mswu" /I "..\..\include" /W4 /Zi /Fd..\..\lib\vc_lib\wxmsw29u_gl.pdb /opt:ref /opt:icf /Yu"wx/wxprec.h" /Fp"vc_mswu\wxprec_gllib.pch" /I "..\..\src\tiff\libtiff" /I "..\..\src\jpeg" /I "..\..\src\png" /I "..\..\src\zlib" /I "..\..\src\regex" /I "..\..\src\expat\lib" /D "WIN32" /D "_LIB" /D "__WXMSW__" /D "_UNICODE" /D "WXBUILDING" /c\r
  # ADD BASE RSC /l 0x409\r
  # ADD RSC /l 0x409\r
  BSC32=bscmake.exe\r
diff --git a/build/msw/wx_html.dsp b/build/msw/wx_html.dsp

index 6fdfe4e32ca026783a891d38360fad675d4118f9..49e3d93619a80a12e1ea77051acf934167ed13c3 100644 (file)
--- a/build/msw/wx_html.dsp
+++ b/build/msw/wx_html.dsp
@@ -47,8 +47,8 @@ RSC=rc.exe
  # PROP Output_Dir "..\..\lib\vc_dll"\r
  # PROP Intermediate_Dir "vc_mswunivudll\html"\r
  # PROP Target_Dir ""\r
-# ADD BASE CPP /nologo /FD /MD /O2 /GR /EHsc /I "..\..\lib\vc_dll\mswunivu" /I "..\..\include" /W4 /Yu"wx/wxprec.h" /Fp"vc_mswunivudll\wxprec_htmldll.pch" /Zi /Fd..\..\lib\vc_dll\wxmswuniv291u_html_vc_custom.pdb /I "..\..\src\tiff\libtiff" /I "..\..\src\jpeg" /I "..\..\src\png" /I "..\..\src\zlib" /I "..\..\src\regex" /I "..\..\src\expat\lib" /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "WXBUILDING" /D "WXUSINGDLL" /D "WXMAKINGDLL_HTML" /c\r
-# ADD CPP /nologo /FD /MD /O2 /GR /EHsc /I "..\..\lib\vc_dll\mswunivu" /I "..\..\include" /W4 /Yu"wx/wxprec.h" /Fp"vc_mswunivudll\wxprec_htmldll.pch" /Zi /Fd..\..\lib\vc_dll\wxmswuniv291u_html_vc_custom.pdb /I "..\..\src\tiff\libtiff" /I "..\..\src\jpeg" /I "..\..\src\png" /I "..\..\src\zlib" /I "..\..\src\regex" /I "..\..\src\expat\lib" /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "WXBUILDING" /D "WXUSINGDLL" /D "WXMAKINGDLL_HTML" /c\r
+# ADD BASE CPP /nologo /FD /MD /O2 /GR /EHsc /I "..\..\lib\vc_dll\mswunivu" /I "..\..\include" /W4 /Yu"wx/wxprec.h" /Fp"vc_mswunivudll\wxprec_htmldll.pch" /Zi /Fd..\..\lib\vc_dll\wxmswuniv291u_html_vc_custom.pdb /opt:ref /opt:icf /I "..\..\src\tiff\libtiff" /I "..\..\src\jpeg" /I "..\..\src\png" /I "..\..\src\zlib" /I "..\..\src\regex" /I "..\..\src\expat\lib" /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "WXBUILDING" /D "WXUSINGDLL" /D "WXMAKINGDLL_HTML" /c\r
+# ADD CPP /nologo /FD /MD /O2 /GR /EHsc /I "..\..\lib\vc_dll\mswunivu" /I "..\..\include" /W4 /Yu"wx/wxprec.h" /Fp"vc_mswunivudll\wxprec_htmldll.pch" /Zi /Fd..\..\lib\vc_dll\wxmswuniv291u_html_vc_custom.pdb /opt:ref /opt:icf /I "..\..\src\tiff\libtiff" /I "..\..\src\jpeg" /I "..\..\src\png" /I "..\..\src\zlib" /I "..\..\src\regex" /I "..\..\src\expat\lib" /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "WXBUILDING" /D "WXUSINGDLL" /D "WXMAKINGDLL_HTML" /c\r
  # ADD BASE MTL /nologo /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "WXBUILDING" /D "WXUSINGDLL" /D "WXMAKINGDLL_HTML" /mktyplib203 /win32\r
  # ADD MTL /nologo /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "WXBUILDING" /D "WXUSINGDLL" /D "WXMAKINGDLL_HTML" /mktyplib203 /win32\r
  # ADD BASE RSC /l 0x409 /d "__WXMSW__" /d "__WXUNIVERSAL__" /d "_UNICODE" /i "..\..\lib\vc_dll\mswunivu" /i "..\..\include" /d "WXBUILDING" /d WXDLLNAME=wxmswuniv291u_html_vc_custom /i "..\..\src\tiff\libtiff" /i "..\..\src\jpeg" /i "..\..\src\png" /i "..\..\src\zlib" /i "..\..\src\regex" /i "..\..\src\expat\lib" /d "WXUSINGDLL" /d WXMAKINGDLL_HTML\r
@@ -97,8 +97,8 @@ LINK32=link.exe
  # PROP Output_Dir "..\..\lib\vc_dll"\r
  # PROP Intermediate_Dir "vc_mswudll\html"\r
  # PROP Target_Dir ""\r
-# ADD BASE CPP /nologo /FD /MD /O2 /GR /EHsc /I "..\..\lib\vc_dll\mswu" /I "..\..\include" /W4 /Yu"wx/wxprec.h" /Fp"vc_mswudll\wxprec_htmldll.pch" /Zi /Fd..\..\lib\vc_dll\wxmsw291u_html_vc_custom.pdb /I "..\..\src\tiff\libtiff" /I "..\..\src\jpeg" /I "..\..\src\png" /I "..\..\src\zlib" /I "..\..\src\regex" /I "..\..\src\expat\lib" /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "__WXMSW__" /D "_UNICODE" /D "WXBUILDING" /D "WXUSINGDLL" /D "WXMAKINGDLL_HTML" /c\r
-# ADD CPP /nologo /FD /MD /O2 /GR /EHsc /I "..\..\lib\vc_dll\mswu" /I "..\..\include" /W4 /Yu"wx/wxprec.h" /Fp"vc_mswudll\wxprec_htmldll.pch" /Zi /Fd..\..\lib\vc_dll\wxmsw291u_html_vc_custom.pdb /I "..\..\src\tiff\libtiff" /I "..\..\src\jpeg" /I "..\..\src\png" /I "..\..\src\zlib" /I "..\..\src\regex" /I "..\..\src\expat\lib" /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "__WXMSW__" /D "_UNICODE" /D "WXBUILDING" /D "WXUSINGDLL" /D "WXMAKINGDLL_HTML" /c\r
+# ADD BASE CPP /nologo /FD /MD /O2 /GR /EHsc /I "..\..\lib\vc_dll\mswu" /I "..\..\include" /W4 /Yu"wx/wxprec.h" /Fp"vc_mswudll\wxprec_htmldll.pch" /Zi /Fd..\..\lib\vc_dll\wxmsw291u_html_vc_custom.pdb /opt:ref /opt:icf /I "..\..\src\tiff\libtiff" /I "..\..\src\jpeg" /I "..\..\src\png" /I "..\..\src\zlib" /I "..\..\src\regex" /I "..\..\src\expat\lib" /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "__WXMSW__" /D "_UNICODE" /D "WXBUILDING" /D "WXUSINGDLL" /D "WXMAKINGDLL_HTML" /c\r
+# ADD CPP /nologo /FD /MD /O2 /GR /EHsc /I "..\..\lib\vc_dll\mswu" /I "..\..\include" /W4 /Yu"wx/wxprec.h" /Fp"vc_mswudll\wxprec_htmldll.pch" /Zi /Fd..\..\lib\vc_dll\wxmsw291u_html_vc_custom.pdb /opt:ref /opt:icf /I "..\..\src\tiff\libtiff" /I "..\..\src\jpeg" /I "..\..\src\png" /I "..\..\src\zlib" /I "..\..\src\regex" /I "..\..\src\expat\lib" /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "__WXMSW__" /D "_UNICODE" /D "WXBUILDING" /D "WXUSINGDLL" /D "WXMAKINGDLL_HTML" /c\r
  # ADD BASE MTL /nologo /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "__WXMSW__" /D "_UNICODE" /D "WXBUILDING" /D "WXUSINGDLL" /D "WXMAKINGDLL_HTML" /mktyplib203 /win32\r
  # ADD MTL /nologo /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "__WXMSW__" /D "_UNICODE" /D "WXBUILDING" /D "WXUSINGDLL" /D "WXMAKINGDLL_HTML" /mktyplib203 /win32\r
  # ADD BASE RSC /l 0x409 /d "__WXMSW__" /d "_UNICODE" /i "..\..\lib\vc_dll\mswu" /i "..\..\include" /d "WXBUILDING" /d WXDLLNAME=wxmsw291u_html_vc_custom /i "..\..\src\tiff\libtiff" /i "..\..\src\jpeg" /i "..\..\src\png" /i "..\..\src\zlib" /i "..\..\src\regex" /i "..\..\src\expat\lib" /d "WXUSINGDLL" /d WXMAKINGDLL_HTML\r
@@ -147,8 +147,8 @@ LINK32=link.exe
  # PROP Output_Dir "..\..\lib\vc_lib"\r
  # PROP Intermediate_Dir "vc_mswunivu\html"\r
  # PROP Target_Dir ""\r
-# ADD BASE CPP /nologo /FD /MD /O2 /GR /EHsc /I "..\..\lib\vc_lib\mswunivu" /I "..\..\include" /W4 /Zi /Fd..\..\lib\vc_lib\wxmswuniv29u_html.pdb /Yu"wx/wxprec.h" /Fp"vc_mswunivu\wxprec_htmllib.pch" /I "..\..\src\tiff\libtiff" /I "..\..\src\jpeg" /I "..\..\src\png" /I "..\..\src\zlib" /I "..\..\src\regex" /I "..\..\src\expat\lib" /D "WIN32" /D "_LIB" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "WXBUILDING" /c\r
-# ADD CPP /nologo /FD /MD /O2 /GR /EHsc /I "..\..\lib\vc_lib\mswunivu" /I "..\..\include" /W4 /Zi /Fd..\..\lib\vc_lib\wxmswuniv29u_html.pdb /Yu"wx/wxprec.h" /Fp"vc_mswunivu\wxprec_htmllib.pch" /I "..\..\src\tiff\libtiff" /I "..\..\src\jpeg" /I "..\..\src\png" /I "..\..\src\zlib" /I "..\..\src\regex" /I "..\..\src\expat\lib" /D "WIN32" /D "_LIB" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "WXBUILDING" /c\r
+# ADD BASE CPP /nologo /FD /MD /O2 /GR /EHsc /I "..\..\lib\vc_lib\mswunivu" /I "..\..\include" /W4 /Zi /Fd..\..\lib\vc_lib\wxmswuniv29u_html.pdb /opt:ref /opt:icf /Yu"wx/wxprec.h" /Fp"vc_mswunivu\wxprec_htmllib.pch" /I "..\..\src\tiff\libtiff" /I "..\..\src\jpeg" /I "..\..\src\png" /I "..\..\src\zlib" /I "..\..\src\regex" /I "..\..\src\expat\lib" /D "WIN32" /D "_LIB" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "WXBUILDING" /c\r
+# ADD CPP /nologo /FD /MD /O2 /GR /EHsc /I "..\..\lib\vc_lib\mswunivu" /I "..\..\include" /W4 /Zi /Fd..\..\lib\vc_lib\wxmswuniv29u_html.pdb /opt:ref /opt:icf /Yu"wx/wxprec.h" /Fp"vc_mswunivu\wxprec_htmllib.pch" /I "..\..\src\tiff\libtiff" /I "..\..\src\jpeg" /I "..\..\src\png" /I "..\..\src\zlib" /I "..\..\src\regex" /I "..\..\src\expat\lib" /D "WIN32" /D "_LIB" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "WXBUILDING" /c\r
  # ADD BASE RSC /l 0x409\r
  # ADD RSC /l 0x409\r
  BSC32=bscmake.exe\r
@@ -193,8 +193,8 @@ LIB32=link.exe -lib
  # PROP Output_Dir "..\..\lib\vc_lib"\r
  # PROP Intermediate_Dir "vc_mswu\html"\r
  # PROP Target_Dir ""\r
-# ADD BASE CPP /nologo /FD /MD /O2 /GR /EHsc /I "..\..\lib\vc_lib\mswu" /I "..\..\include" /W4 /Zi /Fd..\..\lib\vc_lib\wxmsw29u_html.pdb /Yu"wx/wxprec.h" /Fp"vc_mswu\wxprec_htmllib.pch" /I "..\..\src\tiff\libtiff" /I "..\..\src\jpeg" /I "..\..\src\png" /I "..\..\src\zlib" /I "..\..\src\regex" /I "..\..\src\expat\lib" /D "WIN32" /D "_LIB" /D "__WXMSW__" /D "_UNICODE" /D "WXBUILDING" /c\r
-# ADD CPP /nologo /FD /MD /O2 /GR /EHsc /I "..\..\lib\vc_lib\mswu" /I "..\..\include" /W4 /Zi /Fd..\..\lib\vc_lib\wxmsw29u_html.pdb /Yu"wx/wxprec.h" /Fp"vc_mswu\wxprec_htmllib.pch" /I "..\..\src\tiff\libtiff" /I "..\..\src\jpeg" /I "..\..\src\png" /I "..\..\src\zlib" /I "..\..\src\regex" /I "..\..\src\expat\lib" /D "WIN32" /D "_LIB" /D "__WXMSW__" /D "_UNICODE" /D "WXBUILDING" /c\r
+# ADD BASE CPP /nologo /FD /MD /O2 /GR /EHsc /I "..\..\lib\vc_lib\mswu" /I "..\..\include" /W4 /Zi /Fd..\..\lib\vc_lib\wxmsw29u_html.pdb /opt:ref /opt:icf /Yu"wx/wxprec.h" /Fp"vc_mswu\wxprec_htmllib.pch" /I "..\..\src\tiff\libtiff" /I "..\..\src\jpeg" /I "..\..\src\png" /I "..\..\src\zlib" /I "..\..\src\regex" /I "..\..\src\expat\lib" /D "WIN32" /D "_LIB" /D "__WXMSW__" /D "_UNICODE" /D "WXBUILDING" /c\r
+# ADD CPP /nologo /FD /MD /O2 /GR /EHsc /I "..\..\lib\vc_lib\mswu" /I "..\..\include" /W4 /Zi /Fd..\..\lib\vc_lib\wxmsw29u_html.pdb /opt:ref /opt:icf /Yu"wx/wxprec.h" /Fp"vc_mswu\wxprec_htmllib.pch" /I "..\..\src\tiff\libtiff" /I "..\..\src\jpeg" /I "..\..\src\png" /I "..\..\src\zlib" /I "..\..\src\regex" /I "..\..\src\expat\lib" /D "WIN32" /D "_LIB" /D "__WXMSW__" /D "_UNICODE" /D "WXBUILDING" /c\r
  # ADD BASE RSC /l 0x409\r
  # ADD RSC /l 0x409\r
  BSC32=bscmake.exe\r
diff --git a/build/msw/wx_media.dsp b/build/msw/wx_media.dsp

index ff76e1267520c2e4b10269b5fbcf1e777068a819..7cc82c28f994cf09d1a063d6e693ba83686f90a6 100644 (file)
--- a/build/msw/wx_media.dsp
+++ b/build/msw/wx_media.dsp
@@ -47,8 +47,8 @@ RSC=rc.exe
  # PROP Output_Dir "..\..\lib\vc_dll"\r
  # PROP Intermediate_Dir "vc_mswunivudll\media"\r
  # PROP Target_Dir ""\r
-# ADD BASE CPP /nologo /FD /MD /O2 /GR /EHsc /I "..\..\lib\vc_dll\mswunivu" /I "..\..\include" /W4 /Yu"wx/wxprec.h" /Fp"vc_mswunivudll\wxprec_mediadll.pch" /Zi /Fd..\..\lib\vc_dll\wxmswuniv291u_media_vc_custom.pdb /I "..\..\src\tiff\libtiff" /I "..\..\src\jpeg" /I "..\..\src\png" /I "..\..\src\zlib" /I "..\..\src\regex" /I "..\..\src\expat\lib" /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "WXBUILDING" /D "WXUSINGDLL" /D "WXMAKINGDLL_MEDIA" /c\r
-# ADD CPP /nologo /FD /MD /O2 /GR /EHsc /I "..\..\lib\vc_dll\mswunivu" /I "..\..\include" /W4 /Yu"wx/wxprec.h" /Fp"vc_mswunivudll\wxprec_mediadll.pch" /Zi /Fd..\..\lib\vc_dll\wxmswuniv291u_media_vc_custom.pdb /I "..\..\src\tiff\libtiff" /I "..\..\src\jpeg" /I "..\..\src\png" /I "..\..\src\zlib" /I "..\..\src\regex" /I "..\..\src\expat\lib" /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "WXBUILDING" /D "WXUSINGDLL" /D "WXMAKINGDLL_MEDIA" /c\r
+# ADD BASE CPP /nologo /FD /MD /O2 /GR /EHsc /I "..\..\lib\vc_dll\mswunivu" /I "..\..\include" /W4 /Yu"wx/wxprec.h" /Fp"vc_mswunivudll\wxprec_mediadll.pch" /Zi /Fd..\..\lib\vc_dll\wxmswuniv291u_media_vc_custom.pdb /opt:ref /opt:icf /I "..\..\src\tiff\libtiff" /I "..\..\src\jpeg" /I "..\..\src\png" /I "..\..\src\zlib" /I "..\..\src\regex" /I "..\..\src\expat\lib" /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "WXBUILDING" /D "WXUSINGDLL" /D "WXMAKINGDLL_MEDIA" /c\r
+# ADD CPP /nologo /FD /MD /O2 /GR /EHsc /I "..\..\lib\vc_dll\mswunivu" /I "..\..\include" /W4 /Yu"wx/wxprec.h" /Fp"vc_mswunivudll\wxprec_mediadll.pch" /Zi /Fd..\..\lib\vc_dll\wxmswuniv291u_media_vc_custom.pdb /opt:ref /opt:icf /I "..\..\src\tiff\libtiff" /I "..\..\src\jpeg" /I "..\..\src\png" /I "..\..\src\zlib" /I "..\..\src\regex" /I "..\..\src\expat\lib" /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "WXBUILDING" /D "WXUSINGDLL" /D "WXMAKINGDLL_MEDIA" /c\r
  # ADD BASE MTL /nologo /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "WXBUILDING" /D "WXUSINGDLL" /D "WXMAKINGDLL_MEDIA" /mktyplib203 /win32\r
  # ADD MTL /nologo /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "WXBUILDING" /D "WXUSINGDLL" /D "WXMAKINGDLL_MEDIA" /mktyplib203 /win32\r
  # ADD BASE RSC /l 0x409 /d "__WXMSW__" /d "__WXUNIVERSAL__" /d "_UNICODE" /i "..\..\lib\vc_dll\mswunivu" /i "..\..\include" /d "WXBUILDING" /d WXDLLNAME=wxmswuniv291u_media_vc_custom /i "..\..\src\tiff\libtiff" /i "..\..\src\jpeg" /i "..\..\src\png" /i "..\..\src\zlib" /i "..\..\src\regex" /i "..\..\src\expat\lib" /d "WXUSINGDLL" /d WXMAKINGDLL_MEDIA\r
@@ -97,8 +97,8 @@ LINK32=link.exe
  # PROP Output_Dir "..\..\lib\vc_dll"\r
  # PROP Intermediate_Dir "vc_mswudll\media"\r
  # PROP Target_Dir ""\r
-# ADD BASE CPP /nologo /FD /MD /O2 /GR /EHsc /I "..\..\lib\vc_dll\mswu" /I "..\..\include" /W4 /Yu"wx/wxprec.h" /Fp"vc_mswudll\wxprec_mediadll.pch" /Zi /Fd..\..\lib\vc_dll\wxmsw291u_media_vc_custom.pdb /I "..\..\src\tiff\libtiff" /I "..\..\src\jpeg" /I "..\..\src\png" /I "..\..\src\zlib" /I "..\..\src\regex" /I "..\..\src\expat\lib" /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "__WXMSW__" /D "_UNICODE" /D "WXBUILDING" /D "WXUSINGDLL" /D "WXMAKINGDLL_MEDIA" /c\r
-# ADD CPP /nologo /FD /MD /O2 /GR /EHsc /I "..\..\lib\vc_dll\mswu" /I "..\..\include" /W4 /Yu"wx/wxprec.h" /Fp"vc_mswudll\wxprec_mediadll.pch" /Zi /Fd..\..\lib\vc_dll\wxmsw291u_media_vc_custom.pdb /I "..\..\src\tiff\libtiff" /I "..\..\src\jpeg" /I "..\..\src\png" /I "..\..\src\zlib" /I "..\..\src\regex" /I "..\..\src\expat\lib" /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "__WXMSW__" /D "_UNICODE" /D "WXBUILDING" /D "WXUSINGDLL" /D "WXMAKINGDLL_MEDIA" /c\r
+# ADD BASE CPP /nologo /FD /MD /O2 /GR /EHsc /I "..\..\lib\vc_dll\mswu" /I "..\..\include" /W4 /Yu"wx/wxprec.h" /Fp"vc_mswudll\wxprec_mediadll.pch" /Zi /Fd..\..\lib\vc_dll\wxmsw291u_media_vc_custom.pdb /opt:ref /opt:icf /I "..\..\src\tiff\libtiff" /I "..\..\src\jpeg" /I "..\..\src\png" /I "..\..\src\zlib" /I "..\..\src\regex" /I "..\..\src\expat\lib" /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "__WXMSW__" /D "_UNICODE" /D "WXBUILDING" /D "WXUSINGDLL" /D "WXMAKINGDLL_MEDIA" /c\r
+# ADD CPP /nologo /FD /MD /O2 /GR /EHsc /I "..\..\lib\vc_dll\mswu" /I "..\..\include" /W4 /Yu"wx/wxprec.h" /Fp"vc_mswudll\wxprec_mediadll.pch" /Zi /Fd..\..\lib\vc_dll\wxmsw291u_media_vc_custom.pdb /opt:ref /opt:icf /I "..\..\src\tiff\libtiff" /I "..\..\src\jpeg" /I "..\..\src\png" /I "..\..\src\zlib" /I "..\..\src\regex" /I "..\..\src\expat\lib" /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "__WXMSW__" /D "_UNICODE" /D "WXBUILDING" /D "WXUSINGDLL" /D "WXMAKINGDLL_MEDIA" /c\r
  # ADD BASE MTL /nologo /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "__WXMSW__" /D "_UNICODE" /D "WXBUILDING" /D "WXUSINGDLL" /D "WXMAKINGDLL_MEDIA" /mktyplib203 /win32\r
  # ADD MTL /nologo /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "__WXMSW__" /D "_UNICODE" /D "WXBUILDING" /D "WXUSINGDLL" /D "WXMAKINGDLL_MEDIA" /mktyplib203 /win32\r
  # ADD BASE RSC /l 0x409 /d "__WXMSW__" /d "_UNICODE" /i "..\..\lib\vc_dll\mswu" /i "..\..\include" /d "WXBUILDING" /d WXDLLNAME=wxmsw291u_media_vc_custom /i "..\..\src\tiff\libtiff" /i "..\..\src\jpeg" /i "..\..\src\png" /i "..\..\src\zlib" /i "..\..\src\regex" /i "..\..\src\expat\lib" /d "WXUSINGDLL" /d WXMAKINGDLL_MEDIA\r
@@ -147,8 +147,8 @@ LINK32=link.exe
  # PROP Output_Dir "..\..\lib\vc_lib"\r
  # PROP Intermediate_Dir "vc_mswunivu\media"\r
  # PROP Target_Dir ""\r
-# ADD BASE CPP /nologo /FD /MD /O2 /GR /EHsc /I "..\..\lib\vc_lib\mswunivu" /I "..\..\include" /W4 /Zi /Fd..\..\lib\vc_lib\wxmswuniv29u_media.pdb /Yu"wx/wxprec.h" /Fp"vc_mswunivu\wxprec_medialib.pch" /I "..\..\src\tiff\libtiff" /I "..\..\src\jpeg" /I "..\..\src\png" /I "..\..\src\zlib" /I "..\..\src\regex" /I "..\..\src\expat\lib" /D "WIN32" /D "_LIB" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "WXBUILDING" /c\r
-# ADD CPP /nologo /FD /MD /O2 /GR /EHsc /I "..\..\lib\vc_lib\mswunivu" /I "..\..\include" /W4 /Zi /Fd..\..\lib\vc_lib\wxmswuniv29u_media.pdb /Yu"wx/wxprec.h" /Fp"vc_mswunivu\wxprec_medialib.pch" /I "..\..\src\tiff\libtiff" /I "..\..\src\jpeg" /I "..\..\src\png" /I "..\..\src\zlib" /I "..\..\src\regex" /I "..\..\src\expat\lib" /D "WIN32" /D "_LIB" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "WXBUILDING" /c\r
+# ADD BASE CPP /nologo /FD /MD /O2 /GR /EHsc /I "..\..\lib\vc_lib\mswunivu" /I "..\..\include" /W4 /Zi /Fd..\..\lib\vc_lib\wxmswuniv29u_media.pdb /opt:ref /opt:icf /Yu"wx/wxprec.h" /Fp"vc_mswunivu\wxprec_medialib.pch" /I "..\..\src\tiff\libtiff" /I "..\..\src\jpeg" /I "..\..\src\png" /I "..\..\src\zlib" /I "..\..\src\regex" /I "..\..\src\expat\lib" /D "WIN32" /D "_LIB" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "WXBUILDING" /c\r
+# ADD CPP /nologo /FD /MD /O2 /GR /EHsc /I "..\..\lib\vc_lib\mswunivu" /I "..\..\include" /W4 /Zi /Fd..\..\lib\vc_lib\wxmswuniv29u_media.pdb /opt:ref /opt:icf /Yu"wx/wxprec.h" /Fp"vc_mswunivu\wxprec_medialib.pch" /I "..\..\src\tiff\libtiff" /I "..\..\src\jpeg" /I "..\..\src\png" /I "..\..\src\zlib" /I "..\..\src\regex" /I "..\..\src\expat\lib" /D "WIN32" /D "_LIB" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "WXBUILDING" /c\r
  # ADD BASE RSC /l 0x409\r
  # ADD RSC /l 0x409\r
  BSC32=bscmake.exe\r
@@ -193,8 +193,8 @@ LIB32=link.exe -lib
  # PROP Output_Dir "..\..\lib\vc_lib"\r
  # PROP Intermediate_Dir "vc_mswu\media"\r
  # PROP Target_Dir ""\r
-# ADD BASE CPP /nologo /FD /MD /O2 /GR /EHsc /I "..\..\lib\vc_lib\mswu" /I "..\..\include" /W4 /Zi /Fd..\..\lib\vc_lib\wxmsw29u_media.pdb /Yu"wx/wxprec.h" /Fp"vc_mswu\wxprec_medialib.pch" /I "..\..\src\tiff\libtiff" /I "..\..\src\jpeg" /I "..\..\src\png" /I "..\..\src\zlib" /I "..\..\src\regex" /I "..\..\src\expat\lib" /D "WIN32" /D "_LIB" /D "__WXMSW__" /D "_UNICODE" /D "WXBUILDING" /c\r
-# ADD CPP /nologo /FD /MD /O2 /GR /EHsc /I "..\..\lib\vc_lib\mswu" /I "..\..\include" /W4 /Zi /Fd..\..\lib\vc_lib\wxmsw29u_media.pdb /Yu"wx/wxprec.h" /Fp"vc_mswu\wxprec_medialib.pch" /I "..\..\src\tiff\libtiff" /I "..\..\src\jpeg" /I "..\..\src\png" /I "..\..\src\zlib" /I "..\..\src\regex" /I "..\..\src\expat\lib" /D "WIN32" /D "_LIB" /D "__WXMSW__" /D "_UNICODE" /D "WXBUILDING" /c\r
+# ADD BASE CPP /nologo /FD /MD /O2 /GR /EHsc /I "..\..\lib\vc_lib\mswu" /I "..\..\include" /W4 /Zi /Fd..\..\lib\vc_lib\wxmsw29u_media.pdb /opt:ref /opt:icf /Yu"wx/wxprec.h" /Fp"vc_mswu\wxprec_medialib.pch" /I "..\..\src\tiff\libtiff" /I "..\..\src\jpeg" /I "..\..\src\png" /I "..\..\src\zlib" /I "..\..\src\regex" /I "..\..\src\expat\lib" /D "WIN32" /D "_LIB" /D "__WXMSW__" /D "_UNICODE" /D "WXBUILDING" /c\r
+# ADD CPP /nologo /FD /MD /O2 /GR /EHsc /I "..\..\lib\vc_lib\mswu" /I "..\..\include" /W4 /Zi /Fd..\..\lib\vc_lib\wxmsw29u_media.pdb /opt:ref /opt:icf /Yu"wx/wxprec.h" /Fp"vc_mswu\wxprec_medialib.pch" /I "..\..\src\tiff\libtiff" /I "..\..\src\jpeg" /I "..\..\src\png" /I "..\..\src\zlib" /I "..\..\src\regex" /I "..\..\src\expat\lib" /D "WIN32" /D "_LIB" /D "__WXMSW__" /D "_UNICODE" /D "WXBUILDING" /c\r
  # ADD BASE RSC /l 0x409\r
  # ADD RSC /l 0x409\r
  BSC32=bscmake.exe\r
diff --git a/build/msw/wx_net.dsp b/build/msw/wx_net.dsp

index 39754c6611d724d91eefce358a90067fd777cbd1..9d2e77324eb946163de911165a74b306b32a0935 100644 (file)
--- a/build/msw/wx_net.dsp
+++ b/build/msw/wx_net.dsp
@@ -47,8 +47,8 @@ RSC=rc.exe
  # PROP Output_Dir "..\..\lib\vc_dll"\r
  # PROP Intermediate_Dir "vc_mswunivudll\net"\r
  # PROP Target_Dir ""\r
-# ADD BASE CPP /nologo /FD /MD /O2 /GR /EHsc /I "..\..\lib\vc_dll\mswunivu" /I "..\..\include" /W4 /Yu"wx/wxprec.h" /Fp"vc_mswunivudll\wxprec_netdll.pch" /Zi /Fd..\..\lib\vc_dll\wxbase291u_net_vc_custom.pdb /I "..\..\src\tiff\libtiff" /I "..\..\src\jpeg" /I "..\..\src\png" /I "..\..\src\zlib" /I "..\..\src\regex" /I "..\..\src\expat\lib" /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "WXBUILDING" /D wxUSE_GUI=0 /D "WXUSINGDLL" /D "WXMAKINGDLL_NET" /c\r
-# ADD CPP /nologo /FD /MD /O2 /GR /EHsc /I "..\..\lib\vc_dll\mswunivu" /I "..\..\include" /W4 /Yu"wx/wxprec.h" /Fp"vc_mswunivudll\wxprec_netdll.pch" /Zi /Fd..\..\lib\vc_dll\wxbase291u_net_vc_custom.pdb /I "..\..\src\tiff\libtiff" /I "..\..\src\jpeg" /I "..\..\src\png" /I "..\..\src\zlib" /I "..\..\src\regex" /I "..\..\src\expat\lib" /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "WXBUILDING" /D wxUSE_GUI=0 /D "WXUSINGDLL" /D "WXMAKINGDLL_NET" /c\r
+# ADD BASE CPP /nologo /FD /MD /O2 /GR /EHsc /I "..\..\lib\vc_dll\mswunivu" /I "..\..\include" /W4 /Yu"wx/wxprec.h" /Fp"vc_mswunivudll\wxprec_netdll.pch" /Zi /Fd..\..\lib\vc_dll\wxbase291u_net_vc_custom.pdb /opt:ref /opt:icf /I "..\..\src\tiff\libtiff" /I "..\..\src\jpeg" /I "..\..\src\png" /I "..\..\src\zlib" /I "..\..\src\regex" /I "..\..\src\expat\lib" /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "WXBUILDING" /D wxUSE_GUI=0 /D "WXUSINGDLL" /D "WXMAKINGDLL_NET" /c\r
+# ADD CPP /nologo /FD /MD /O2 /GR /EHsc /I "..\..\lib\vc_dll\mswunivu" /I "..\..\include" /W4 /Yu"wx/wxprec.h" /Fp"vc_mswunivudll\wxprec_netdll.pch" /Zi /Fd..\..\lib\vc_dll\wxbase291u_net_vc_custom.pdb /opt:ref /opt:icf /I "..\..\src\tiff\libtiff" /I "..\..\src\jpeg" /I "..\..\src\png" /I "..\..\src\zlib" /I "..\..\src\regex" /I "..\..\src\expat\lib" /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "WXBUILDING" /D wxUSE_GUI=0 /D "WXUSINGDLL" /D "WXMAKINGDLL_NET" /c\r
  # ADD BASE MTL /nologo /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "WXBUILDING" /D wxUSE_GUI=0 /D "WXUSINGDLL" /D "WXMAKINGDLL_NET" /mktyplib203 /win32\r
  # ADD MTL /nologo /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "WXBUILDING" /D wxUSE_GUI=0 /D "WXUSINGDLL" /D "WXMAKINGDLL_NET" /mktyplib203 /win32\r
  # ADD BASE RSC /l 0x409 /d "__WXMSW__" /d "__WXUNIVERSAL__" /d "_UNICODE" /i "..\..\lib\vc_dll\mswunivu" /i "..\..\include" /d "WXBUILDING" /d WXDLLNAME=wxbase291u_net_vc_custom /i "..\..\src\tiff\libtiff" /i "..\..\src\jpeg" /i "..\..\src\png" /i "..\..\src\zlib" /i "..\..\src\regex" /i "..\..\src\expat\lib" /d wxUSE_GUI=0 /d "WXUSINGDLL" /d WXMAKINGDLL_NET\r
@@ -97,8 +97,8 @@ LINK32=link.exe
  # PROP Output_Dir "..\..\lib\vc_dll"\r
  # PROP Intermediate_Dir "vc_mswudll\net"\r
  # PROP Target_Dir ""\r
-# ADD BASE CPP /nologo /FD /MD /O2 /GR /EHsc /I "..\..\lib\vc_dll\mswu" /I "..\..\include" /W4 /Yu"wx/wxprec.h" /Fp"vc_mswudll\wxprec_netdll.pch" /Zi /Fd..\..\lib\vc_dll\wxbase291u_net_vc_custom.pdb /I "..\..\src\tiff\libtiff" /I "..\..\src\jpeg" /I "..\..\src\png" /I "..\..\src\zlib" /I "..\..\src\regex" /I "..\..\src\expat\lib" /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "__WXMSW__" /D "_UNICODE" /D "WXBUILDING" /D wxUSE_GUI=0 /D "WXUSINGDLL" /D "WXMAKINGDLL_NET" /c\r
-# ADD CPP /nologo /FD /MD /O2 /GR /EHsc /I "..\..\lib\vc_dll\mswu" /I "..\..\include" /W4 /Yu"wx/wxprec.h" /Fp"vc_mswudll\wxprec_netdll.pch" /Zi /Fd..\..\lib\vc_dll\wxbase291u_net_vc_custom.pdb /I "..\..\src\tiff\libtiff" /I "..\..\src\jpeg" /I "..\..\src\png" /I "..\..\src\zlib" /I "..\..\src\regex" /I "..\..\src\expat\lib" /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "__WXMSW__" /D "_UNICODE" /D "WXBUILDING" /D wxUSE_GUI=0 /D "WXUSINGDLL" /D "WXMAKINGDLL_NET" /c\r
+# ADD BASE CPP /nologo /FD /MD /O2 /GR /EHsc /I "..\..\lib\vc_dll\mswu" /I "..\..\include" /W4 /Yu"wx/wxprec.h" /Fp"vc_mswudll\wxprec_netdll.pch" /Zi /Fd..\..\lib\vc_dll\wxbase291u_net_vc_custom.pdb /opt:ref /opt:icf /I "..\..\src\tiff\libtiff" /I "..\..\src\jpeg" /I "..\..\src\png" /I "..\..\src\zlib" /I "..\..\src\regex" /I "..\..\src\expat\lib" /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "__WXMSW__" /D "_UNICODE" /D "WXBUILDING" /D wxUSE_GUI=0 /D "WXUSINGDLL" /D "WXMAKINGDLL_NET" /c\r
+# ADD CPP /nologo /FD /MD /O2 /GR /EHsc /I "..\..\lib\vc_dll\mswu" /I "..\..\include" /W4 /Yu"wx/wxprec.h" /Fp"vc_mswudll\wxprec_netdll.pch" /Zi /Fd..\..\lib\vc_dll\wxbase291u_net_vc_custom.pdb /opt:ref /opt:icf /I "..\..\src\tiff\libtiff" /I "..\..\src\jpeg" /I "..\..\src\png" /I "..\..\src\zlib" /I "..\..\src\regex" /I "..\..\src\expat\lib" /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "__WXMSW__" /D "_UNICODE" /D "WXBUILDING" /D wxUSE_GUI=0 /D "WXUSINGDLL" /D "WXMAKINGDLL_NET" /c\r
  # ADD BASE MTL /nologo /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "__WXMSW__" /D "_UNICODE" /D "WXBUILDING" /D wxUSE_GUI=0 /D "WXUSINGDLL" /D "WXMAKINGDLL_NET" /mktyplib203 /win32\r
  # ADD MTL /nologo /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "__WXMSW__" /D "_UNICODE" /D "WXBUILDING" /D wxUSE_GUI=0 /D "WXUSINGDLL" /D "WXMAKINGDLL_NET" /mktyplib203 /win32\r
  # ADD BASE RSC /l 0x409 /d "__WXMSW__" /d "_UNICODE" /i "..\..\lib\vc_dll\mswu" /i "..\..\include" /d "WXBUILDING" /d WXDLLNAME=wxbase291u_net_vc_custom /i "..\..\src\tiff\libtiff" /i "..\..\src\jpeg" /i "..\..\src\png" /i "..\..\src\zlib" /i "..\..\src\regex" /i "..\..\src\expat\lib" /d wxUSE_GUI=0 /d "WXUSINGDLL" /d WXMAKINGDLL_NET\r
@@ -147,8 +147,8 @@ LINK32=link.exe
  # PROP Output_Dir "..\..\lib\vc_lib"\r
  # PROP Intermediate_Dir "vc_mswunivu\net"\r
  # PROP Target_Dir ""\r
-# ADD BASE CPP /nologo /FD /MD /O2 /GR /EHsc /I "..\..\lib\vc_lib\mswunivu" /I "..\..\include" /W4 /Zi /Fd..\..\lib\vc_lib\wxbase29u_net.pdb /Yu"wx/wxprec.h" /Fp"vc_mswunivu\wxprec_netlib.pch" /I "..\..\src\tiff\libtiff" /I "..\..\src\jpeg" /I "..\..\src\png" /I "..\..\src\zlib" /I "..\..\src\regex" /I "..\..\src\expat\lib" /D "WIN32" /D "_LIB" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "WXBUILDING" /D wxUSE_GUI=0 /c\r
-# ADD CPP /nologo /FD /MD /O2 /GR /EHsc /I "..\..\lib\vc_lib\mswunivu" /I "..\..\include" /W4 /Zi /Fd..\..\lib\vc_lib\wxbase29u_net.pdb /Yu"wx/wxprec.h" /Fp"vc_mswunivu\wxprec_netlib.pch" /I "..\..\src\tiff\libtiff" /I "..\..\src\jpeg" /I "..\..\src\png" /I "..\..\src\zlib" /I "..\..\src\regex" /I "..\..\src\expat\lib" /D "WIN32" /D "_LIB" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "WXBUILDING" /D wxUSE_GUI=0 /c\r
+# ADD BASE CPP /nologo /FD /MD /O2 /GR /EHsc /I "..\..\lib\vc_lib\mswunivu" /I "..\..\include" /W4 /Zi /Fd..\..\lib\vc_lib\wxbase29u_net.pdb /opt:ref /opt:icf /Yu"wx/wxprec.h" /Fp"vc_mswunivu\wxprec_netlib.pch" /I "..\..\src\tiff\libtiff" /I "..\..\src\jpeg" /I "..\..\src\png" /I "..\..\src\zlib" /I "..\..\src\regex" /I "..\..\src\expat\lib" /D "WIN32" /D "_LIB" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "WXBUILDING" /D wxUSE_GUI=0 /c\r
+# ADD CPP /nologo /FD /MD /O2 /GR /EHsc /I "..\..\lib\vc_lib\mswunivu" /I "..\..\include" /W4 /Zi /Fd..\..\lib\vc_lib\wxbase29u_net.pdb /opt:ref /opt:icf /Yu"wx/wxprec.h" /Fp"vc_mswunivu\wxprec_netlib.pch" /I "..\..\src\tiff\libtiff" /I "..\..\src\jpeg" /I "..\..\src\png" /I "..\..\src\zlib" /I "..\..\src\regex" /I "..\..\src\expat\lib" /D "WIN32" /D "_LIB" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "WXBUILDING" /D wxUSE_GUI=0 /c\r
  # ADD BASE RSC /l 0x409\r
  # ADD RSC /l 0x409\r
  BSC32=bscmake.exe\r
@@ -193,8 +193,8 @@ LIB32=link.exe -lib
  # PROP Output_Dir "..\..\lib\vc_lib"\r
  # PROP Intermediate_Dir "vc_mswu\net"\r
  # PROP Target_Dir ""\r
-# ADD BASE CPP /nologo /FD /MD /O2 /GR /EHsc /I "..\..\lib\vc_lib\mswu" /I "..\..\include" /W4 /Zi /Fd..\..\lib\vc_lib\wxbase29u_net.pdb /Yu"wx/wxprec.h" /Fp"vc_mswu\wxprec_netlib.pch" /I "..\..\src\tiff\libtiff" /I "..\..\src\jpeg" /I "..\..\src\png" /I "..\..\src\zlib" /I "..\..\src\regex" /I "..\..\src\expat\lib" /D "WIN32" /D "_LIB" /D "__WXMSW__" /D "_UNICODE" /D "WXBUILDING" /D wxUSE_GUI=0 /c\r
-# ADD CPP /nologo /FD /MD /O2 /GR /EHsc /I "..\..\lib\vc_lib\mswu" /I "..\..\include" /W4 /Zi /Fd..\..\lib\vc_lib\wxbase29u_net.pdb /Yu"wx/wxprec.h" /Fp"vc_mswu\wxprec_netlib.pch" /I "..\..\src\tiff\libtiff" /I "..\..\src\jpeg" /I "..\..\src\png" /I "..\..\src\zlib" /I "..\..\src\regex" /I "..\..\src\expat\lib" /D "WIN32" /D "_LIB" /D "__WXMSW__" /D "_UNICODE" /D "WXBUILDING" /D wxUSE_GUI=0 /c\r
+# ADD BASE CPP /nologo /FD /MD /O2 /GR /EHsc /I "..\..\lib\vc_lib\mswu" /I "..\..\include" /W4 /Zi /Fd..\..\lib\vc_lib\wxbase29u_net.pdb /opt:ref /opt:icf /Yu"wx/wxprec.h" /Fp"vc_mswu\wxprec_netlib.pch" /I "..\..\src\tiff\libtiff" /I "..\..\src\jpeg" /I "..\..\src\png" /I "..\..\src\zlib" /I "..\..\src\regex" /I "..\..\src\expat\lib" /D "WIN32" /D "_LIB" /D "__WXMSW__" /D "_UNICODE" /D "WXBUILDING" /D wxUSE_GUI=0 /c\r
+# ADD CPP /nologo /FD /MD /O2 /GR /EHsc /I "..\..\lib\vc_lib\mswu" /I "..\..\include" /W4 /Zi /Fd..\..\lib\vc_lib\wxbase29u_net.pdb /opt:ref /opt:icf /Yu"wx/wxprec.h" /Fp"vc_mswu\wxprec_netlib.pch" /I "..\..\src\tiff\libtiff" /I "..\..\src\jpeg" /I "..\..\src\png" /I "..\..\src\zlib" /I "..\..\src\regex" /I "..\..\src\expat\lib" /D "WIN32" /D "_LIB" /D "__WXMSW__" /D "_UNICODE" /D "WXBUILDING" /D wxUSE_GUI=0 /c\r
  # ADD BASE RSC /l 0x409\r
  # ADD RSC /l 0x409\r
  BSC32=bscmake.exe\r
diff --git a/build/msw/wx_propgrid.dsp b/build/msw/wx_propgrid.dsp

index a467bbf1b6cd40fa5711d5f1884bf6575a17ca4c..5043ad87264aa35143284648e3cb42699dfc274e 100644 (file)
--- a/build/msw/wx_propgrid.dsp
+++ b/build/msw/wx_propgrid.dsp
@@ -47,8 +47,8 @@ RSC=rc.exe
  # PROP Output_Dir "..\..\lib\vc_dll"\r
  # PROP Intermediate_Dir "vc_mswunivudll\propgrid"\r
  # PROP Target_Dir ""\r
-# ADD BASE CPP /nologo /FD /MD /O2 /GR /EHsc /I "..\..\lib\vc_dll\mswunivu" /I "..\..\include" /W4 /Yu"wx/wxprec.h" /Fp"vc_mswunivudll\wxprec_propgriddll.pch" /Zi /Fd..\..\lib\vc_dll\wxmswuniv291u_propgrid_vc_custom.pdb /I "..\..\src\tiff\libtiff" /I "..\..\src\jpeg" /I "..\..\src\png" /I "..\..\src\zlib" /I "..\..\src\regex" /I "..\..\src\expat\lib" /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "WXBUILDING" /D "WXUSINGDLL" /D "WXMAKINGDLL_PROPGRID" /c\r
-# ADD CPP /nologo /FD /MD /O2 /GR /EHsc /I "..\..\lib\vc_dll\mswunivu" /I "..\..\include" /W4 /Yu"wx/wxprec.h" /Fp"vc_mswunivudll\wxprec_propgriddll.pch" /Zi /Fd..\..\lib\vc_dll\wxmswuniv291u_propgrid_vc_custom.pdb /I "..\..\src\tiff\libtiff" /I "..\..\src\jpeg" /I "..\..\src\png" /I "..\..\src\zlib" /I "..\..\src\regex" /I "..\..\src\expat\lib" /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "WXBUILDING" /D "WXUSINGDLL" /D "WXMAKINGDLL_PROPGRID" /c\r
+# ADD BASE CPP /nologo /FD /MD /O2 /GR /EHsc /I "..\..\lib\vc_dll\mswunivu" /I "..\..\include" /W4 /Yu"wx/wxprec.h" /Fp"vc_mswunivudll\wxprec_propgriddll.pch" /Zi /Fd..\..\lib\vc_dll\wxmswuniv291u_propgrid_vc_custom.pdb /opt:ref /opt:icf /I "..\..\src\tiff\libtiff" /I "..\..\src\jpeg" /I "..\..\src\png" /I "..\..\src\zlib" /I "..\..\src\regex" /I "..\..\src\expat\lib" /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "WXBUILDING" /D "WXUSINGDLL" /D "WXMAKINGDLL_PROPGRID" /c\r
+# ADD CPP /nologo /FD /MD /O2 /GR /EHsc /I "..\..\lib\vc_dll\mswunivu" /I "..\..\include" /W4 /Yu"wx/wxprec.h" /Fp"vc_mswunivudll\wxprec_propgriddll.pch" /Zi /Fd..\..\lib\vc_dll\wxmswuniv291u_propgrid_vc_custom.pdb /opt:ref /opt:icf /I "..\..\src\tiff\libtiff" /I "..\..\src\jpeg" /I "..\..\src\png" /I "..\..\src\zlib" /I "..\..\src\regex" /I "..\..\src\expat\lib" /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "WXBUILDING" /D "WXUSINGDLL" /D "WXMAKINGDLL_PROPGRID" /c\r
  # ADD BASE MTL /nologo /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "WXBUILDING" /D "WXUSINGDLL" /D "WXMAKINGDLL_PROPGRID" /mktyplib203 /win32\r
  # ADD MTL /nologo /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "WXBUILDING" /D "WXUSINGDLL" /D "WXMAKINGDLL_PROPGRID" /mktyplib203 /win32\r
  # ADD BASE RSC /l 0x409 /d "__WXMSW__" /d "__WXUNIVERSAL__" /d "_UNICODE" /i "..\..\lib\vc_dll\mswunivu" /i "..\..\include" /d "WXBUILDING" /d WXDLLNAME=wxmswuniv291u_propgrid_vc_custom /i "..\..\src\tiff\libtiff" /i "..\..\src\jpeg" /i "..\..\src\png" /i "..\..\src\zlib" /i "..\..\src\regex" /i "..\..\src\expat\lib" /d "WXUSINGDLL" /d WXMAKINGDLL_PROPGRID\r
@@ -97,8 +97,8 @@ LINK32=link.exe
  # PROP Output_Dir "..\..\lib\vc_dll"\r
  # PROP Intermediate_Dir "vc_mswudll\propgrid"\r
  # PROP Target_Dir ""\r
-# ADD BASE CPP /nologo /FD /MD /O2 /GR /EHsc /I "..\..\lib\vc_dll\mswu" /I "..\..\include" /W4 /Yu"wx/wxprec.h" /Fp"vc_mswudll\wxprec_propgriddll.pch" /Zi /Fd..\..\lib\vc_dll\wxmsw291u_propgrid_vc_custom.pdb /I "..\..\src\tiff\libtiff" /I "..\..\src\jpeg" /I "..\..\src\png" /I "..\..\src\zlib" /I "..\..\src\regex" /I "..\..\src\expat\lib" /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "__WXMSW__" /D "_UNICODE" /D "WXBUILDING" /D "WXUSINGDLL" /D "WXMAKINGDLL_PROPGRID" /c\r
-# ADD CPP /nologo /FD /MD /O2 /GR /EHsc /I "..\..\lib\vc_dll\mswu" /I "..\..\include" /W4 /Yu"wx/wxprec.h" /Fp"vc_mswudll\wxprec_propgriddll.pch" /Zi /Fd..\..\lib\vc_dll\wxmsw291u_propgrid_vc_custom.pdb /I "..\..\src\tiff\libtiff" /I "..\..\src\jpeg" /I "..\..\src\png" /I "..\..\src\zlib" /I "..\..\src\regex" /I "..\..\src\expat\lib" /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "__WXMSW__" /D "_UNICODE" /D "WXBUILDING" /D "WXUSINGDLL" /D "WXMAKINGDLL_PROPGRID" /c\r
+# ADD BASE CPP /nologo /FD /MD /O2 /GR /EHsc /I "..\..\lib\vc_dll\mswu" /I "..\..\include" /W4 /Yu"wx/wxprec.h" /Fp"vc_mswudll\wxprec_propgriddll.pch" /Zi /Fd..\..\lib\vc_dll\wxmsw291u_propgrid_vc_custom.pdb /opt:ref /opt:icf /I "..\..\src\tiff\libtiff" /I "..\..\src\jpeg" /I "..\..\src\png" /I "..\..\src\zlib" /I "..\..\src\regex" /I "..\..\src\expat\lib" /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "__WXMSW__" /D "_UNICODE" /D "WXBUILDING" /D "WXUSINGDLL" /D "WXMAKINGDLL_PROPGRID" /c\r
+# ADD CPP /nologo /FD /MD /O2 /GR /EHsc /I "..\..\lib\vc_dll\mswu" /I "..\..\include" /W4 /Yu"wx/wxprec.h" /Fp"vc_mswudll\wxprec_propgriddll.pch" /Zi /Fd..\..\lib\vc_dll\wxmsw291u_propgrid_vc_custom.pdb /opt:ref /opt:icf /I "..\..\src\tiff\libtiff" /I "..\..\src\jpeg" /I "..\..\src\png" /I "..\..\src\zlib" /I "..\..\src\regex" /I "..\..\src\expat\lib" /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "__WXMSW__" /D "_UNICODE" /D "WXBUILDING" /D "WXUSINGDLL" /D "WXMAKINGDLL_PROPGRID" /c\r
  # ADD BASE MTL /nologo /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "__WXMSW__" /D "_UNICODE" /D "WXBUILDING" /D "WXUSINGDLL" /D "WXMAKINGDLL_PROPGRID" /mktyplib203 /win32\r
  # ADD MTL /nologo /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "__WXMSW__" /D "_UNICODE" /D "WXBUILDING" /D "WXUSINGDLL" /D "WXMAKINGDLL_PROPGRID" /mktyplib203 /win32\r
  # ADD BASE RSC /l 0x409 /d "__WXMSW__" /d "_UNICODE" /i "..\..\lib\vc_dll\mswu" /i "..\..\include" /d "WXBUILDING" /d WXDLLNAME=wxmsw291u_propgrid_vc_custom /i "..\..\src\tiff\libtiff" /i "..\..\src\jpeg" /i "..\..\src\png" /i "..\..\src\zlib" /i "..\..\src\regex" /i "..\..\src\expat\lib" /d "WXUSINGDLL" /d WXMAKINGDLL_PROPGRID\r
@@ -147,8 +147,8 @@ LINK32=link.exe
  # PROP Output_Dir "..\..\lib\vc_lib"\r
  # PROP Intermediate_Dir "vc_mswunivu\propgrid"\r
  # PROP Target_Dir ""\r
-# ADD BASE CPP /nologo /FD /MD /O2 /GR /EHsc /I "..\..\lib\vc_lib\mswunivu" /I "..\..\include" /W4 /Zi /Fd..\..\lib\vc_lib\wxmswuniv29u_propgrid.pdb /Yu"wx/wxprec.h" /Fp"vc_mswunivu\wxprec_propgridlib.pch" /I "..\..\src\tiff\libtiff" /I "..\..\src\jpeg" /I "..\..\src\png" /I "..\..\src\zlib" /I "..\..\src\regex" /I "..\..\src\expat\lib" /D "WIN32" /D "_LIB" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "WXBUILDING" /c\r
-# ADD CPP /nologo /FD /MD /O2 /GR /EHsc /I "..\..\lib\vc_lib\mswunivu" /I "..\..\include" /W4 /Zi /Fd..\..\lib\vc_lib\wxmswuniv29u_propgrid.pdb /Yu"wx/wxprec.h" /Fp"vc_mswunivu\wxprec_propgridlib.pch" /I "..\..\src\tiff\libtiff" /I "..\..\src\jpeg" /I "..\..\src\png" /I "..\..\src\zlib" /I "..\..\src\regex" /I "..\..\src\expat\lib" /D "WIN32" /D "_LIB" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "WXBUILDING" /c\r
+# ADD BASE CPP /nologo /FD /MD /O2 /GR /EHsc /I "..\..\lib\vc_lib\mswunivu" /I "..\..\include" /W4 /Zi /Fd..\..\lib\vc_lib\wxmswuniv29u_propgrid.pdb /opt:ref /opt:icf /Yu"wx/wxprec.h" /Fp"vc_mswunivu\wxprec_propgridlib.pch" /I "..\..\src\tiff\libtiff" /I "..\..\src\jpeg" /I "..\..\src\png" /I "..\..\src\zlib" /I "..\..\src\regex" /I "..\..\src\expat\lib" /D "WIN32" /D "_LIB" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "WXBUILDING" /c\r
+# ADD CPP /nologo /FD /MD /O2 /GR /EHsc /I "..\..\lib\vc_lib\mswunivu" /I "..\..\include" /W4 /Zi /Fd..\..\lib\vc_lib\wxmswuniv29u_propgrid.pdb /opt:ref /opt:icf /Yu"wx/wxprec.h" /Fp"vc_mswunivu\wxprec_propgridlib.pch" /I "..\..\src\tiff\libtiff" /I "..\..\src\jpeg" /I "..\..\src\png" /I "..\..\src\zlib" /I "..\..\src\regex" /I "..\..\src\expat\lib" /D "WIN32" /D "_LIB" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "WXBUILDING" /c\r
  # ADD BASE RSC /l 0x409\r
  # ADD RSC /l 0x409\r
  BSC32=bscmake.exe\r
@@ -193,8 +193,8 @@ LIB32=link.exe -lib
  # PROP Output_Dir "..\..\lib\vc_lib"\r
  # PROP Intermediate_Dir "vc_mswu\propgrid"\r
  # PROP Target_Dir ""\r
-# ADD BASE CPP /nologo /FD /MD /O2 /GR /EHsc /I "..\..\lib\vc_lib\mswu" /I "..\..\include" /W4 /Zi /Fd..\..\lib\vc_lib\wxmsw29u_propgrid.pdb /Yu"wx/wxprec.h" /Fp"vc_mswu\wxprec_propgridlib.pch" /I "..\..\src\tiff\libtiff" /I "..\..\src\jpeg" /I "..\..\src\png" /I "..\..\src\zlib" /I "..\..\src\regex" /I "..\..\src\expat\lib" /D "WIN32" /D "_LIB" /D "__WXMSW__" /D "_UNICODE" /D "WXBUILDING" /c\r
-# ADD CPP /nologo /FD /MD /O2 /GR /EHsc /I "..\..\lib\vc_lib\mswu" /I "..\..\include" /W4 /Zi /Fd..\..\lib\vc_lib\wxmsw29u_propgrid.pdb /Yu"wx/wxprec.h" /Fp"vc_mswu\wxprec_propgridlib.pch" /I "..\..\src\tiff\libtiff" /I "..\..\src\jpeg" /I "..\..\src\png" /I "..\..\src\zlib" /I "..\..\src\regex" /I "..\..\src\expat\lib" /D "WIN32" /D "_LIB" /D "__WXMSW__" /D "_UNICODE" /D "WXBUILDING" /c\r
+# ADD BASE CPP /nologo /FD /MD /O2 /GR /EHsc /I "..\..\lib\vc_lib\mswu" /I "..\..\include" /W4 /Zi /Fd..\..\lib\vc_lib\wxmsw29u_propgrid.pdb /opt:ref /opt:icf /Yu"wx/wxprec.h" /Fp"vc_mswu\wxprec_propgridlib.pch" /I "..\..\src\tiff\libtiff" /I "..\..\src\jpeg" /I "..\..\src\png" /I "..\..\src\zlib" /I "..\..\src\regex" /I "..\..\src\expat\lib" /D "WIN32" /D "_LIB" /D "__WXMSW__" /D "_UNICODE" /D "WXBUILDING" /c\r
+# ADD CPP /nologo /FD /MD /O2 /GR /EHsc /I "..\..\lib\vc_lib\mswu" /I "..\..\include" /W4 /Zi /Fd..\..\lib\vc_lib\wxmsw29u_propgrid.pdb /opt:ref /opt:icf /Yu"wx/wxprec.h" /Fp"vc_mswu\wxprec_propgridlib.pch" /I "..\..\src\tiff\libtiff" /I "..\..\src\jpeg" /I "..\..\src\png" /I "..\..\src\zlib" /I "..\..\src\regex" /I "..\..\src\expat\lib" /D "WIN32" /D "_LIB" /D "__WXMSW__" /D "_UNICODE" /D "WXBUILDING" /c\r
  # ADD BASE RSC /l 0x409\r
  # ADD RSC /l 0x409\r
  BSC32=bscmake.exe\r
diff --git a/build/msw/wx_qa.dsp b/build/msw/wx_qa.dsp

index 14886c42c368c32d95cd61dc6c4757dd1a1d2783..7728b4554e3a5938e2287c05117fff6dccd2070e 100644 (file)
--- a/build/msw/wx_qa.dsp
+++ b/build/msw/wx_qa.dsp
@@ -47,8 +47,8 @@ RSC=rc.exe
  # PROP Output_Dir "..\..\lib\vc_dll"\r
  # PROP Intermediate_Dir "vc_mswunivudll\qa"\r
  # PROP Target_Dir ""\r
-# ADD BASE CPP /nologo /FD /MD /O2 /GR /EHsc /I "..\..\lib\vc_dll\mswunivu" /I "..\..\include" /W4 /Yu"wx/wxprec.h" /Fp"vc_mswunivudll\wxprec_qadll.pch" /Zi /Fd..\..\lib\vc_dll\wxmswuniv291u_qa_vc_custom.pdb /I "..\..\src\tiff\libtiff" /I "..\..\src\jpeg" /I "..\..\src\png" /I "..\..\src\zlib" /I "..\..\src\regex" /I "..\..\src\expat\lib" /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "WXBUILDING" /D "WXUSINGDLL" /D "WXMAKINGDLL_QA" /c\r
-# ADD CPP /nologo /FD /MD /O2 /GR /EHsc /I "..\..\lib\vc_dll\mswunivu" /I "..\..\include" /W4 /Yu"wx/wxprec.h" /Fp"vc_mswunivudll\wxprec_qadll.pch" /Zi /Fd..\..\lib\vc_dll\wxmswuniv291u_qa_vc_custom.pdb /I "..\..\src\tiff\libtiff" /I "..\..\src\jpeg" /I "..\..\src\png" /I "..\..\src\zlib" /I "..\..\src\regex" /I "..\..\src\expat\lib" /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "WXBUILDING" /D "WXUSINGDLL" /D "WXMAKINGDLL_QA" /c\r
+# ADD BASE CPP /nologo /FD /MD /O2 /GR /EHsc /I "..\..\lib\vc_dll\mswunivu" /I "..\..\include" /W4 /Yu"wx/wxprec.h" /Fp"vc_mswunivudll\wxprec_qadll.pch" /Zi /Fd..\..\lib\vc_dll\wxmswuniv291u_qa_vc_custom.pdb /opt:ref /opt:icf /I "..\..\src\tiff\libtiff" /I "..\..\src\jpeg" /I "..\..\src\png" /I "..\..\src\zlib" /I "..\..\src\regex" /I "..\..\src\expat\lib" /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "WXBUILDING" /D "WXUSINGDLL" /D "WXMAKINGDLL_QA" /c\r
+# ADD CPP /nologo /FD /MD /O2 /GR /EHsc /I "..\..\lib\vc_dll\mswunivu" /I "..\..\include" /W4 /Yu"wx/wxprec.h" /Fp"vc_mswunivudll\wxprec_qadll.pch" /Zi /Fd..\..\lib\vc_dll\wxmswuniv291u_qa_vc_custom.pdb /opt:ref /opt:icf /I "..\..\src\tiff\libtiff" /I "..\..\src\jpeg" /I "..\..\src\png" /I "..\..\src\zlib" /I "..\..\src\regex" /I "..\..\src\expat\lib" /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "WXBUILDING" /D "WXUSINGDLL" /D "WXMAKINGDLL_QA" /c\r
  # ADD BASE MTL /nologo /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "WXBUILDING" /D "WXUSINGDLL" /D "WXMAKINGDLL_QA" /mktyplib203 /win32\r
  # ADD MTL /nologo /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "WXBUILDING" /D "WXUSINGDLL" /D "WXMAKINGDLL_QA" /mktyplib203 /win32\r
  # ADD BASE RSC /l 0x409 /d "__WXMSW__" /d "__WXUNIVERSAL__" /d "_UNICODE" /i "..\..\lib\vc_dll\mswunivu" /i "..\..\include" /d "WXBUILDING" /d WXDLLNAME=wxmswuniv291u_qa_vc_custom /i "..\..\src\tiff\libtiff" /i "..\..\src\jpeg" /i "..\..\src\png" /i "..\..\src\zlib" /i "..\..\src\regex" /i "..\..\src\expat\lib" /d "WXUSINGDLL" /d WXMAKINGDLL_QA\r
@@ -97,8 +97,8 @@ LINK32=link.exe
  # PROP Output_Dir "..\..\lib\vc_dll"\r
  # PROP Intermediate_Dir "vc_mswudll\qa"\r
  # PROP Target_Dir ""\r
-# ADD BASE CPP /nologo /FD /MD /O2 /GR /EHsc /I "..\..\lib\vc_dll\mswu" /I "..\..\include" /W4 /Yu"wx/wxprec.h" /Fp"vc_mswudll\wxprec_qadll.pch" /Zi /Fd..\..\lib\vc_dll\wxmsw291u_qa_vc_custom.pdb /I "..\..\src\tiff\libtiff" /I "..\..\src\jpeg" /I "..\..\src\png" /I "..\..\src\zlib" /I "..\..\src\regex" /I "..\..\src\expat\lib" /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "__WXMSW__" /D "_UNICODE" /D "WXBUILDING" /D "WXUSINGDLL" /D "WXMAKINGDLL_QA" /c\r
-# ADD CPP /nologo /FD /MD /O2 /GR /EHsc /I "..\..\lib\vc_dll\mswu" /I "..\..\include" /W4 /Yu"wx/wxprec.h" /Fp"vc_mswudll\wxprec_qadll.pch" /Zi /Fd..\..\lib\vc_dll\wxmsw291u_qa_vc_custom.pdb /I "..\..\src\tiff\libtiff" /I "..\..\src\jpeg" /I "..\..\src\png" /I "..\..\src\zlib" /I "..\..\src\regex" /I "..\..\src\expat\lib" /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "__WXMSW__" /D "_UNICODE" /D "WXBUILDING" /D "WXUSINGDLL" /D "WXMAKINGDLL_QA" /c\r
+# ADD BASE CPP /nologo /FD /MD /O2 /GR /EHsc /I "..\..\lib\vc_dll\mswu" /I "..\..\include" /W4 /Yu"wx/wxprec.h" /Fp"vc_mswudll\wxprec_qadll.pch" /Zi /Fd..\..\lib\vc_dll\wxmsw291u_qa_vc_custom.pdb /opt:ref /opt:icf /I "..\..\src\tiff\libtiff" /I "..\..\src\jpeg" /I "..\..\src\png" /I "..\..\src\zlib" /I "..\..\src\regex" /I "..\..\src\expat\lib" /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "__WXMSW__" /D "_UNICODE" /D "WXBUILDING" /D "WXUSINGDLL" /D "WXMAKINGDLL_QA" /c\r
+# ADD CPP /nologo /FD /MD /O2 /GR /EHsc /I "..\..\lib\vc_dll\mswu" /I "..\..\include" /W4 /Yu"wx/wxprec.h" /Fp"vc_mswudll\wxprec_qadll.pch" /Zi /Fd..\..\lib\vc_dll\wxmsw291u_qa_vc_custom.pdb /opt:ref /opt:icf /I "..\..\src\tiff\libtiff" /I "..\..\src\jpeg" /I "..\..\src\png" /I "..\..\src\zlib" /I "..\..\src\regex" /I "..\..\src\expat\lib" /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "__WXMSW__" /D "_UNICODE" /D "WXBUILDING" /D "WXUSINGDLL" /D "WXMAKINGDLL_QA" /c\r
  # ADD BASE MTL /nologo /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "__WXMSW__" /D "_UNICODE" /D "WXBUILDING" /D "WXUSINGDLL" /D "WXMAKINGDLL_QA" /mktyplib203 /win32\r
  # ADD MTL /nologo /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "__WXMSW__" /D "_UNICODE" /D "WXBUILDING" /D "WXUSINGDLL" /D "WXMAKINGDLL_QA" /mktyplib203 /win32\r
  # ADD BASE RSC /l 0x409 /d "__WXMSW__" /d "_UNICODE" /i "..\..\lib\vc_dll\mswu" /i "..\..\include" /d "WXBUILDING" /d WXDLLNAME=wxmsw291u_qa_vc_custom /i "..\..\src\tiff\libtiff" /i "..\..\src\jpeg" /i "..\..\src\png" /i "..\..\src\zlib" /i "..\..\src\regex" /i "..\..\src\expat\lib" /d "WXUSINGDLL" /d WXMAKINGDLL_QA\r
@@ -147,8 +147,8 @@ LINK32=link.exe
  # PROP Output_Dir "..\..\lib\vc_lib"\r
  # PROP Intermediate_Dir "vc_mswunivu\qa"\r
  # PROP Target_Dir ""\r
-# ADD BASE CPP /nologo /FD /MD /O2 /GR /EHsc /I "..\..\lib\vc_lib\mswunivu" /I "..\..\include" /W4 /Zi /Fd..\..\lib\vc_lib\wxmswuniv29u_qa.pdb /Yu"wx/wxprec.h" /Fp"vc_mswunivu\wxprec_qalib.pch" /I "..\..\src\tiff\libtiff" /I "..\..\src\jpeg" /I "..\..\src\png" /I "..\..\src\zlib" /I "..\..\src\regex" /I "..\..\src\expat\lib" /D "WIN32" /D "_LIB" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "WXBUILDING" /c\r
-# ADD CPP /nologo /FD /MD /O2 /GR /EHsc /I "..\..\lib\vc_lib\mswunivu" /I "..\..\include" /W4 /Zi /Fd..\..\lib\vc_lib\wxmswuniv29u_qa.pdb /Yu"wx/wxprec.h" /Fp"vc_mswunivu\wxprec_qalib.pch" /I "..\..\src\tiff\libtiff" /I "..\..\src\jpeg" /I "..\..\src\png" /I "..\..\src\zlib" /I "..\..\src\regex" /I "..\..\src\expat\lib" /D "WIN32" /D "_LIB" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "WXBUILDING" /c\r
+# ADD BASE CPP /nologo /FD /MD /O2 /GR /EHsc /I "..\..\lib\vc_lib\mswunivu" /I "..\..\include" /W4 /Zi /Fd..\..\lib\vc_lib\wxmswuniv29u_qa.pdb /opt:ref /opt:icf /Yu"wx/wxprec.h" /Fp"vc_mswunivu\wxprec_qalib.pch" /I "..\..\src\tiff\libtiff" /I "..\..\src\jpeg" /I "..\..\src\png" /I "..\..\src\zlib" /I "..\..\src\regex" /I "..\..\src\expat\lib" /D "WIN32" /D "_LIB" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "WXBUILDING" /c\r
+# ADD CPP /nologo /FD /MD /O2 /GR /EHsc /I "..\..\lib\vc_lib\mswunivu" /I "..\..\include" /W4 /Zi /Fd..\..\lib\vc_lib\wxmswuniv29u_qa.pdb /opt:ref /opt:icf /Yu"wx/wxprec.h" /Fp"vc_mswunivu\wxprec_qalib.pch" /I "..\..\src\tiff\libtiff" /I "..\..\src\jpeg" /I "..\..\src\png" /I "..\..\src\zlib" /I "..\..\src\regex" /I "..\..\src\expat\lib" /D "WIN32" /D "_LIB" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "WXBUILDING" /c\r
  # ADD BASE RSC /l 0x409\r
  # ADD RSC /l 0x409\r
  BSC32=bscmake.exe\r
@@ -193,8 +193,8 @@ LIB32=link.exe -lib
  # PROP Output_Dir "..\..\lib\vc_lib"\r
  # PROP Intermediate_Dir "vc_mswu\qa"\r
  # PROP Target_Dir ""\r
-# ADD BASE CPP /nologo /FD /MD /O2 /GR /EHsc /I "..\..\lib\vc_lib\mswu" /I "..\..\include" /W4 /Zi /Fd..\..\lib\vc_lib\wxmsw29u_qa.pdb /Yu"wx/wxprec.h" /Fp"vc_mswu\wxprec_qalib.pch" /I "..\..\src\tiff\libtiff" /I "..\..\src\jpeg" /I "..\..\src\png" /I "..\..\src\zlib" /I "..\..\src\regex" /I "..\..\src\expat\lib" /D "WIN32" /D "_LIB" /D "__WXMSW__" /D "_UNICODE" /D "WXBUILDING" /c\r
-# ADD CPP /nologo /FD /MD /O2 /GR /EHsc /I "..\..\lib\vc_lib\mswu" /I "..\..\include" /W4 /Zi /Fd..\..\lib\vc_lib\wxmsw29u_qa.pdb /Yu"wx/wxprec.h" /Fp"vc_mswu\wxprec_qalib.pch" /I "..\..\src\tiff\libtiff" /I "..\..\src\jpeg" /I "..\..\src\png" /I "..\..\src\zlib" /I "..\..\src\regex" /I "..\..\src\expat\lib" /D "WIN32" /D "_LIB" /D "__WXMSW__" /D "_UNICODE" /D "WXBUILDING" /c\r
+# ADD BASE CPP /nologo /FD /MD /O2 /GR /EHsc /I "..\..\lib\vc_lib\mswu" /I "..\..\include" /W4 /Zi /Fd..\..\lib\vc_lib\wxmsw29u_qa.pdb /opt:ref /opt:icf /Yu"wx/wxprec.h" /Fp"vc_mswu\wxprec_qalib.pch" /I "..\..\src\tiff\libtiff" /I "..\..\src\jpeg" /I "..\..\src\png" /I "..\..\src\zlib" /I "..\..\src\regex" /I "..\..\src\expat\lib" /D "WIN32" /D "_LIB" /D "__WXMSW__" /D "_UNICODE" /D "WXBUILDING" /c\r
+# ADD CPP /nologo /FD /MD /O2 /GR /EHsc /I "..\..\lib\vc_lib\mswu" /I "..\..\include" /W4 /Zi /Fd..\..\lib\vc_lib\wxmsw29u_qa.pdb /opt:ref /opt:icf /Yu"wx/wxprec.h" /Fp"vc_mswu\wxprec_qalib.pch" /I "..\..\src\tiff\libtiff" /I "..\..\src\jpeg" /I "..\..\src\png" /I "..\..\src\zlib" /I "..\..\src\regex" /I "..\..\src\expat\lib" /D "WIN32" /D "_LIB" /D "__WXMSW__" /D "_UNICODE" /D "WXBUILDING" /c\r
  # ADD BASE RSC /l 0x409\r
  # ADD RSC /l 0x409\r
  BSC32=bscmake.exe\r
diff --git a/build/msw/wx_ribbon.dsp b/build/msw/wx_ribbon.dsp

index e605682d4832dc928cbc9483294eb74f6626bbef..d8e7facafbcb245e63023607429781b8c3a425b9 100644 (file)
--- a/build/msw/wx_ribbon.dsp
+++ b/build/msw/wx_ribbon.dsp
@@ -47,8 +47,8 @@ RSC=rc.exe
  # PROP Output_Dir "..\..\lib\vc_dll"\r
  # PROP Intermediate_Dir "vc_mswunivudll\ribbon"\r
  # PROP Target_Dir ""\r
-# ADD BASE CPP /nologo /FD /MD /O2 /GR /EHsc /I "..\..\lib\vc_dll\mswunivu" /I "..\..\include" /W4 /Yu"wx/wxprec.h" /Fp"vc_mswunivudll\wxprec_ribbondll.pch" /Zi /Fd..\..\lib\vc_dll\wxmswuniv291u_ribbon_vc_custom.pdb /I "..\..\src\tiff\libtiff" /I "..\..\src\jpeg" /I "..\..\src\png" /I "..\..\src\zlib" /I "..\..\src\regex" /I "..\..\src\expat\lib" /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "WXBUILDING" /D "WXUSINGDLL" /D "WXMAKINGDLL_RIBBON" /c\r
-# ADD CPP /nologo /FD /MD /O2 /GR /EHsc /I "..\..\lib\vc_dll\mswunivu" /I "..\..\include" /W4 /Yu"wx/wxprec.h" /Fp"vc_mswunivudll\wxprec_ribbondll.pch" /Zi /Fd..\..\lib\vc_dll\wxmswuniv291u_ribbon_vc_custom.pdb /I "..\..\src\tiff\libtiff" /I "..\..\src\jpeg" /I "..\..\src\png" /I "..\..\src\zlib" /I "..\..\src\regex" /I "..\..\src\expat\lib" /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "WXBUILDING" /D "WXUSINGDLL" /D "WXMAKINGDLL_RIBBON" /c\r
+# ADD BASE CPP /nologo /FD /MD /O2 /GR /EHsc /I "..\..\lib\vc_dll\mswunivu" /I "..\..\include" /W4 /Yu"wx/wxprec.h" /Fp"vc_mswunivudll\wxprec_ribbondll.pch" /Zi /Fd..\..\lib\vc_dll\wxmswuniv291u_ribbon_vc_custom.pdb /opt:ref /opt:icf /I "..\..\src\tiff\libtiff" /I "..\..\src\jpeg" /I "..\..\src\png" /I "..\..\src\zlib" /I "..\..\src\regex" /I "..\..\src\expat\lib" /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "WXBUILDING" /D "WXUSINGDLL" /D "WXMAKINGDLL_RIBBON" /c\r
+# ADD CPP /nologo /FD /MD /O2 /GR /EHsc /I "..\..\lib\vc_dll\mswunivu" /I "..\..\include" /W4 /Yu"wx/wxprec.h" /Fp"vc_mswunivudll\wxprec_ribbondll.pch" /Zi /Fd..\..\lib\vc_dll\wxmswuniv291u_ribbon_vc_custom.pdb /opt:ref /opt:icf /I "..\..\src\tiff\libtiff" /I "..\..\src\jpeg" /I "..\..\src\png" /I "..\..\src\zlib" /I "..\..\src\regex" /I "..\..\src\expat\lib" /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "WXBUILDING" /D "WXUSINGDLL" /D "WXMAKINGDLL_RIBBON" /c\r
  # ADD BASE MTL /nologo /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "WXBUILDING" /D "WXUSINGDLL" /D "WXMAKINGDLL_RIBBON" /mktyplib203 /win32\r
  # ADD MTL /nologo /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "WXBUILDING" /D "WXUSINGDLL" /D "WXMAKINGDLL_RIBBON" /mktyplib203 /win32\r
  # ADD BASE RSC /l 0x409 /d "__WXMSW__" /d "__WXUNIVERSAL__" /d "_UNICODE" /i "..\..\lib\vc_dll\mswunivu" /i "..\..\include" /d "WXBUILDING" /d WXDLLNAME=wxmswuniv291u_ribbon_vc_custom /i "..\..\src\tiff\libtiff" /i "..\..\src\jpeg" /i "..\..\src\png" /i "..\..\src\zlib" /i "..\..\src\regex" /i "..\..\src\expat\lib" /d "WXUSINGDLL" /d WXMAKINGDLL_RIBBON\r
@@ -97,8 +97,8 @@ LINK32=link.exe
  # PROP Output_Dir "..\..\lib\vc_dll"\r
  # PROP Intermediate_Dir "vc_mswudll\ribbon"\r
  # PROP Target_Dir ""\r
-# ADD BASE CPP /nologo /FD /MD /O2 /GR /EHsc /I "..\..\lib\vc_dll\mswu" /I "..\..\include" /W4 /Yu"wx/wxprec.h" /Fp"vc_mswudll\wxprec_ribbondll.pch" /Zi /Fd..\..\lib\vc_dll\wxmsw291u_ribbon_vc_custom.pdb /I "..\..\src\tiff\libtiff" /I "..\..\src\jpeg" /I "..\..\src\png" /I "..\..\src\zlib" /I "..\..\src\regex" /I "..\..\src\expat\lib" /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "__WXMSW__" /D "_UNICODE" /D "WXBUILDING" /D "WXUSINGDLL" /D "WXMAKINGDLL_RIBBON" /c\r
-# ADD CPP /nologo /FD /MD /O2 /GR /EHsc /I "..\..\lib\vc_dll\mswu" /I "..\..\include" /W4 /Yu"wx/wxprec.h" /Fp"vc_mswudll\wxprec_ribbondll.pch" /Zi /Fd..\..\lib\vc_dll\wxmsw291u_ribbon_vc_custom.pdb /I "..\..\src\tiff\libtiff" /I "..\..\src\jpeg" /I "..\..\src\png" /I "..\..\src\zlib" /I "..\..\src\regex" /I "..\..\src\expat\lib" /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "__WXMSW__" /D "_UNICODE" /D "WXBUILDING" /D "WXUSINGDLL" /D "WXMAKINGDLL_RIBBON" /c\r
+# ADD BASE CPP /nologo /FD /MD /O2 /GR /EHsc /I "..\..\lib\vc_dll\mswu" /I "..\..\include" /W4 /Yu"wx/wxprec.h" /Fp"vc_mswudll\wxprec_ribbondll.pch" /Zi /Fd..\..\lib\vc_dll\wxmsw291u_ribbon_vc_custom.pdb /opt:ref /opt:icf /I "..\..\src\tiff\libtiff" /I "..\..\src\jpeg" /I "..\..\src\png" /I "..\..\src\zlib" /I "..\..\src\regex" /I "..\..\src\expat\lib" /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "__WXMSW__" /D "_UNICODE" /D "WXBUILDING" /D "WXUSINGDLL" /D "WXMAKINGDLL_RIBBON" /c\r
+# ADD CPP /nologo /FD /MD /O2 /GR /EHsc /I "..\..\lib\vc_dll\mswu" /I "..\..\include" /W4 /Yu"wx/wxprec.h" /Fp"vc_mswudll\wxprec_ribbondll.pch" /Zi /Fd..\..\lib\vc_dll\wxmsw291u_ribbon_vc_custom.pdb /opt:ref /opt:icf /I "..\..\src\tiff\libtiff" /I "..\..\src\jpeg" /I "..\..\src\png" /I "..\..\src\zlib" /I "..\..\src\regex" /I "..\..\src\expat\lib" /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "__WXMSW__" /D "_UNICODE" /D "WXBUILDING" /D "WXUSINGDLL" /D "WXMAKINGDLL_RIBBON" /c\r
  # ADD BASE MTL /nologo /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "__WXMSW__" /D "_UNICODE" /D "WXBUILDING" /D "WXUSINGDLL" /D "WXMAKINGDLL_RIBBON" /mktyplib203 /win32\r
  # ADD MTL /nologo /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "__WXMSW__" /D "_UNICODE" /D "WXBUILDING" /D "WXUSINGDLL" /D "WXMAKINGDLL_RIBBON" /mktyplib203 /win32\r
  # ADD BASE RSC /l 0x409 /d "__WXMSW__" /d "_UNICODE" /i "..\..\lib\vc_dll\mswu" /i "..\..\include" /d "WXBUILDING" /d WXDLLNAME=wxmsw291u_ribbon_vc_custom /i "..\..\src\tiff\libtiff" /i "..\..\src\jpeg" /i "..\..\src\png" /i "..\..\src\zlib" /i "..\..\src\regex" /i "..\..\src\expat\lib" /d "WXUSINGDLL" /d WXMAKINGDLL_RIBBON\r
@@ -147,8 +147,8 @@ LINK32=link.exe
  # PROP Output_Dir "..\..\lib\vc_lib"\r
  # PROP Intermediate_Dir "vc_mswunivu\ribbon"\r
  # PROP Target_Dir ""\r
-# ADD BASE CPP /nologo /FD /MD /O2 /GR /EHsc /I "..\..\lib\vc_lib\mswunivu" /I "..\..\include" /W4 /Zi /Fd..\..\lib\vc_lib\wxmswuniv29u_ribbon.pdb /Yu"wx/wxprec.h" /Fp"vc_mswunivu\wxprec_ribbonlib.pch" /I "..\..\src\tiff\libtiff" /I "..\..\src\jpeg" /I "..\..\src\png" /I "..\..\src\zlib" /I "..\..\src\regex" /I "..\..\src\expat\lib" /D "WIN32" /D "_LIB" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "WXBUILDING" /c\r
-# ADD CPP /nologo /FD /MD /O2 /GR /EHsc /I "..\..\lib\vc_lib\mswunivu" /I "..\..\include" /W4 /Zi /Fd..\..\lib\vc_lib\wxmswuniv29u_ribbon.pdb /Yu"wx/wxprec.h" /Fp"vc_mswunivu\wxprec_ribbonlib.pch" /I "..\..\src\tiff\libtiff" /I "..\..\src\jpeg" /I "..\..\src\png" /I "..\..\src\zlib" /I "..\..\src\regex" /I "..\..\src\expat\lib" /D "WIN32" /D "_LIB" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "WXBUILDING" /c\r
+# ADD BASE CPP /nologo /FD /MD /O2 /GR /EHsc /I "..\..\lib\vc_lib\mswunivu" /I "..\..\include" /W4 /Zi /Fd..\..\lib\vc_lib\wxmswuniv29u_ribbon.pdb /opt:ref /opt:icf /Yu"wx/wxprec.h" /Fp"vc_mswunivu\wxprec_ribbonlib.pch" /I "..\..\src\tiff\libtiff" /I "..\..\src\jpeg" /I "..\..\src\png" /I "..\..\src\zlib" /I "..\..\src\regex" /I "..\..\src\expat\lib" /D "WIN32" /D "_LIB" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "WXBUILDING" /c\r
+# ADD CPP /nologo /FD /MD /O2 /GR /EHsc /I "..\..\lib\vc_lib\mswunivu" /I "..\..\include" /W4 /Zi /Fd..\..\lib\vc_lib\wxmswuniv29u_ribbon.pdb /opt:ref /opt:icf /Yu"wx/wxprec.h" /Fp"vc_mswunivu\wxprec_ribbonlib.pch" /I "..\..\src\tiff\libtiff" /I "..\..\src\jpeg" /I "..\..\src\png" /I "..\..\src\zlib" /I "..\..\src\regex" /I "..\..\src\expat\lib" /D "WIN32" /D "_LIB" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "WXBUILDING" /c\r
  # ADD BASE RSC /l 0x409\r
  # ADD RSC /l 0x409\r
  BSC32=bscmake.exe\r
@@ -193,8 +193,8 @@ LIB32=link.exe -lib
  # PROP Output_Dir "..\..\lib\vc_lib"\r
  # PROP Intermediate_Dir "vc_mswu\ribbon"\r
  # PROP Target_Dir ""\r
-# ADD BASE CPP /nologo /FD /MD /O2 /GR /EHsc /I "..\..\lib\vc_lib\mswu" /I "..\..\include" /W4 /Zi /Fd..\..\lib\vc_lib\wxmsw29u_ribbon.pdb /Yu"wx/wxprec.h" /Fp"vc_mswu\wxprec_ribbonlib.pch" /I "..\..\src\tiff\libtiff" /I "..\..\src\jpeg" /I "..\..\src\png" /I "..\..\src\zlib" /I "..\..\src\regex" /I "..\..\src\expat\lib" /D "WIN32" /D "_LIB" /D "__WXMSW__" /D "_UNICODE" /D "WXBUILDING" /c\r
-# ADD CPP /nologo /FD /MD /O2 /GR /EHsc /I "..\..\lib\vc_lib\mswu" /I "..\..\include" /W4 /Zi /Fd..\..\lib\vc_lib\wxmsw29u_ribbon.pdb /Yu"wx/wxprec.h" /Fp"vc_mswu\wxprec_ribbonlib.pch" /I "..\..\src\tiff\libtiff" /I "..\..\src\jpeg" /I "..\..\src\png" /I "..\..\src\zlib" /I "..\..\src\regex" /I "..\..\src\expat\lib" /D "WIN32" /D "_LIB" /D "__WXMSW__" /D "_UNICODE" /D "WXBUILDING" /c\r
+# ADD BASE CPP /nologo /FD /MD /O2 /GR /EHsc /I "..\..\lib\vc_lib\mswu" /I "..\..\include" /W4 /Zi /Fd..\..\lib\vc_lib\wxmsw29u_ribbon.pdb /opt:ref /opt:icf /Yu"wx/wxprec.h" /Fp"vc_mswu\wxprec_ribbonlib.pch" /I "..\..\src\tiff\libtiff" /I "..\..\src\jpeg" /I "..\..\src\png" /I "..\..\src\zlib" /I "..\..\src\regex" /I "..\..\src\expat\lib" /D "WIN32" /D "_LIB" /D "__WXMSW__" /D "_UNICODE" /D "WXBUILDING" /c\r
+# ADD CPP /nologo /FD /MD /O2 /GR /EHsc /I "..\..\lib\vc_lib\mswu" /I "..\..\include" /W4 /Zi /Fd..\..\lib\vc_lib\wxmsw29u_ribbon.pdb /opt:ref /opt:icf /Yu"wx/wxprec.h" /Fp"vc_mswu\wxprec_ribbonlib.pch" /I "..\..\src\tiff\libtiff" /I "..\..\src\jpeg" /I "..\..\src\png" /I "..\..\src\zlib" /I "..\..\src\regex" /I "..\..\src\expat\lib" /D "WIN32" /D "_LIB" /D "__WXMSW__" /D "_UNICODE" /D "WXBUILDING" /c\r
  # ADD BASE RSC /l 0x409\r
  # ADD RSC /l 0x409\r
  BSC32=bscmake.exe\r
diff --git a/build/msw/wx_richtext.dsp b/build/msw/wx_richtext.dsp

index a2e12e89872f06ccfee98ff77dab5eeff5ee87c7..a8d6956535a45430d343ee2080826d3a89b2aed9 100644 (file)
--- a/build/msw/wx_richtext.dsp
+++ b/build/msw/wx_richtext.dsp
@@ -47,8 +47,8 @@ RSC=rc.exe
  # PROP Output_Dir "..\..\lib\vc_dll"\r
  # PROP Intermediate_Dir "vc_mswunivudll\richtext"\r
  # PROP Target_Dir ""\r
-# ADD BASE CPP /nologo /FD /MD /O2 /GR /EHsc /I "..\..\lib\vc_dll\mswunivu" /I "..\..\include" /W4 /Yu"wx/wxprec.h" /Fp"vc_mswunivudll\wxprec_richtextdll.pch" /Zi /Fd..\..\lib\vc_dll\wxmswuniv291u_richtext_vc_custom.pdb /I "..\..\src\tiff\libtiff" /I "..\..\src\jpeg" /I "..\..\src\png" /I "..\..\src\zlib" /I "..\..\src\regex" /I "..\..\src\expat\lib" /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "WXBUILDING" /D "WXUSINGDLL" /D "WXMAKINGDLL_RICHTEXT" /c\r
-# ADD CPP /nologo /FD /MD /O2 /GR /EHsc /I "..\..\lib\vc_dll\mswunivu" /I "..\..\include" /W4 /Yu"wx/wxprec.h" /Fp"vc_mswunivudll\wxprec_richtextdll.pch" /Zi /Fd..\..\lib\vc_dll\wxmswuniv291u_richtext_vc_custom.pdb /I "..\..\src\tiff\libtiff" /I "..\..\src\jpeg" /I "..\..\src\png" /I "..\..\src\zlib" /I "..\..\src\regex" /I "..\..\src\expat\lib" /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "WXBUILDING" /D "WXUSINGDLL" /D "WXMAKINGDLL_RICHTEXT" /c\r
+# ADD BASE CPP /nologo /FD /MD /O2 /GR /EHsc /I "..\..\lib\vc_dll\mswunivu" /I "..\..\include" /W4 /Yu"wx/wxprec.h" /Fp"vc_mswunivudll\wxprec_richtextdll.pch" /Zi /Fd..\..\lib\vc_dll\wxmswuniv291u_richtext_vc_custom.pdb /opt:ref /opt:icf /I "..\..\src\tiff\libtiff" /I "..\..\src\jpeg" /I "..\..\src\png" /I "..\..\src\zlib" /I "..\..\src\regex" /I "..\..\src\expat\lib" /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "WXBUILDING" /D "WXUSINGDLL" /D "WXMAKINGDLL_RICHTEXT" /c\r
+# ADD CPP /nologo /FD /MD /O2 /GR /EHsc /I "..\..\lib\vc_dll\mswunivu" /I "..\..\include" /W4 /Yu"wx/wxprec.h" /Fp"vc_mswunivudll\wxprec_richtextdll.pch" /Zi /Fd..\..\lib\vc_dll\wxmswuniv291u_richtext_vc_custom.pdb /opt:ref /opt:icf /I "..\..\src\tiff\libtiff" /I "..\..\src\jpeg" /I "..\..\src\png" /I "..\..\src\zlib" /I "..\..\src\regex" /I "..\..\src\expat\lib" /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "WXBUILDING" /D "WXUSINGDLL" /D "WXMAKINGDLL_RICHTEXT" /c\r
  # ADD BASE MTL /nologo /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "WXBUILDING" /D "WXUSINGDLL" /D "WXMAKINGDLL_RICHTEXT" /mktyplib203 /win32\r
  # ADD MTL /nologo /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "WXBUILDING" /D "WXUSINGDLL" /D "WXMAKINGDLL_RICHTEXT" /mktyplib203 /win32\r
  # ADD BASE RSC /l 0x409 /d "__WXMSW__" /d "__WXUNIVERSAL__" /d "_UNICODE" /i "..\..\lib\vc_dll\mswunivu" /i "..\..\include" /d "WXBUILDING" /d WXDLLNAME=wxmswuniv291u_richtext_vc_custom /i "..\..\src\tiff\libtiff" /i "..\..\src\jpeg" /i "..\..\src\png" /i "..\..\src\zlib" /i "..\..\src\regex" /i "..\..\src\expat\lib" /d "WXUSINGDLL" /d WXMAKINGDLL_RICHTEXT\r
@@ -97,8 +97,8 @@ LINK32=link.exe
  # PROP Output_Dir "..\..\lib\vc_dll"\r
  # PROP Intermediate_Dir "vc_mswudll\richtext"\r
  # PROP Target_Dir ""\r
-# ADD BASE CPP /nologo /FD /MD /O2 /GR /EHsc /I "..\..\lib\vc_dll\mswu" /I "..\..\include" /W4 /Yu"wx/wxprec.h" /Fp"vc_mswudll\wxprec_richtextdll.pch" /Zi /Fd..\..\lib\vc_dll\wxmsw291u_richtext_vc_custom.pdb /I "..\..\src\tiff\libtiff" /I "..\..\src\jpeg" /I "..\..\src\png" /I "..\..\src\zlib" /I "..\..\src\regex" /I "..\..\src\expat\lib" /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "__WXMSW__" /D "_UNICODE" /D "WXBUILDING" /D "WXUSINGDLL" /D "WXMAKINGDLL_RICHTEXT" /c\r
-# ADD CPP /nologo /FD /MD /O2 /GR /EHsc /I "..\..\lib\vc_dll\mswu" /I "..\..\include" /W4 /Yu"wx/wxprec.h" /Fp"vc_mswudll\wxprec_richtextdll.pch" /Zi /Fd..\..\lib\vc_dll\wxmsw291u_richtext_vc_custom.pdb /I "..\..\src\tiff\libtiff" /I "..\..\src\jpeg" /I "..\..\src\png" /I "..\..\src\zlib" /I "..\..\src\regex" /I "..\..\src\expat\lib" /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "__WXMSW__" /D "_UNICODE" /D "WXBUILDING" /D "WXUSINGDLL" /D "WXMAKINGDLL_RICHTEXT" /c\r
+# ADD BASE CPP /nologo /FD /MD /O2 /GR /EHsc /I "..\..\lib\vc_dll\mswu" /I "..\..\include" /W4 /Yu"wx/wxprec.h" /Fp"vc_mswudll\wxprec_richtextdll.pch" /Zi /Fd..\..\lib\vc_dll\wxmsw291u_richtext_vc_custom.pdb /opt:ref /opt:icf /I "..\..\src\tiff\libtiff" /I "..\..\src\jpeg" /I "..\..\src\png" /I "..\..\src\zlib" /I "..\..\src\regex" /I "..\..\src\expat\lib" /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "__WXMSW__" /D "_UNICODE" /D "WXBUILDING" /D "WXUSINGDLL" /D "WXMAKINGDLL_RICHTEXT" /c\r
+# ADD CPP /nologo /FD /MD /O2 /GR /EHsc /I "..\..\lib\vc_dll\mswu" /I "..\..\include" /W4 /Yu"wx/wxprec.h" /Fp"vc_mswudll\wxprec_richtextdll.pch" /Zi /Fd..\..\lib\vc_dll\wxmsw291u_richtext_vc_custom.pdb /opt:ref /opt:icf /I "..\..\src\tiff\libtiff" /I "..\..\src\jpeg" /I "..\..\src\png" /I "..\..\src\zlib" /I "..\..\src\regex" /I "..\..\src\expat\lib" /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "__WXMSW__" /D "_UNICODE" /D "WXBUILDING" /D "WXUSINGDLL" /D "WXMAKINGDLL_RICHTEXT" /c\r
  # ADD BASE MTL /nologo /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "__WXMSW__" /D "_UNICODE" /D "WXBUILDING" /D "WXUSINGDLL" /D "WXMAKINGDLL_RICHTEXT" /mktyplib203 /win32\r
  # ADD MTL /nologo /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "__WXMSW__" /D "_UNICODE" /D "WXBUILDING" /D "WXUSINGDLL" /D "WXMAKINGDLL_RICHTEXT" /mktyplib203 /win32\r
  # ADD BASE RSC /l 0x409 /d "__WXMSW__" /d "_UNICODE" /i "..\..\lib\vc_dll\mswu" /i "..\..\include" /d "WXBUILDING" /d WXDLLNAME=wxmsw291u_richtext_vc_custom /i "..\..\src\tiff\libtiff" /i "..\..\src\jpeg" /i "..\..\src\png" /i "..\..\src\zlib" /i "..\..\src\regex" /i "..\..\src\expat\lib" /d "WXUSINGDLL" /d WXMAKINGDLL_RICHTEXT\r
@@ -147,8 +147,8 @@ LINK32=link.exe
  # PROP Output_Dir "..\..\lib\vc_lib"\r
  # PROP Intermediate_Dir "vc_mswunivu\richtext"\r
  # PROP Target_Dir ""\r
-# ADD BASE CPP /nologo /FD /MD /O2 /GR /EHsc /I "..\..\lib\vc_lib\mswunivu" /I "..\..\include" /W4 /Zi /Fd..\..\lib\vc_lib\wxmswuniv29u_richtext.pdb /Yu"wx/wxprec.h" /Fp"vc_mswunivu\wxprec_richtextlib.pch" /I "..\..\src\tiff\libtiff" /I "..\..\src\jpeg" /I "..\..\src\png" /I "..\..\src\zlib" /I "..\..\src\regex" /I "..\..\src\expat\lib" /D "WIN32" /D "_LIB" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "WXBUILDING" /c\r
-# ADD CPP /nologo /FD /MD /O2 /GR /EHsc /I "..\..\lib\vc_lib\mswunivu" /I "..\..\include" /W4 /Zi /Fd..\..\lib\vc_lib\wxmswuniv29u_richtext.pdb /Yu"wx/wxprec.h" /Fp"vc_mswunivu\wxprec_richtextlib.pch" /I "..\..\src\tiff\libtiff" /I "..\..\src\jpeg" /I "..\..\src\png" /I "..\..\src\zlib" /I "..\..\src\regex" /I "..\..\src\expat\lib" /D "WIN32" /D "_LIB" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "WXBUILDING" /c\r
+# ADD BASE CPP /nologo /FD /MD /O2 /GR /EHsc /I "..\..\lib\vc_lib\mswunivu" /I "..\..\include" /W4 /Zi /Fd..\..\lib\vc_lib\wxmswuniv29u_richtext.pdb /opt:ref /opt:icf /Yu"wx/wxprec.h" /Fp"vc_mswunivu\wxprec_richtextlib.pch" /I "..\..\src\tiff\libtiff" /I "..\..\src\jpeg" /I "..\..\src\png" /I "..\..\src\zlib" /I "..\..\src\regex" /I "..\..\src\expat\lib" /D "WIN32" /D "_LIB" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "WXBUILDING" /c\r
+# ADD CPP /nologo /FD /MD /O2 /GR /EHsc /I "..\..\lib\vc_lib\mswunivu" /I "..\..\include" /W4 /Zi /Fd..\..\lib\vc_lib\wxmswuniv29u_richtext.pdb /opt:ref /opt:icf /Yu"wx/wxprec.h" /Fp"vc_mswunivu\wxprec_richtextlib.pch" /I "..\..\src\tiff\libtiff" /I "..\..\src\jpeg" /I "..\..\src\png" /I "..\..\src\zlib" /I "..\..\src\regex" /I "..\..\src\expat\lib" /D "WIN32" /D "_LIB" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "WXBUILDING" /c\r
  # ADD BASE RSC /l 0x409\r
  # ADD RSC /l 0x409\r
  BSC32=bscmake.exe\r
@@ -193,8 +193,8 @@ LIB32=link.exe -lib
  # PROP Output_Dir "..\..\lib\vc_lib"\r
  # PROP Intermediate_Dir "vc_mswu\richtext"\r
  # PROP Target_Dir ""\r
-# ADD BASE CPP /nologo /FD /MD /O2 /GR /EHsc /I "..\..\lib\vc_lib\mswu" /I "..\..\include" /W4 /Zi /Fd..\..\lib\vc_lib\wxmsw29u_richtext.pdb /Yu"wx/wxprec.h" /Fp"vc_mswu\wxprec_richtextlib.pch" /I "..\..\src\tiff\libtiff" /I "..\..\src\jpeg" /I "..\..\src\png" /I "..\..\src\zlib" /I "..\..\src\regex" /I "..\..\src\expat\lib" /D "WIN32" /D "_LIB" /D "__WXMSW__" /D "_UNICODE" /D "WXBUILDING" /c\r
-# ADD CPP /nologo /FD /MD /O2 /GR /EHsc /I "..\..\lib\vc_lib\mswu" /I "..\..\include" /W4 /Zi /Fd..\..\lib\vc_lib\wxmsw29u_richtext.pdb /Yu"wx/wxprec.h" /Fp"vc_mswu\wxprec_richtextlib.pch" /I "..\..\src\tiff\libtiff" /I "..\..\src\jpeg" /I "..\..\src\png" /I "..\..\src\zlib" /I "..\..\src\regex" /I "..\..\src\expat\lib" /D "WIN32" /D "_LIB" /D "__WXMSW__" /D "_UNICODE" /D "WXBUILDING" /c\r
+# ADD BASE CPP /nologo /FD /MD /O2 /GR /EHsc /I "..\..\lib\vc_lib\mswu" /I "..\..\include" /W4 /Zi /Fd..\..\lib\vc_lib\wxmsw29u_richtext.pdb /opt:ref /opt:icf /Yu"wx/wxprec.h" /Fp"vc_mswu\wxprec_richtextlib.pch" /I "..\..\src\tiff\libtiff" /I "..\..\src\jpeg" /I "..\..\src\png" /I "..\..\src\zlib" /I "..\..\src\regex" /I "..\..\src\expat\lib" /D "WIN32" /D "_LIB" /D "__WXMSW__" /D "_UNICODE" /D "WXBUILDING" /c\r
+# ADD CPP /nologo /FD /MD /O2 /GR /EHsc /I "..\..\lib\vc_lib\mswu" /I "..\..\include" /W4 /Zi /Fd..\..\lib\vc_lib\wxmsw29u_richtext.pdb /opt:ref /opt:icf /Yu"wx/wxprec.h" /Fp"vc_mswu\wxprec_richtextlib.pch" /I "..\..\src\tiff\libtiff" /I "..\..\src\jpeg" /I "..\..\src\png" /I "..\..\src\zlib" /I "..\..\src\regex" /I "..\..\src\expat\lib" /D "WIN32" /D "_LIB" /D "__WXMSW__" /D "_UNICODE" /D "WXBUILDING" /c\r
  # ADD BASE RSC /l 0x409\r
  # ADD RSC /l 0x409\r
  BSC32=bscmake.exe\r
diff --git a/build/msw/wx_stc.dsp b/build/msw/wx_stc.dsp

index 8011ca994921c24da2598a92dde6722d544aae88..fde2c9e8df02ac3cfdf1d357796055bca0744b21 100644 (file)
--- a/build/msw/wx_stc.dsp
+++ b/build/msw/wx_stc.dsp
@@ -47,8 +47,8 @@ RSC=rc.exe
  # PROP Output_Dir "..\..\lib\vc_dll"\r
  # PROP Intermediate_Dir "vc_mswunivudll\stc"\r
  # PROP Target_Dir ""\r
-# ADD BASE CPP /nologo /FD /MD /O2 /GR /EHsc /I "..\..\lib\vc_dll\mswunivu" /I "..\..\include" /W4 /Yu"wx/wxprec.h" /Fp"vc_mswunivudll\wxprec_stcdll.pch" /Zi /Fd..\..\lib\vc_dll\wxmswuniv291u_stc_vc_custom.pdb /I "..\..\src\tiff\libtiff" /I "..\..\src\jpeg" /I "..\..\src\png" /I "..\..\src\zlib" /I "..\..\src\regex" /I "..\..\src\expat\lib" /I "..\..\src\stc\scintilla\include" /I "..\..\src\stc\scintilla\src" /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "WXBUILDING" /D "__WX__" /D "SCI_LEXER" /D "LINK_LEXERS" /D "WXUSINGDLL" /D "WXMAKINGDLL_STC" /c\r
-# ADD CPP /nologo /FD /MD /O2 /GR /EHsc /I "..\..\lib\vc_dll\mswunivu" /I "..\..\include" /W4 /Yu"wx/wxprec.h" /Fp"vc_mswunivudll\wxprec_stcdll.pch" /Zi /Fd..\..\lib\vc_dll\wxmswuniv291u_stc_vc_custom.pdb /I "..\..\src\tiff\libtiff" /I "..\..\src\jpeg" /I "..\..\src\png" /I "..\..\src\zlib" /I "..\..\src\regex" /I "..\..\src\expat\lib" /I "..\..\src\stc\scintilla\include" /I "..\..\src\stc\scintilla\src" /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "WXBUILDING" /D "__WX__" /D "SCI_LEXER" /D "LINK_LEXERS" /D "WXUSINGDLL" /D "WXMAKINGDLL_STC" /c\r
+# ADD BASE CPP /nologo /FD /MD /O2 /GR /EHsc /I "..\..\lib\vc_dll\mswunivu" /I "..\..\include" /W4 /Yu"wx/wxprec.h" /Fp"vc_mswunivudll\wxprec_stcdll.pch" /Zi /Fd..\..\lib\vc_dll\wxmswuniv291u_stc_vc_custom.pdb /opt:ref /opt:icf /I "..\..\src\tiff\libtiff" /I "..\..\src\jpeg" /I "..\..\src\png" /I "..\..\src\zlib" /I "..\..\src\regex" /I "..\..\src\expat\lib" /I "..\..\src\stc\scintilla\include" /I "..\..\src\stc\scintilla\src" /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "WXBUILDING" /D "__WX__" /D "SCI_LEXER" /D "LINK_LEXERS" /D "WXUSINGDLL" /D "WXMAKINGDLL_STC" /c\r
+# ADD CPP /nologo /FD /MD /O2 /GR /EHsc /I "..\..\lib\vc_dll\mswunivu" /I "..\..\include" /W4 /Yu"wx/wxprec.h" /Fp"vc_mswunivudll\wxprec_stcdll.pch" /Zi /Fd..\..\lib\vc_dll\wxmswuniv291u_stc_vc_custom.pdb /opt:ref /opt:icf /I "..\..\src\tiff\libtiff" /I "..\..\src\jpeg" /I "..\..\src\png" /I "..\..\src\zlib" /I "..\..\src\regex" /I "..\..\src\expat\lib" /I "..\..\src\stc\scintilla\include" /I "..\..\src\stc\scintilla\src" /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "WXBUILDING" /D "__WX__" /D "SCI_LEXER" /D "LINK_LEXERS" /D "WXUSINGDLL" /D "WXMAKINGDLL_STC" /c\r
  # ADD BASE MTL /nologo /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "WXBUILDING" /D "__WX__" /D "SCI_LEXER" /D "LINK_LEXERS" /D "WXUSINGDLL" /D "WXMAKINGDLL_STC" /mktyplib203 /win32\r
  # ADD MTL /nologo /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "WXBUILDING" /D "__WX__" /D "SCI_LEXER" /D "LINK_LEXERS" /D "WXUSINGDLL" /D "WXMAKINGDLL_STC" /mktyplib203 /win32\r
  # ADD BASE RSC /l 0x409 /d "__WXMSW__" /d "__WXUNIVERSAL__" /d "_UNICODE" /i "..\..\lib\vc_dll\mswunivu" /i "..\..\include" /d "WXBUILDING" /d WXDLLNAME=wxmswuniv291u_stc_vc_custom /i "..\..\src\tiff\libtiff" /i "..\..\src\jpeg" /i "..\..\src\png" /i "..\..\src\zlib" /i "..\..\src\regex" /i "..\..\src\expat\lib" /i "..\..\src\stc\scintilla\include" /i "..\..\src\stc\scintilla\src" /d "__WX__" /d "SCI_LEXER" /d "LINK_LEXERS" /d "WXUSINGDLL" /d WXMAKINGDLL_STC\r
@@ -97,8 +97,8 @@ LINK32=link.exe
  # PROP Output_Dir "..\..\lib\vc_dll"\r
  # PROP Intermediate_Dir "vc_mswudll\stc"\r
  # PROP Target_Dir ""\r
-# ADD BASE CPP /nologo /FD /MD /O2 /GR /EHsc /I "..\..\lib\vc_dll\mswu" /I "..\..\include" /W4 /Yu"wx/wxprec.h" /Fp"vc_mswudll\wxprec_stcdll.pch" /Zi /Fd..\..\lib\vc_dll\wxmsw291u_stc_vc_custom.pdb /I "..\..\src\tiff\libtiff" /I "..\..\src\jpeg" /I "..\..\src\png" /I "..\..\src\zlib" /I "..\..\src\regex" /I "..\..\src\expat\lib" /I "..\..\src\stc\scintilla\include" /I "..\..\src\stc\scintilla\src" /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "__WXMSW__" /D "_UNICODE" /D "WXBUILDING" /D "__WX__" /D "SCI_LEXER" /D "LINK_LEXERS" /D "WXUSINGDLL" /D "WXMAKINGDLL_STC" /c\r
-# ADD CPP /nologo /FD /MD /O2 /GR /EHsc /I "..\..\lib\vc_dll\mswu" /I "..\..\include" /W4 /Yu"wx/wxprec.h" /Fp"vc_mswudll\wxprec_stcdll.pch" /Zi /Fd..\..\lib\vc_dll\wxmsw291u_stc_vc_custom.pdb /I "..\..\src\tiff\libtiff" /I "..\..\src\jpeg" /I "..\..\src\png" /I "..\..\src\zlib" /I "..\..\src\regex" /I "..\..\src\expat\lib" /I "..\..\src\stc\scintilla\include" /I "..\..\src\stc\scintilla\src" /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "__WXMSW__" /D "_UNICODE" /D "WXBUILDING" /D "__WX__" /D "SCI_LEXER" /D "LINK_LEXERS" /D "WXUSINGDLL" /D "WXMAKINGDLL_STC" /c\r
+# ADD BASE CPP /nologo /FD /MD /O2 /GR /EHsc /I "..\..\lib\vc_dll\mswu" /I "..\..\include" /W4 /Yu"wx/wxprec.h" /Fp"vc_mswudll\wxprec_stcdll.pch" /Zi /Fd..\..\lib\vc_dll\wxmsw291u_stc_vc_custom.pdb /opt:ref /opt:icf /I "..\..\src\tiff\libtiff" /I "..\..\src\jpeg" /I "..\..\src\png" /I "..\..\src\zlib" /I "..\..\src\regex" /I "..\..\src\expat\lib" /I "..\..\src\stc\scintilla\include" /I "..\..\src\stc\scintilla\src" /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "__WXMSW__" /D "_UNICODE" /D "WXBUILDING" /D "__WX__" /D "SCI_LEXER" /D "LINK_LEXERS" /D "WXUSINGDLL" /D "WXMAKINGDLL_STC" /c\r
+# ADD CPP /nologo /FD /MD /O2 /GR /EHsc /I "..\..\lib\vc_dll\mswu" /I "..\..\include" /W4 /Yu"wx/wxprec.h" /Fp"vc_mswudll\wxprec_stcdll.pch" /Zi /Fd..\..\lib\vc_dll\wxmsw291u_stc_vc_custom.pdb /opt:ref /opt:icf /I "..\..\src\tiff\libtiff" /I "..\..\src\jpeg" /I "..\..\src\png" /I "..\..\src\zlib" /I "..\..\src\regex" /I "..\..\src\expat\lib" /I "..\..\src\stc\scintilla\include" /I "..\..\src\stc\scintilla\src" /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "__WXMSW__" /D "_UNICODE" /D "WXBUILDING" /D "__WX__" /D "SCI_LEXER" /D "LINK_LEXERS" /D "WXUSINGDLL" /D "WXMAKINGDLL_STC" /c\r
  # ADD BASE MTL /nologo /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "__WXMSW__" /D "_UNICODE" /D "WXBUILDING" /D "__WX__" /D "SCI_LEXER" /D "LINK_LEXERS" /D "WXUSINGDLL" /D "WXMAKINGDLL_STC" /mktyplib203 /win32\r
  # ADD MTL /nologo /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "__WXMSW__" /D "_UNICODE" /D "WXBUILDING" /D "__WX__" /D "SCI_LEXER" /D "LINK_LEXERS" /D "WXUSINGDLL" /D "WXMAKINGDLL_STC" /mktyplib203 /win32\r
  # ADD BASE RSC /l 0x409 /d "__WXMSW__" /d "_UNICODE" /i "..\..\lib\vc_dll\mswu" /i "..\..\include" /d "WXBUILDING" /d WXDLLNAME=wxmsw291u_stc_vc_custom /i "..\..\src\tiff\libtiff" /i "..\..\src\jpeg" /i "..\..\src\png" /i "..\..\src\zlib" /i "..\..\src\regex" /i "..\..\src\expat\lib" /i "..\..\src\stc\scintilla\include" /i "..\..\src\stc\scintilla\src" /d "__WX__" /d "SCI_LEXER" /d "LINK_LEXERS" /d "WXUSINGDLL" /d WXMAKINGDLL_STC\r
@@ -147,8 +147,8 @@ LINK32=link.exe
  # PROP Output_Dir "..\..\lib\vc_lib"\r
  # PROP Intermediate_Dir "vc_mswunivu\stc"\r
  # PROP Target_Dir ""\r
-# ADD BASE CPP /nologo /FD /MD /O2 /GR /EHsc /I "..\..\lib\vc_lib\mswunivu" /I "..\..\include" /W4 /Zi /Fd..\..\lib\vc_lib\wxmswuniv29u_stc.pdb /Yu"wx/wxprec.h" /Fp"vc_mswunivu\wxprec_stclib.pch" /I "..\..\src\tiff\libtiff" /I "..\..\src\jpeg" /I "..\..\src\png" /I "..\..\src\zlib" /I "..\..\src\regex" /I "..\..\src\expat\lib" /I "..\..\src\stc\scintilla\include" /I "..\..\src\stc\scintilla\src" /D "WIN32" /D "_LIB" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "WXBUILDING" /D "__WX__" /D "SCI_LEXER" /D "LINK_LEXERS" /c\r
-# ADD CPP /nologo /FD /MD /O2 /GR /EHsc /I "..\..\lib\vc_lib\mswunivu" /I "..\..\include" /W4 /Zi /Fd..\..\lib\vc_lib\wxmswuniv29u_stc.pdb /Yu"wx/wxprec.h" /Fp"vc_mswunivu\wxprec_stclib.pch" /I "..\..\src\tiff\libtiff" /I "..\..\src\jpeg" /I "..\..\src\png" /I "..\..\src\zlib" /I "..\..\src\regex" /I "..\..\src\expat\lib" /I "..\..\src\stc\scintilla\include" /I "..\..\src\stc\scintilla\src" /D "WIN32" /D "_LIB" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "WXBUILDING" /D "__WX__" /D "SCI_LEXER" /D "LINK_LEXERS" /c\r
+# ADD BASE CPP /nologo /FD /MD /O2 /GR /EHsc /I "..\..\lib\vc_lib\mswunivu" /I "..\..\include" /W4 /Zi /Fd..\..\lib\vc_lib\wxmswuniv29u_stc.pdb /opt:ref /opt:icf /Yu"wx/wxprec.h" /Fp"vc_mswunivu\wxprec_stclib.pch" /I "..\..\src\tiff\libtiff" /I "..\..\src\jpeg" /I "..\..\src\png" /I "..\..\src\zlib" /I "..\..\src\regex" /I "..\..\src\expat\lib" /I "..\..\src\stc\scintilla\include" /I "..\..\src\stc\scintilla\src" /D "WIN32" /D "_LIB" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "WXBUILDING" /D "__WX__" /D "SCI_LEXER" /D "LINK_LEXERS" /c\r
+# ADD CPP /nologo /FD /MD /O2 /GR /EHsc /I "..\..\lib\vc_lib\mswunivu" /I "..\..\include" /W4 /Zi /Fd..\..\lib\vc_lib\wxmswuniv29u_stc.pdb /opt:ref /opt:icf /Yu"wx/wxprec.h" /Fp"vc_mswunivu\wxprec_stclib.pch" /I "..\..\src\tiff\libtiff" /I "..\..\src\jpeg" /I "..\..\src\png" /I "..\..\src\zlib" /I "..\..\src\regex" /I "..\..\src\expat\lib" /I "..\..\src\stc\scintilla\include" /I "..\..\src\stc\scintilla\src" /D "WIN32" /D "_LIB" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "WXBUILDING" /D "__WX__" /D "SCI_LEXER" /D "LINK_LEXERS" /c\r
  # ADD BASE RSC /l 0x409\r
  # ADD RSC /l 0x409\r
  BSC32=bscmake.exe\r
@@ -193,8 +193,8 @@ LIB32=link.exe -lib
  # PROP Output_Dir "..\..\lib\vc_lib"\r
  # PROP Intermediate_Dir "vc_mswu\stc"\r
  # PROP Target_Dir ""\r
-# ADD BASE CPP /nologo /FD /MD /O2 /GR /EHsc /I "..\..\lib\vc_lib\mswu" /I "..\..\include" /W4 /Zi /Fd..\..\lib\vc_lib\wxmsw29u_stc.pdb /Yu"wx/wxprec.h" /Fp"vc_mswu\wxprec_stclib.pch" /I "..\..\src\tiff\libtiff" /I "..\..\src\jpeg" /I "..\..\src\png" /I "..\..\src\zlib" /I "..\..\src\regex" /I "..\..\src\expat\lib" /I "..\..\src\stc\scintilla\include" /I "..\..\src\stc\scintilla\src" /D "WIN32" /D "_LIB" /D "__WXMSW__" /D "_UNICODE" /D "WXBUILDING" /D "__WX__" /D "SCI_LEXER" /D "LINK_LEXERS" /c\r
-# ADD CPP /nologo /FD /MD /O2 /GR /EHsc /I "..\..\lib\vc_lib\mswu" /I "..\..\include" /W4 /Zi /Fd..\..\lib\vc_lib\wxmsw29u_stc.pdb /Yu"wx/wxprec.h" /Fp"vc_mswu\wxprec_stclib.pch" /I "..\..\src\tiff\libtiff" /I "..\..\src\jpeg" /I "..\..\src\png" /I "..\..\src\zlib" /I "..\..\src\regex" /I "..\..\src\expat\lib" /I "..\..\src\stc\scintilla\include" /I "..\..\src\stc\scintilla\src" /D "WIN32" /D "_LIB" /D "__WXMSW__" /D "_UNICODE" /D "WXBUILDING" /D "__WX__" /D "SCI_LEXER" /D "LINK_LEXERS" /c\r
+# ADD BASE CPP /nologo /FD /MD /O2 /GR /EHsc /I "..\..\lib\vc_lib\mswu" /I "..\..\include" /W4 /Zi /Fd..\..\lib\vc_lib\wxmsw29u_stc.pdb /opt:ref /opt:icf /Yu"wx/wxprec.h" /Fp"vc_mswu\wxprec_stclib.pch" /I "..\..\src\tiff\libtiff" /I "..\..\src\jpeg" /I "..\..\src\png" /I "..\..\src\zlib" /I "..\..\src\regex" /I "..\..\src\expat\lib" /I "..\..\src\stc\scintilla\include" /I "..\..\src\stc\scintilla\src" /D "WIN32" /D "_LIB" /D "__WXMSW__" /D "_UNICODE" /D "WXBUILDING" /D "__WX__" /D "SCI_LEXER" /D "LINK_LEXERS" /c\r
+# ADD CPP /nologo /FD /MD /O2 /GR /EHsc /I "..\..\lib\vc_lib\mswu" /I "..\..\include" /W4 /Zi /Fd..\..\lib\vc_lib\wxmsw29u_stc.pdb /opt:ref /opt:icf /Yu"wx/wxprec.h" /Fp"vc_mswu\wxprec_stclib.pch" /I "..\..\src\tiff\libtiff" /I "..\..\src\jpeg" /I "..\..\src\png" /I "..\..\src\zlib" /I "..\..\src\regex" /I "..\..\src\expat\lib" /I "..\..\src\stc\scintilla\include" /I "..\..\src\stc\scintilla\src" /D "WIN32" /D "_LIB" /D "__WXMSW__" /D "_UNICODE" /D "WXBUILDING" /D "__WX__" /D "SCI_LEXER" /D "LINK_LEXERS" /c\r
  # ADD BASE RSC /l 0x409\r
  # ADD RSC /l 0x409\r
  BSC32=bscmake.exe\r
diff --git a/build/msw/wx_vc7_adv.vcproj b/build/msw/wx_vc7_adv.vcproj

index 60167949f3eae1d9699e674deeeabcc01bf354a1..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
@@ -731,9 +735,9 @@
                                 RelativePath="..\..\src\generic\hyperlinkg.cpp">\r
                         </File>\r
                         <File\r
-                               RelativePath="..\..\src\generic\infobar.cpp">
-                       </File>
-                       <File
+                               RelativePath="..\..\src\generic\infobar.cpp">\r
+                       </File>\r
+                       <File\r
                                 RelativePath="..\..\src\generic\laywin.cpp">\r
                         </File>\r
                         <File\r
@@ -996,9 +1000,9 @@
                                 RelativePath="..\..\include\wx\generic\hyperlink.h">\r
                         </File>\r
                         <File\r
-                               RelativePath="..\..\include\wx\generic\infobar.h">
-                       </File>
-                       <File
+                               RelativePath="..\..\include\wx\generic\infobar.h">\r
+                       </File>\r
+                       <File\r
                                 RelativePath="..\..\include\wx\generic\laywin.h">\r
                         </File>\r
                         <File\r
@@ -1054,9 +1058,9 @@
                                 RelativePath="..\..\include\wx\hyperlink.h">\r
                         </File>\r
                         <File\r
-                               RelativePath="..\..\include\wx\infobar.h">
-                       </File>
-                       <File
+                               RelativePath="..\..\include\wx\infobar.h">\r
+                       </File>\r
+                       <File\r
                                 RelativePath="..\..\include\wx\joystick.h">\r
                         </File>\r
                         <File\r
diff --git a/build/msw/wx_vc7_aui.vcproj b/build/msw/wx_vc7_aui.vcproj

index dc78175aa15103e4eeadacd0603144e6e1e91b52..7dbecd4b6c97f703b20b0b2c063f175b783cfbb9 100644 (file)
--- a/build/msw/wx_vc7_aui.vcproj
+++ b/build/msw/wx_vc7_aui.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_adv.lib ..\..\lib\vc_dll\wxmsw29u_core.lib ..\..\lib\vc_dll\wxbase29u.lib"\r
                                 OutputFile="..\..\lib\vc_dll\wxmsw291u_aui_vc_custom.dll"\r
-                               LinkIncremental="2"\r
+                               LinkIncremental="1"\r
                                 ImportLibrary="..\..\lib\vc_dll\wxmsw29u_aui.lib"\r
                                 SuppressStartupBanner="TRUE"\r
                                 AdditionalLibraryDirectories="..\..\lib\vc_dll"\r
                                 GenerateDebugInformation="TRUE"\r
                                 ProgramDatabaseFile="..\..\lib\vc_dll\wxmsw291u_aui_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_AUI"\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_adv.lib ..\..\lib\vc_dll\wxmswuniv29u_core.lib ..\..\lib\vc_dll\wxbase29u.lib"\r
                                 OutputFile="..\..\lib\vc_dll\wxmswuniv291u_aui_vc_custom.dll"\r
-                               LinkIncremental="2"\r
+                               LinkIncremental="1"\r
                                 ImportLibrary="..\..\lib\vc_dll\wxmswuniv29u_aui.lib"\r
                                 SuppressStartupBanner="TRUE"\r
                                 AdditionalLibraryDirectories="..\..\lib\vc_dll"\r
                                 GenerateDebugInformation="TRUE"\r
                                 ProgramDatabaseFile="..\..\lib\vc_dll\wxmswuniv291u_aui_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_AUI"\r
diff --git a/build/msw/wx_vc7_base.vcproj b/build/msw/wx_vc7_base.vcproj

index 3c2a33a32c304e2def22e57388637f58b5daa330..aed2c316d0cdfa822c42c9ec4268fb542c2a890f 100644 (file)
--- a/build/msw/wx_vc7_base.vcproj
+++ b/build/msw/wx_vc7_base.vcproj
@@ -350,13 +350,15 @@
                                 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"\r
                                 OutputFile="..\..\lib\vc_dll\wxbase291u_vc_custom.dll"\r
-                               LinkIncremental="2"\r
+                               LinkIncremental="1"\r
                                 ImportLibrary="..\..\lib\vc_dll\wxbase29u.lib"\r
                                 SuppressStartupBanner="TRUE"\r
                                 AdditionalLibraryDirectories="..\..\lib\vc_dll"\r
                                 GenerateDebugInformation="TRUE"\r
                                 ProgramDatabaseFile="..\..\lib\vc_dll\wxbase291u_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;wxUSE_GUI=0;WXMAKINGDLL_BASE;wxUSE_BASE=1"\r
@@ -483,13 +485,15 @@
                                 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"\r
                                 OutputFile="..\..\lib\vc_dll\wxbase291u_vc_custom.dll"\r
-                               LinkIncremental="2"\r
+                               LinkIncremental="1"\r
                                 ImportLibrary="..\..\lib\vc_dll\wxbase29u.lib"\r
                                 SuppressStartupBanner="TRUE"\r
                                 AdditionalLibraryDirectories="..\..\lib\vc_dll"\r
                                 GenerateDebugInformation="TRUE"\r
                                 ProgramDatabaseFile="..\..\lib\vc_dll\wxbase291u_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;wxUSE_GUI=0;WXMAKINGDLL_BASE;wxUSE_BASE=1"\r
diff --git a/build/msw/wx_vc7_core.vcproj b/build/msw/wx_vc7_core.vcproj

index 7a8b50bbd44684156585a48a08f40b74b26f10a2..513b97051bf2a0a37172877a408e7f53a621d77a 100644 (file)
--- a/build/msw/wx_vc7_core.vcproj
+++ b/build/msw/wx_vc7_core.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\wxbase29u.lib"\r
                                 OutputFile="..\..\lib\vc_dll\wxmsw291u_core_vc_custom.dll"\r
-                               LinkIncremental="2"\r
+                               LinkIncremental="1"\r
                                 ImportLibrary="..\..\lib\vc_dll\wxmsw29u_core.lib"\r
                                 SuppressStartupBanner="TRUE"\r
                                 AdditionalLibraryDirectories="..\..\lib\vc_dll"\r
                                 GenerateDebugInformation="TRUE"\r
                                 ProgramDatabaseFile="..\..\lib\vc_dll\wxmsw291u_core_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_CORE;wxUSE_BASE=0"\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\wxbase29u.lib"\r
                                 OutputFile="..\..\lib\vc_dll\wxmswuniv291u_core_vc_custom.dll"\r
-                               LinkIncremental="2"\r
+                               LinkIncremental="1"\r
                                 ImportLibrary="..\..\lib\vc_dll\wxmswuniv29u_core.lib"\r
                                 SuppressStartupBanner="TRUE"\r
                                 AdditionalLibraryDirectories="..\..\lib\vc_dll"\r
                                 GenerateDebugInformation="TRUE"\r
                                 ProgramDatabaseFile="..\..\lib\vc_dll\wxmswuniv291u_core_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_CORE;wxUSE_BASE=0"\r
@@ -4606,9 +4610,9 @@
                                 RelativePath="..\..\include\wx\generic\hyperlink.h">\r
                         </File>\r
                         <File\r
-                               RelativePath="..\..\include\wx\generic\infobar.h">
-                       </File>
-                       <File
+                               RelativePath="..\..\include\wx\generic\infobar.h">\r
+                       </File>\r
+                       <File\r
                                 RelativePath="..\..\include\wx\generic\laywin.h">\r
                         </File>\r
                         <File\r
@@ -5206,9 +5210,9 @@
                                 RelativePath="..\..\include\wx\imagxpm.h">\r
                         </File>\r
                         <File\r
-                               RelativePath="..\..\include\wx\infobar.h">
-                       </File>
-                       <File
+                               RelativePath="..\..\include\wx\infobar.h">\r
+                       </File>\r
+                       <File\r
                                 RelativePath="..\..\include\wx\joystick.h">\r
                         </File>\r
                         <File\r
diff --git a/build/msw/wx_vc7_gl.vcproj b/build/msw/wx_vc7_gl.vcproj

index 336031cda571f2a910669866734b6308b77decbe..39d23821aa840bb2b1ae91ff03ce41921b63b9a5 100644 (file)
--- a/build/msw/wx_vc7_gl.vcproj
+++ b/build/msw/wx_vc7_gl.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 wxmsw29u_core.lib wxbase29u.lib  opengl32.lib glu32.lib"\r
                                 OutputFile="..\..\lib\vc_dll\wxmsw291u_gl_vc_custom.dll"\r
-                               LinkIncremental="2"\r
+                               LinkIncremental="1"\r
                                 ImportLibrary="..\..\lib\vc_dll\wxmsw29u_gl.lib"\r
                                 SuppressStartupBanner="TRUE"\r
                                 AdditionalLibraryDirectories="..\..\lib\vc_dll"\r
                                 GenerateDebugInformation="TRUE"\r
                                 ProgramDatabaseFile="..\..\lib\vc_dll\wxmsw291u_gl_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_GL"\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 wxmswuniv29u_core.lib wxbase29u.lib  opengl32.lib glu32.lib"\r
                                 OutputFile="..\..\lib\vc_dll\wxmswuniv291u_gl_vc_custom.dll"\r
-                               LinkIncremental="2"\r
+                               LinkIncremental="1"\r
                                 ImportLibrary="..\..\lib\vc_dll\wxmswuniv29u_gl.lib"\r
                                 SuppressStartupBanner="TRUE"\r
                                 AdditionalLibraryDirectories="..\..\lib\vc_dll"\r
                                 GenerateDebugInformation="TRUE"\r
                                 ProgramDatabaseFile="..\..\lib\vc_dll\wxmswuniv291u_gl_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_GL"\r
diff --git a/build/msw/wx_vc7_html.vcproj b/build/msw/wx_vc7_html.vcproj

index 9298802987487fc7748cdfa27464b0dd27fdf92d..06179183400056f5cddf5cab1ed6312a1a052fdd 100644 (file)
--- a/build/msw/wx_vc7_html.vcproj
+++ b/build/msw/wx_vc7_html.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_html_vc_custom.dll"\r
-                               LinkIncremental="2"\r
+                               LinkIncremental="1"\r
                                 ImportLibrary="..\..\lib\vc_dll\wxmsw29u_html.lib"\r
                                 SuppressStartupBanner="TRUE"\r
                                 AdditionalLibraryDirectories="..\..\lib\vc_dll"\r
                                 GenerateDebugInformation="TRUE"\r
                                 ProgramDatabaseFile="..\..\lib\vc_dll\wxmsw291u_html_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_HTML"\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_html_vc_custom.dll"\r
-                               LinkIncremental="2"\r
+                               LinkIncremental="1"\r
                                 ImportLibrary="..\..\lib\vc_dll\wxmswuniv29u_html.lib"\r
                                 SuppressStartupBanner="TRUE"\r
                                 AdditionalLibraryDirectories="..\..\lib\vc_dll"\r
                                 GenerateDebugInformation="TRUE"\r
                                 ProgramDatabaseFile="..\..\lib\vc_dll\wxmswuniv291u_html_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_HTML"\r
diff --git a/build/msw/wx_vc7_media.vcproj b/build/msw/wx_vc7_media.vcproj

index cdfd2c0425534fdfe656419c9406b55bf6cc6275..01fb50fb95d88e58ad53b829fd2c921b8ca0b8f3 100644 (file)
--- a/build/msw/wx_vc7_media.vcproj
+++ b/build/msw/wx_vc7_media.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_media_vc_custom.dll"\r
-                               LinkIncremental="2"\r
+                               LinkIncremental="1"\r
                                 ImportLibrary="..\..\lib\vc_dll\wxmsw29u_media.lib"\r
                                 SuppressStartupBanner="TRUE"\r
                                 AdditionalLibraryDirectories="..\..\lib\vc_dll"\r
                                 GenerateDebugInformation="TRUE"\r
                                 ProgramDatabaseFile="..\..\lib\vc_dll\wxmsw291u_media_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_MEDIA"\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_media_vc_custom.dll"\r
-                               LinkIncremental="2"\r
+                               LinkIncremental="1"\r
                                 ImportLibrary="..\..\lib\vc_dll\wxmswuniv29u_media.lib"\r
                                 SuppressStartupBanner="TRUE"\r
                                 AdditionalLibraryDirectories="..\..\lib\vc_dll"\r
                                 GenerateDebugInformation="TRUE"\r
                                 ProgramDatabaseFile="..\..\lib\vc_dll\wxmswuniv291u_media_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_MEDIA"\r
diff --git a/build/msw/wx_vc7_net.vcproj b/build/msw/wx_vc7_net.vcproj

index 3bc7b6a95cd126bef47df05a02015c085d4322b8..e04e6fb9bb35e08db5bc59eed7677935d78e3ab0 100644 (file)
--- a/build/msw/wx_vc7_net.vcproj
+++ b/build/msw/wx_vc7_net.vcproj
@@ -350,13 +350,15 @@
                                 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 ..\..\lib\vc_dll\wxbase29u.lib"\r
                                 OutputFile="..\..\lib\vc_dll\wxbase291u_net_vc_custom.dll"\r
-                               LinkIncremental="2"\r
+                               LinkIncremental="1"\r
                                 ImportLibrary="..\..\lib\vc_dll\wxbase29u_net.lib"\r
                                 SuppressStartupBanner="TRUE"\r
                                 AdditionalLibraryDirectories="..\..\lib\vc_dll"\r
                                 GenerateDebugInformation="TRUE"\r
                                 ProgramDatabaseFile="..\..\lib\vc_dll\wxbase291u_net_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;wxUSE_GUI=0;WXUSINGDLL;WXMAKINGDLL_NET"\r
@@ -483,13 +485,15 @@
                                 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 ..\..\lib\vc_dll\wxbase29u.lib"\r
                                 OutputFile="..\..\lib\vc_dll\wxbase291u_net_vc_custom.dll"\r
-                               LinkIncremental="2"\r
+                               LinkIncremental="1"\r
                                 ImportLibrary="..\..\lib\vc_dll\wxbase29u_net.lib"\r
                                 SuppressStartupBanner="TRUE"\r
                                 AdditionalLibraryDirectories="..\..\lib\vc_dll"\r
                                 GenerateDebugInformation="TRUE"\r
                                 ProgramDatabaseFile="..\..\lib\vc_dll\wxbase291u_net_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;wxUSE_GUI=0;WXUSINGDLL;WXMAKINGDLL_NET"\r
diff --git a/build/msw/wx_vc7_propgrid.vcproj b/build/msw/wx_vc7_propgrid.vcproj

index 71cc53bd95fa824a075bb2628988ceb9887f4775..c828d9052d0487ffa46634eec4f6c82839ab8649 100644 (file)
--- a/build/msw/wx_vc7_propgrid.vcproj
+++ b/build/msw/wx_vc7_propgrid.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_adv.lib ..\..\lib\vc_dll\wxmsw29u_core.lib ..\..\lib\vc_dll\wxbase29u.lib"\r
                                 OutputFile="..\..\lib\vc_dll\wxmsw291u_propgrid_vc_custom.dll"\r
-                               LinkIncremental="2"\r
+                               LinkIncremental="1"\r
                                 ImportLibrary="..\..\lib\vc_dll\wxmsw29u_propgrid.lib"\r
                                 SuppressStartupBanner="TRUE"\r
                                 AdditionalLibraryDirectories="..\..\lib\vc_dll"\r
                                 GenerateDebugInformation="TRUE"\r
                                 ProgramDatabaseFile="..\..\lib\vc_dll\wxmsw291u_propgrid_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_PROPGRID"\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_adv.lib ..\..\lib\vc_dll\wxmswuniv29u_core.lib ..\..\lib\vc_dll\wxbase29u.lib"\r
                                 OutputFile="..\..\lib\vc_dll\wxmswuniv291u_propgrid_vc_custom.dll"\r
-                               LinkIncremental="2"\r
+                               LinkIncremental="1"\r
                                 ImportLibrary="..\..\lib\vc_dll\wxmswuniv29u_propgrid.lib"\r
                                 SuppressStartupBanner="TRUE"\r
                                 AdditionalLibraryDirectories="..\..\lib\vc_dll"\r
                                 GenerateDebugInformation="TRUE"\r
                                 ProgramDatabaseFile="..\..\lib\vc_dll\wxmswuniv291u_propgrid_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_PROPGRID"\r
diff --git a/build/msw/wx_vc7_qa.vcproj b/build/msw/wx_vc7_qa.vcproj

index 7f0f31131d91bd081e7f5100e5107c82e19ffa87..37715c4903dc19cc70b5ba2ec603c7a7054adf40 100644 (file)
--- a/build/msw/wx_vc7_qa.vcproj
+++ b/build/msw/wx_vc7_qa.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 ..\..\lib\vc_dll\wxbase29u_xml.lib"\r
                                 OutputFile="..\..\lib\vc_dll\wxmsw291u_qa_vc_custom.dll"\r
-                               LinkIncremental="2"\r
+                               LinkIncremental="1"\r
                                 ImportLibrary="..\..\lib\vc_dll\wxmsw29u_qa.lib"\r
                                 SuppressStartupBanner="TRUE"\r
                                 AdditionalLibraryDirectories="..\..\lib\vc_dll"\r
                                 GenerateDebugInformation="TRUE"\r
                                 ProgramDatabaseFile="..\..\lib\vc_dll\wxmsw291u_qa_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_QA"\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 ..\..\lib\vc_dll\wxbase29u_xml.lib"\r
                                 OutputFile="..\..\lib\vc_dll\wxmswuniv291u_qa_vc_custom.dll"\r
-                               LinkIncremental="2"\r
+                               LinkIncremental="1"\r
                                 ImportLibrary="..\..\lib\vc_dll\wxmswuniv29u_qa.lib"\r
                                 SuppressStartupBanner="TRUE"\r
                                 AdditionalLibraryDirectories="..\..\lib\vc_dll"\r
                                 GenerateDebugInformation="TRUE"\r
                                 ProgramDatabaseFile="..\..\lib\vc_dll\wxmswuniv291u_qa_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_QA"\r
diff --git a/build/msw/wx_vc7_ribbon.vcproj b/build/msw/wx_vc7_ribbon.vcproj

index a0c106f9f49b356c861737f9f484b94c04e053f8..f99106cbc541714a2207de8ad37dc502df5781ce 100644 (file)
--- a/build/msw/wx_vc7_ribbon.vcproj
+++ b/build/msw/wx_vc7_ribbon.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_adv.lib ..\..\lib\vc_dll\wxmsw29u_core.lib ..\..\lib\vc_dll\wxbase29u.lib"\r
                                 OutputFile="..\..\lib\vc_dll\wxmsw291u_ribbon_vc_custom.dll"\r
-                               LinkIncremental="2"\r
+                               LinkIncremental="1"\r
                                 ImportLibrary="..\..\lib\vc_dll\wxmsw29u_ribbon.lib"\r
                                 SuppressStartupBanner="TRUE"\r
                                 AdditionalLibraryDirectories="..\..\lib\vc_dll"\r
                                 GenerateDebugInformation="TRUE"\r
                                 ProgramDatabaseFile="..\..\lib\vc_dll\wxmsw291u_ribbon_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_RIBBON"\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_adv.lib ..\..\lib\vc_dll\wxmswuniv29u_core.lib ..\..\lib\vc_dll\wxbase29u.lib"\r
                                 OutputFile="..\..\lib\vc_dll\wxmswuniv291u_ribbon_vc_custom.dll"\r
-                               LinkIncremental="2"\r
+                               LinkIncremental="1"\r
                                 ImportLibrary="..\..\lib\vc_dll\wxmswuniv29u_ribbon.lib"\r
                                 SuppressStartupBanner="TRUE"\r
                                 AdditionalLibraryDirectories="..\..\lib\vc_dll"\r
                                 GenerateDebugInformation="TRUE"\r
                                 ProgramDatabaseFile="..\..\lib\vc_dll\wxmswuniv291u_ribbon_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_RIBBON"\r
diff --git a/build/msw/wx_vc7_richtext.vcproj b/build/msw/wx_vc7_richtext.vcproj

index 5e1540e159b9abe27b2cfef02f2f37a251def503..0eaf6101758f67adef2c24ccb56ff0962aec5d94 100644 (file)
--- a/build/msw/wx_vc7_richtext.vcproj
+++ b/build/msw/wx_vc7_richtext.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_adv.lib ..\..\lib\vc_dll\wxmsw29u_html.lib ..\..\lib\vc_dll\wxbase29u_xml.lib ..\..\lib\vc_dll\wxmsw29u_core.lib ..\..\lib\vc_dll\wxbase29u.lib"\r
                                 OutputFile="..\..\lib\vc_dll\wxmsw291u_richtext_vc_custom.dll"\r
-                               LinkIncremental="2"\r
+                               LinkIncremental="1"\r
                                 ImportLibrary="..\..\lib\vc_dll\wxmsw29u_richtext.lib"\r
                                 SuppressStartupBanner="TRUE"\r
                                 AdditionalLibraryDirectories="..\..\lib\vc_dll"\r
                                 GenerateDebugInformation="TRUE"\r
                                 ProgramDatabaseFile="..\..\lib\vc_dll\wxmsw291u_richtext_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_RICHTEXT"\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_adv.lib ..\..\lib\vc_dll\wxmswuniv29u_html.lib ..\..\lib\vc_dll\wxbase29u_xml.lib ..\..\lib\vc_dll\wxmswuniv29u_core.lib ..\..\lib\vc_dll\wxbase29u.lib"\r
                                 OutputFile="..\..\lib\vc_dll\wxmswuniv291u_richtext_vc_custom.dll"\r
-                               LinkIncremental="2"\r
+                               LinkIncremental="1"\r
                                 ImportLibrary="..\..\lib\vc_dll\wxmswuniv29u_richtext.lib"\r
                                 SuppressStartupBanner="TRUE"\r
                                 AdditionalLibraryDirectories="..\..\lib\vc_dll"\r
                                 GenerateDebugInformation="TRUE"\r
                                 ProgramDatabaseFile="..\..\lib\vc_dll\wxmswuniv291u_richtext_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_RICHTEXT"\r
diff --git a/build/msw/wx_vc7_stc.vcproj b/build/msw/wx_vc7_stc.vcproj

index 5c7b5728329d35d9ec57763bdd28675024bd34bc..9fd646d6004c3a00c649c3588ad8561384524ff4 100644 (file)
--- a/build/msw/wx_vc7_stc.vcproj
+++ b/build/msw/wx_vc7_stc.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\wxscintilla.lib ..\..\lib\vc_dll\wxmsw29u_core.lib ..\..\lib\vc_dll\wxbase29u.lib"\r
                                 OutputFile="..\..\lib\vc_dll\wxmsw291u_stc_vc_custom.dll"\r
-                               LinkIncremental="2"\r
+                               LinkIncremental="1"\r
                                 ImportLibrary="..\..\lib\vc_dll\wxmsw29u_stc.lib"\r
                                 SuppressStartupBanner="TRUE"\r
                                 AdditionalLibraryDirectories="..\..\lib\vc_dll"\r
                                 GenerateDebugInformation="TRUE"\r
                                 ProgramDatabaseFile="..\..\lib\vc_dll\wxmsw291u_stc_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;__WX__;SCI_LEXER;LINK_LEXERS;WXUSINGDLL;WXMAKINGDLL_STC"\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\wxscintilla.lib ..\..\lib\vc_dll\wxmswuniv29u_core.lib ..\..\lib\vc_dll\wxbase29u.lib"\r
                                 OutputFile="..\..\lib\vc_dll\wxmswuniv291u_stc_vc_custom.dll"\r
-                               LinkIncremental="2"\r
+                               LinkIncremental="1"\r
                                 ImportLibrary="..\..\lib\vc_dll\wxmswuniv29u_stc.lib"\r
                                 SuppressStartupBanner="TRUE"\r
                                 AdditionalLibraryDirectories="..\..\lib\vc_dll"\r
                                 GenerateDebugInformation="TRUE"\r
                                 ProgramDatabaseFile="..\..\lib\vc_dll\wxmswuniv291u_stc_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;__WX__;SCI_LEXER;LINK_LEXERS;WXUSINGDLL;WXMAKINGDLL_STC"\r
diff --git a/build/msw/wx_vc7_xml.vcproj b/build/msw/wx_vc7_xml.vcproj

index 4463acef06100ebf6bb68230a82e33cd3d79e9de..7fbbe47bfc45e01fa3e95d43c78ec4d46d2529ed 100644 (file)
--- a/build/msw/wx_vc7_xml.vcproj
+++ b/build/msw/wx_vc7_xml.vcproj
@@ -350,13 +350,15 @@
                                 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 ..\..\lib\vc_dll\wxbase29u.lib"\r
                                 OutputFile="..\..\lib\vc_dll\wxbase291u_xml_vc_custom.dll"\r
-                               LinkIncremental="2"\r
+                               LinkIncremental="1"\r
                                 ImportLibrary="..\..\lib\vc_dll\wxbase29u_xml.lib"\r
                                 SuppressStartupBanner="TRUE"\r
                                 AdditionalLibraryDirectories="..\..\lib\vc_dll"\r
                                 GenerateDebugInformation="TRUE"\r
                                 ProgramDatabaseFile="..\..\lib\vc_dll\wxbase291u_xml_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;wxUSE_GUI=0;WXUSINGDLL;WXMAKINGDLL_XML"\r
@@ -483,13 +485,15 @@
                                 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 ..\..\lib\vc_dll\wxbase29u.lib"\r
                                 OutputFile="..\..\lib\vc_dll\wxbase291u_xml_vc_custom.dll"\r
-                               LinkIncremental="2"\r
+                               LinkIncremental="1"\r
                                 ImportLibrary="..\..\lib\vc_dll\wxbase29u_xml.lib"\r
                                 SuppressStartupBanner="TRUE"\r
                                 AdditionalLibraryDirectories="..\..\lib\vc_dll"\r
                                 GenerateDebugInformation="TRUE"\r
                                 ProgramDatabaseFile="..\..\lib\vc_dll\wxbase291u_xml_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;wxUSE_GUI=0;WXUSINGDLL;WXMAKINGDLL_XML"\r
diff --git a/build/msw/wx_vc7_xrc.vcproj b/build/msw/wx_vc7_xrc.vcproj

index 351bfd6cb3e4cec5b8f24b54332a6cbbfa48e78f..cb28dd92b11fe32129e7e0e8d468ef09997e8d28 100644 (file)
--- a/build/msw/wx_vc7_xrc.vcproj
+++ b/build/msw/wx_vc7_xrc.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_html.lib ..\..\lib\vc_dll\wxmsw29u_adv.lib ..\..\lib\vc_dll\wxmsw29u_core.lib ..\..\lib\vc_dll\wxbase29u_xml.lib ..\..\lib\vc_dll\wxbase29u.lib"\r
                                 OutputFile="..\..\lib\vc_dll\wxmsw291u_xrc_vc_custom.dll"\r
-                               LinkIncremental="2"\r
+                               LinkIncremental="1"\r
                                 ImportLibrary="..\..\lib\vc_dll\wxmsw29u_xrc.lib"\r
                                 SuppressStartupBanner="TRUE"\r
                                 AdditionalLibraryDirectories="..\..\lib\vc_dll"\r
                                 GenerateDebugInformation="TRUE"\r
                                 ProgramDatabaseFile="..\..\lib\vc_dll\wxmsw291u_xrc_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_XRC"\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_html.lib ..\..\lib\vc_dll\wxmswuniv29u_adv.lib ..\..\lib\vc_dll\wxmswuniv29u_core.lib ..\..\lib\vc_dll\wxbase29u_xml.lib ..\..\lib\vc_dll\wxbase29u.lib"\r
                                 OutputFile="..\..\lib\vc_dll\wxmswuniv291u_xrc_vc_custom.dll"\r
-                               LinkIncremental="2"\r
+                               LinkIncremental="1"\r
                                 ImportLibrary="..\..\lib\vc_dll\wxmswuniv29u_xrc.lib"\r
                                 SuppressStartupBanner="TRUE"\r
                                 AdditionalLibraryDirectories="..\..\lib\vc_dll"\r
                                 GenerateDebugInformation="TRUE"\r
                                 ProgramDatabaseFile="..\..\lib\vc_dll\wxmswuniv291u_xrc_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_XRC"\r
diff --git a/build/msw/wx_vc8_adv.vcproj b/build/msw/wx_vc8_adv.vcproj

index a4d85dc742ddeb04c57d08818671588c7ffc1aa7..24d7979e8044a5bf45d1e48d35c220bd218c4983 100644 (file)
--- a/build/msw/wx_vc8_adv.vcproj
+++ b/build/msw/wx_vc8_adv.vcproj
@@ -510,7 +510,7 @@
                                 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
@@ -518,6 +518,8 @@
                                 GenerateDebugInformation="true"\r
                                 ProgramDatabaseFile="..\..\lib\vc_dll\wxmsw291u_adv_vc_custom.pdb"\r
                                 TargetMachine="1"\r
+                               OptimizeReferences="2"\r
+                               EnableCOMDATFolding="2"\r
                         />\r
                         <Tool\r
                                 Name="VCALinkTool"\r
@@ -695,7 +697,7 @@
                                 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
@@ -703,6 +705,8 @@
                                 GenerateDebugInformation="true"\r
                                 ProgramDatabaseFile="..\..\lib\vc_dll\wxmswuniv291u_adv_vc_custom.pdb"\r
                                 TargetMachine="1"\r
+                               OptimizeReferences="2"\r
+                               EnableCOMDATFolding="2"\r
                         />\r
                         <Tool\r
                                 Name="VCALinkTool"\r
@@ -1009,10 +1013,10 @@
                                 >\r
                         </File>\r
                         <File\r
-                               RelativePath="..\..\src\generic\infobar.cpp"
-                               >
-                       </File>
-                       <File
+                               RelativePath="..\..\src\generic\infobar.cpp"\r
+                               >\r
+                       </File>\r
+                       <File\r
                                 RelativePath="..\..\src\generic\laywin.cpp"\r
                                 >\r
                         </File>\r
@@ -1348,10 +1352,10 @@
                                 >\r
                         </File>\r
                         <File\r
-                               RelativePath="..\..\include\wx\generic\infobar.h"
-                               >
-                       </File>
-                       <File
+                               RelativePath="..\..\include\wx\generic\infobar.h"\r
+                               >\r
+                       </File>\r
+                       <File\r
                                 RelativePath="..\..\include\wx\generic\laywin.h"\r
                                 >\r
                         </File>\r
@@ -1425,10 +1429,10 @@
                                 >\r
                         </File>\r
                         <File\r
-                               RelativePath="..\..\include\wx\infobar.h"
-                               >
-                       </File>
-                       <File
+                               RelativePath="..\..\include\wx\infobar.h"\r
+                               >\r
+                       </File>\r
+                       <File\r
                                 RelativePath="..\..\include\wx\joystick.h"\r
                                 >\r
                         </File>\r
diff --git a/build/msw/wx_vc8_aui.vcproj b/build/msw/wx_vc8_aui.vcproj

index 0ef08349aa96712b1cb1f9ac5b33babb9ba3fcbe..e10b6e52ee4f24abf9e38812b5c6434cc11bb839 100644 (file)
--- a/build/msw/wx_vc8_aui.vcproj
+++ b/build/msw/wx_vc8_aui.vcproj
@@ -510,7 +510,7 @@
                                 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_adv.lib ..\..\lib\vc_dll\wxmsw29u_core.lib ..\..\lib\vc_dll\wxbase29u.lib"\r
                                 OutputFile="..\..\lib\vc_dll\wxmsw291u_aui_vc_custom.dll"\r
-                               LinkIncremental="2"\r
+                               LinkIncremental="1"\r
                                 ImportLibrary="..\..\lib\vc_dll\wxmsw29u_aui.lib"\r
                                 SuppressStartupBanner="true"\r
                                 AdditionalLibraryDirectories="..\..\lib\vc_dll"\r
@@ -518,6 +518,8 @@
                                 GenerateDebugInformation="true"\r
                                 ProgramDatabaseFile="..\..\lib\vc_dll\wxmsw291u_aui_vc_custom.pdb"\r
                                 TargetMachine="1"\r
+                               OptimizeReferences="2"\r
+                               EnableCOMDATFolding="2"\r
                         />\r
                         <Tool\r
                                 Name="VCALinkTool"\r
@@ -695,7 +697,7 @@
                                 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_adv.lib ..\..\lib\vc_dll\wxmswuniv29u_core.lib ..\..\lib\vc_dll\wxbase29u.lib"\r
                                 OutputFile="..\..\lib\vc_dll\wxmswuniv291u_aui_vc_custom.dll"\r
-                               LinkIncremental="2"\r
+                               LinkIncremental="1"\r
                                 ImportLibrary="..\..\lib\vc_dll\wxmswuniv29u_aui.lib"\r
                                 SuppressStartupBanner="true"\r
                                 AdditionalLibraryDirectories="..\..\lib\vc_dll"\r
@@ -703,6 +705,8 @@
                                 GenerateDebugInformation="true"\r
                                 ProgramDatabaseFile="..\..\lib\vc_dll\wxmswuniv291u_aui_vc_custom.pdb"\r
                                 TargetMachine="1"\r
+                               OptimizeReferences="2"\r
+                               EnableCOMDATFolding="2"\r
                         />\r
                         <Tool\r
                                 Name="VCALinkTool"\r
diff --git a/build/msw/wx_vc8_base.vcproj b/build/msw/wx_vc8_base.vcproj

index 4aa08b9f1ebcbfe4fccc920137359e18e6d19db1..88f096837de5f2aa37503640f327176f82230e3f 100644 (file)
--- a/build/msw/wx_vc8_base.vcproj
+++ b/build/msw/wx_vc8_base.vcproj
@@ -510,7 +510,7 @@
                                 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"\r
                                 OutputFile="..\..\lib\vc_dll\wxbase291u_vc_custom.dll"\r
-                               LinkIncremental="2"\r
+                               LinkIncremental="1"\r
                                 ImportLibrary="..\..\lib\vc_dll\wxbase29u.lib"\r
                                 SuppressStartupBanner="true"\r
                                 AdditionalLibraryDirectories="..\..\lib\vc_dll"\r
@@ -518,6 +518,8 @@
                                 GenerateDebugInformation="true"\r
                                 ProgramDatabaseFile="..\..\lib\vc_dll\wxbase291u_vc_custom.pdb"\r
                                 TargetMachine="1"\r
+                               OptimizeReferences="2"\r
+                               EnableCOMDATFolding="2"\r
                         />\r
                         <Tool\r
                                 Name="VCALinkTool"\r
@@ -695,7 +697,7 @@
                                 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"\r
                                 OutputFile="..\..\lib\vc_dll\wxbase291u_vc_custom.dll"\r
-                               LinkIncremental="2"\r
+                               LinkIncremental="1"\r
                                 ImportLibrary="..\..\lib\vc_dll\wxbase29u.lib"\r
                                 SuppressStartupBanner="true"\r
                                 AdditionalLibraryDirectories="..\..\lib\vc_dll"\r
@@ -703,6 +705,8 @@
                                 GenerateDebugInformation="true"\r
                                 ProgramDatabaseFile="..\..\lib\vc_dll\wxbase291u_vc_custom.pdb"\r
                                 TargetMachine="1"\r
+                               OptimizeReferences="2"\r
+                               EnableCOMDATFolding="2"\r
                         />\r
                         <Tool\r
                                 Name="VCALinkTool"\r
diff --git a/build/msw/wx_vc8_core.vcproj b/build/msw/wx_vc8_core.vcproj

index 8f288659b453e88bcba5cd1ce01a1503c5f74328..a408b8b347db10e436e7ffa317e60e71e0ecabe8 100644 (file)
--- a/build/msw/wx_vc8_core.vcproj
+++ b/build/msw/wx_vc8_core.vcproj
@@ -510,7 +510,7 @@
                                 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\wxbase29u.lib"\r
                                 OutputFile="..\..\lib\vc_dll\wxmsw291u_core_vc_custom.dll"\r
-                               LinkIncremental="2"\r
+                               LinkIncremental="1"\r
                                 ImportLibrary="..\..\lib\vc_dll\wxmsw29u_core.lib"\r
                                 SuppressStartupBanner="true"\r
                                 AdditionalLibraryDirectories="..\..\lib\vc_dll"\r
@@ -518,6 +518,8 @@
                                 GenerateDebugInformation="true"\r
                                 ProgramDatabaseFile="..\..\lib\vc_dll\wxmsw291u_core_vc_custom.pdb"\r
                                 TargetMachine="1"\r
+                               OptimizeReferences="2"\r
+                               EnableCOMDATFolding="2"\r
                         />\r
                         <Tool\r
                                 Name="VCALinkTool"\r
@@ -695,7 +697,7 @@
                                 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\wxbase29u.lib"\r
                                 OutputFile="..\..\lib\vc_dll\wxmswuniv291u_core_vc_custom.dll"\r
-                               LinkIncremental="2"\r
+                               LinkIncremental="1"\r
                                 ImportLibrary="..\..\lib\vc_dll\wxmswuniv29u_core.lib"\r
                                 SuppressStartupBanner="true"\r
                                 AdditionalLibraryDirectories="..\..\lib\vc_dll"\r
@@ -703,6 +705,8 @@
                                 GenerateDebugInformation="true"\r
                                 ProgramDatabaseFile="..\..\lib\vc_dll\wxmswuniv291u_core_vc_custom.pdb"\r
                                 TargetMachine="1"\r
+                               OptimizeReferences="2"\r
+                               EnableCOMDATFolding="2"\r
                         />\r
                         <Tool\r
                                 Name="VCALinkTool"\r
@@ -6161,10 +6165,10 @@
                                 >\r
                         </File>\r
                         <File\r
-                               RelativePath="..\..\include\wx\generic\infobar.h"
-                               >
-                       </File>
-                       <File
+                               RelativePath="..\..\include\wx\generic\infobar.h"\r
+                               >\r
+                       </File>\r
+                       <File\r
                                 RelativePath="..\..\include\wx\generic\laywin.h"\r
                                 >\r
                         </File>\r
@@ -6960,10 +6964,10 @@
                                 >\r
                         </File>\r
                         <File\r
-                               RelativePath="..\..\include\wx\infobar.h"
-                               >
-                       </File>
-                       <File
+                               RelativePath="..\..\include\wx\infobar.h"\r
+                               >\r
+                       </File>\r
+                       <File\r
                                 RelativePath="..\..\include\wx\joystick.h"\r
                                 >\r
                         </File>\r
diff --git a/build/msw/wx_vc8_gl.vcproj b/build/msw/wx_vc8_gl.vcproj

index 980124c283b3274167661410f32e2ff0f55a73d4..fb7e457e30e1b46ffe195b3b4f5577a305fb88d9 100644 (file)
--- a/build/msw/wx_vc8_gl.vcproj
+++ b/build/msw/wx_vc8_gl.vcproj
@@ -510,7 +510,7 @@
                                 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 wxmsw29u_core.lib wxbase29u.lib  opengl32.lib glu32.lib"\r
                                 OutputFile="..\..\lib\vc_dll\wxmsw291u_gl_vc_custom.dll"\r
-                               LinkIncremental="2"\r
+                               LinkIncremental="1"\r
                                 ImportLibrary="..\..\lib\vc_dll\wxmsw29u_gl.lib"\r
                                 SuppressStartupBanner="true"\r
                                 AdditionalLibraryDirectories="..\..\lib\vc_dll"\r
@@ -518,6 +518,8 @@
                                 GenerateDebugInformation="true"\r
                                 ProgramDatabaseFile="..\..\lib\vc_dll\wxmsw291u_gl_vc_custom.pdb"\r
                                 TargetMachine="1"\r
+                               OptimizeReferences="2"\r
+                               EnableCOMDATFolding="2"\r
                         />\r
                         <Tool\r
                                 Name="VCALinkTool"\r
@@ -695,7 +697,7 @@
                                 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 wxmswuniv29u_core.lib wxbase29u.lib  opengl32.lib glu32.lib"\r
                                 OutputFile="..\..\lib\vc_dll\wxmswuniv291u_gl_vc_custom.dll"\r
-                               LinkIncremental="2"\r
+                               LinkIncremental="1"\r
                                 ImportLibrary="..\..\lib\vc_dll\wxmswuniv29u_gl.lib"\r
                                 SuppressStartupBanner="true"\r
                                 AdditionalLibraryDirectories="..\..\lib\vc_dll"\r
@@ -703,6 +705,8 @@
                                 GenerateDebugInformation="true"\r
                                 ProgramDatabaseFile="..\..\lib\vc_dll\wxmswuniv291u_gl_vc_custom.pdb"\r
                                 TargetMachine="1"\r
+                               OptimizeReferences="2"\r
+                               EnableCOMDATFolding="2"\r
                         />\r
                         <Tool\r
                                 Name="VCALinkTool"\r
diff --git a/build/msw/wx_vc8_html.vcproj b/build/msw/wx_vc8_html.vcproj

index 14f2ed35a340339ff64dffe151bbdd90e0b272ee..4e0aa60dac1476b4369113b64d520dcc968e7d07 100644 (file)
--- a/build/msw/wx_vc8_html.vcproj
+++ b/build/msw/wx_vc8_html.vcproj
@@ -510,7 +510,7 @@
                                 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_html_vc_custom.dll"\r
-                               LinkIncremental="2"\r
+                               LinkIncremental="1"\r
                                 ImportLibrary="..\..\lib\vc_dll\wxmsw29u_html.lib"\r
                                 SuppressStartupBanner="true"\r
                                 AdditionalLibraryDirectories="..\..\lib\vc_dll"\r
@@ -518,6 +518,8 @@
                                 GenerateDebugInformation="true"\r
                                 ProgramDatabaseFile="..\..\lib\vc_dll\wxmsw291u_html_vc_custom.pdb"\r
                                 TargetMachine="1"\r
+                               OptimizeReferences="2"\r
+                               EnableCOMDATFolding="2"\r
                         />\r
                         <Tool\r
                                 Name="VCALinkTool"\r
@@ -695,7 +697,7 @@
                                 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_html_vc_custom.dll"\r
-                               LinkIncremental="2"\r
+                               LinkIncremental="1"\r
                                 ImportLibrary="..\..\lib\vc_dll\wxmswuniv29u_html.lib"\r
                                 SuppressStartupBanner="true"\r
                                 AdditionalLibraryDirectories="..\..\lib\vc_dll"\r
@@ -703,6 +705,8 @@
                                 GenerateDebugInformation="true"\r
                                 ProgramDatabaseFile="..\..\lib\vc_dll\wxmswuniv291u_html_vc_custom.pdb"\r
                                 TargetMachine="1"\r
+                               OptimizeReferences="2"\r
+                               EnableCOMDATFolding="2"\r
                         />\r
                         <Tool\r
                                 Name="VCALinkTool"\r
diff --git a/build/msw/wx_vc8_media.vcproj b/build/msw/wx_vc8_media.vcproj

index a347da686bfd961fa89a7642f61ba6a409b862ca..d908905ed1bd1865ad171c40351e32ecc2d8fe43 100644 (file)
--- a/build/msw/wx_vc8_media.vcproj
+++ b/build/msw/wx_vc8_media.vcproj
@@ -510,7 +510,7 @@
                                 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_media_vc_custom.dll"\r
-                               LinkIncremental="2"\r
+                               LinkIncremental="1"\r
                                 ImportLibrary="..\..\lib\vc_dll\wxmsw29u_media.lib"\r
                                 SuppressStartupBanner="true"\r
                                 AdditionalLibraryDirectories="..\..\lib\vc_dll"\r
@@ -518,6 +518,8 @@
                                 GenerateDebugInformation="true"\r
                                 ProgramDatabaseFile="..\..\lib\vc_dll\wxmsw291u_media_vc_custom.pdb"\r
                                 TargetMachine="1"\r
+                               OptimizeReferences="2"\r
+                               EnableCOMDATFolding="2"\r
                         />\r
                         <Tool\r
                                 Name="VCALinkTool"\r
@@ -695,7 +697,7 @@
                                 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_media_vc_custom.dll"\r
-                               LinkIncremental="2"\r
+                               LinkIncremental="1"\r
                                 ImportLibrary="..\..\lib\vc_dll\wxmswuniv29u_media.lib"\r
                                 SuppressStartupBanner="true"\r
                                 AdditionalLibraryDirectories="..\..\lib\vc_dll"\r
@@ -703,6 +705,8 @@
                                 GenerateDebugInformation="true"\r
                                 ProgramDatabaseFile="..\..\lib\vc_dll\wxmswuniv291u_media_vc_custom.pdb"\r
                                 TargetMachine="1"\r
+                               OptimizeReferences="2"\r
+                               EnableCOMDATFolding="2"\r
                         />\r
                         <Tool\r
                                 Name="VCALinkTool"\r
diff --git a/build/msw/wx_vc8_net.vcproj b/build/msw/wx_vc8_net.vcproj

index 8e797fb9e69fd98526740d1b9d85edf2f1698d48..7f7d4bb6f2d96d013468f481ae4ce4f19c9e4c7e 100644 (file)
--- a/build/msw/wx_vc8_net.vcproj
+++ b/build/msw/wx_vc8_net.vcproj
@@ -510,7 +510,7 @@
                                 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 ..\..\lib\vc_dll\wxbase29u.lib"\r
                                 OutputFile="..\..\lib\vc_dll\wxbase291u_net_vc_custom.dll"\r
-                               LinkIncremental="2"\r
+                               LinkIncremental="1"\r
                                 ImportLibrary="..\..\lib\vc_dll\wxbase29u_net.lib"\r
                                 SuppressStartupBanner="true"\r
                                 AdditionalLibraryDirectories="..\..\lib\vc_dll"\r
@@ -518,6 +518,8 @@
                                 GenerateDebugInformation="true"\r
                                 ProgramDatabaseFile="..\..\lib\vc_dll\wxbase291u_net_vc_custom.pdb"\r
                                 TargetMachine="1"\r
+                               OptimizeReferences="2"\r
+                               EnableCOMDATFolding="2"\r
                         />\r
                         <Tool\r
                                 Name="VCALinkTool"\r
@@ -695,7 +697,7 @@
                                 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 ..\..\lib\vc_dll\wxbase29u.lib"\r
                                 OutputFile="..\..\lib\vc_dll\wxbase291u_net_vc_custom.dll"\r
-                               LinkIncremental="2"\r
+                               LinkIncremental="1"\r
                                 ImportLibrary="..\..\lib\vc_dll\wxbase29u_net.lib"\r
                                 SuppressStartupBanner="true"\r
                                 AdditionalLibraryDirectories="..\..\lib\vc_dll"\r
@@ -703,6 +705,8 @@
                                 GenerateDebugInformation="true"\r
                                 ProgramDatabaseFile="..\..\lib\vc_dll\wxbase291u_net_vc_custom.pdb"\r
                                 TargetMachine="1"\r
+                               OptimizeReferences="2"\r
+                               EnableCOMDATFolding="2"\r
                         />\r
                         <Tool\r
                                 Name="VCALinkTool"\r
diff --git a/build/msw/wx_vc8_propgrid.vcproj b/build/msw/wx_vc8_propgrid.vcproj

index 269264ff50ecf31b16992ea3d626ece5a8b7a0df..194155ecbbb46ffb646bd0489c44c01b54febf30 100644 (file)
--- a/build/msw/wx_vc8_propgrid.vcproj
+++ b/build/msw/wx_vc8_propgrid.vcproj
@@ -510,7 +510,7 @@
                                 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_adv.lib ..\..\lib\vc_dll\wxmsw29u_core.lib ..\..\lib\vc_dll\wxbase29u.lib"\r
                                 OutputFile="..\..\lib\vc_dll\wxmsw291u_propgrid_vc_custom.dll"\r
-                               LinkIncremental="2"\r
+                               LinkIncremental="1"\r
                                 ImportLibrary="..\..\lib\vc_dll\wxmsw29u_propgrid.lib"\r
                                 SuppressStartupBanner="true"\r
                                 AdditionalLibraryDirectories="..\..\lib\vc_dll"\r
@@ -518,6 +518,8 @@
                                 GenerateDebugInformation="true"\r
                                 ProgramDatabaseFile="..\..\lib\vc_dll\wxmsw291u_propgrid_vc_custom.pdb"\r
                                 TargetMachine="1"\r
+                               OptimizeReferences="2"\r
+                               EnableCOMDATFolding="2"\r
                         />\r
                         <Tool\r
                                 Name="VCALinkTool"\r
@@ -695,7 +697,7 @@
                                 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_adv.lib ..\..\lib\vc_dll\wxmswuniv29u_core.lib ..\..\lib\vc_dll\wxbase29u.lib"\r
                                 OutputFile="..\..\lib\vc_dll\wxmswuniv291u_propgrid_vc_custom.dll"\r
-                               LinkIncremental="2"\r
+                               LinkIncremental="1"\r
                                 ImportLibrary="..\..\lib\vc_dll\wxmswuniv29u_propgrid.lib"\r
                                 SuppressStartupBanner="true"\r
                                 AdditionalLibraryDirectories="..\..\lib\vc_dll"\r
@@ -703,6 +705,8 @@
                                 GenerateDebugInformation="true"\r
                                 ProgramDatabaseFile="..\..\lib\vc_dll\wxmswuniv291u_propgrid_vc_custom.pdb"\r
                                 TargetMachine="1"\r
+                               OptimizeReferences="2"\r
+                               EnableCOMDATFolding="2"\r
                         />\r
                         <Tool\r
                                 Name="VCALinkTool"\r
diff --git a/build/msw/wx_vc8_qa.vcproj b/build/msw/wx_vc8_qa.vcproj

index 762d7a110e1c0564b6a10539934ce00e8a8d0f05..2bb3c1f9d69819a1b231c88c5cf0e3f637759400 100644 (file)
--- a/build/msw/wx_vc8_qa.vcproj
+++ b/build/msw/wx_vc8_qa.vcproj
@@ -510,7 +510,7 @@
                                 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 ..\..\lib\vc_dll\wxbase29u_xml.lib"\r
                                 OutputFile="..\..\lib\vc_dll\wxmsw291u_qa_vc_custom.dll"\r
-                               LinkIncremental="2"\r
+                               LinkIncremental="1"\r
                                 ImportLibrary="..\..\lib\vc_dll\wxmsw29u_qa.lib"\r
                                 SuppressStartupBanner="true"\r
                                 AdditionalLibraryDirectories="..\..\lib\vc_dll"\r
@@ -518,6 +518,8 @@
                                 GenerateDebugInformation="true"\r
                                 ProgramDatabaseFile="..\..\lib\vc_dll\wxmsw291u_qa_vc_custom.pdb"\r
                                 TargetMachine="1"\r
+                               OptimizeReferences="2"\r
+                               EnableCOMDATFolding="2"\r
                         />\r
                         <Tool\r
                                 Name="VCALinkTool"\r
@@ -695,7 +697,7 @@
                                 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 ..\..\lib\vc_dll\wxbase29u_xml.lib"\r
                                 OutputFile="..\..\lib\vc_dll\wxmswuniv291u_qa_vc_custom.dll"\r
-                               LinkIncremental="2"\r
+                               LinkIncremental="1"\r
                                 ImportLibrary="..\..\lib\vc_dll\wxmswuniv29u_qa.lib"\r
                                 SuppressStartupBanner="true"\r
                                 AdditionalLibraryDirectories="..\..\lib\vc_dll"\r
@@ -703,6 +705,8 @@
                                 GenerateDebugInformation="true"\r
                                 ProgramDatabaseFile="..\..\lib\vc_dll\wxmswuniv291u_qa_vc_custom.pdb"\r
                                 TargetMachine="1"\r
+                               OptimizeReferences="2"\r
+                               EnableCOMDATFolding="2"\r
                         />\r
                         <Tool\r
                                 Name="VCALinkTool"\r
diff --git a/build/msw/wx_vc8_ribbon.vcproj b/build/msw/wx_vc8_ribbon.vcproj

index f6132b324ab78e2b8a360ea287521e022d968c34..9dcdc2433d44ab6ce6f6a8d9a9b269eb9fd42e68 100644 (file)
--- a/build/msw/wx_vc8_ribbon.vcproj
+++ b/build/msw/wx_vc8_ribbon.vcproj
@@ -510,7 +510,7 @@
                                 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_adv.lib ..\..\lib\vc_dll\wxmsw29u_core.lib ..\..\lib\vc_dll\wxbase29u.lib"\r
                                 OutputFile="..\..\lib\vc_dll\wxmsw291u_ribbon_vc_custom.dll"\r
-                               LinkIncremental="2"\r
+                               LinkIncremental="1"\r
                                 ImportLibrary="..\..\lib\vc_dll\wxmsw29u_ribbon.lib"\r
                                 SuppressStartupBanner="true"\r
                                 AdditionalLibraryDirectories="..\..\lib\vc_dll"\r
@@ -518,6 +518,8 @@
                                 GenerateDebugInformation="true"\r
                                 ProgramDatabaseFile="..\..\lib\vc_dll\wxmsw291u_ribbon_vc_custom.pdb"\r
                                 TargetMachine="1"\r
+                               OptimizeReferences="2"\r
+                               EnableCOMDATFolding="2"\r
                         />\r
                         <Tool\r
                                 Name="VCALinkTool"\r
@@ -695,7 +697,7 @@
                                 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_adv.lib ..\..\lib\vc_dll\wxmswuniv29u_core.lib ..\..\lib\vc_dll\wxbase29u.lib"\r
                                 OutputFile="..\..\lib\vc_dll\wxmswuniv291u_ribbon_vc_custom.dll"\r
-                               LinkIncremental="2"\r
+                               LinkIncremental="1"\r
                                 ImportLibrary="..\..\lib\vc_dll\wxmswuniv29u_ribbon.lib"\r
                                 SuppressStartupBanner="true"\r
                                 AdditionalLibraryDirectories="..\..\lib\vc_dll"\r
@@ -703,6 +705,8 @@
                                 GenerateDebugInformation="true"\r
                                 ProgramDatabaseFile="..\..\lib\vc_dll\wxmswuniv291u_ribbon_vc_custom.pdb"\r
                                 TargetMachine="1"\r
+                               OptimizeReferences="2"\r
+                               EnableCOMDATFolding="2"\r
                         />\r
                         <Tool\r
                                 Name="VCALinkTool"\r
diff --git a/build/msw/wx_vc8_richtext.vcproj b/build/msw/wx_vc8_richtext.vcproj

index 78b08fb7d81d94d0ca41f4b940e5234e5d86018c..f2ba5065468d4db6202e1c542d57eae53521bf16 100644 (file)
--- a/build/msw/wx_vc8_richtext.vcproj
+++ b/build/msw/wx_vc8_richtext.vcproj
@@ -510,7 +510,7 @@
                                 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_adv.lib ..\..\lib\vc_dll\wxmsw29u_html.lib ..\..\lib\vc_dll\wxbase29u_xml.lib ..\..\lib\vc_dll\wxmsw29u_core.lib ..\..\lib\vc_dll\wxbase29u.lib"\r
                                 OutputFile="..\..\lib\vc_dll\wxmsw291u_richtext_vc_custom.dll"\r
-                               LinkIncremental="2"\r
+                               LinkIncremental="1"\r
                                 ImportLibrary="..\..\lib\vc_dll\wxmsw29u_richtext.lib"\r
                                 SuppressStartupBanner="true"\r
                                 AdditionalLibraryDirectories="..\..\lib\vc_dll"\r
@@ -518,6 +518,8 @@
                                 GenerateDebugInformation="true"\r
                                 ProgramDatabaseFile="..\..\lib\vc_dll\wxmsw291u_richtext_vc_custom.pdb"\r
                                 TargetMachine="1"\r
+                               OptimizeReferences="2"\r
+                               EnableCOMDATFolding="2"\r
                         />\r
                         <Tool\r
                                 Name="VCALinkTool"\r
@@ -695,7 +697,7 @@
                                 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_adv.lib ..\..\lib\vc_dll\wxmswuniv29u_html.lib ..\..\lib\vc_dll\wxbase29u_xml.lib ..\..\lib\vc_dll\wxmswuniv29u_core.lib ..\..\lib\vc_dll\wxbase29u.lib"\r
                                 OutputFile="..\..\lib\vc_dll\wxmswuniv291u_richtext_vc_custom.dll"\r
-                               LinkIncremental="2"\r
+                               LinkIncremental="1"\r
                                 ImportLibrary="..\..\lib\vc_dll\wxmswuniv29u_richtext.lib"\r
                                 SuppressStartupBanner="true"\r
                                 AdditionalLibraryDirectories="..\..\lib\vc_dll"\r
@@ -703,6 +705,8 @@
                                 GenerateDebugInformation="true"\r
                                 ProgramDatabaseFile="..\..\lib\vc_dll\wxmswuniv291u_richtext_vc_custom.pdb"\r
                                 TargetMachine="1"\r
+                               OptimizeReferences="2"\r
+                               EnableCOMDATFolding="2"\r
                         />\r
                         <Tool\r
                                 Name="VCALinkTool"\r
diff --git a/build/msw/wx_vc8_stc.vcproj b/build/msw/wx_vc8_stc.vcproj

index a2ee381aa1de56ed94fa1ef51387ef46dd38050d..72fa76e8376d97ab4da44b5a3ed442a63e537c3e 100644 (file)
--- a/build/msw/wx_vc8_stc.vcproj
+++ b/build/msw/wx_vc8_stc.vcproj
@@ -510,7 +510,7 @@
                                 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\wxscintilla.lib ..\..\lib\vc_dll\wxmsw29u_core.lib ..\..\lib\vc_dll\wxbase29u.lib"\r
                                 OutputFile="..\..\lib\vc_dll\wxmsw291u_stc_vc_custom.dll"\r
-                               LinkIncremental="2"\r
+                               LinkIncremental="1"\r
                                 ImportLibrary="..\..\lib\vc_dll\wxmsw29u_stc.lib"\r
                                 SuppressStartupBanner="true"\r
                                 AdditionalLibraryDirectories="..\..\lib\vc_dll"\r
@@ -518,6 +518,8 @@
                                 GenerateDebugInformation="true"\r
                                 ProgramDatabaseFile="..\..\lib\vc_dll\wxmsw291u_stc_vc_custom.pdb"\r
                                 TargetMachine="1"\r
+                               OptimizeReferences="2"\r
+                               EnableCOMDATFolding="2"\r
                         />\r
                         <Tool\r
                                 Name="VCALinkTool"\r
@@ -695,7 +697,7 @@
                                 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\wxscintilla.lib ..\..\lib\vc_dll\wxmswuniv29u_core.lib ..\..\lib\vc_dll\wxbase29u.lib"\r
                                 OutputFile="..\..\lib\vc_dll\wxmswuniv291u_stc_vc_custom.dll"\r
-                               LinkIncremental="2"\r
+                               LinkIncremental="1"\r
                                 ImportLibrary="..\..\lib\vc_dll\wxmswuniv29u_stc.lib"\r
                                 SuppressStartupBanner="true"\r
                                 AdditionalLibraryDirectories="..\..\lib\vc_dll"\r
@@ -703,6 +705,8 @@
                                 GenerateDebugInformation="true"\r
                                 ProgramDatabaseFile="..\..\lib\vc_dll\wxmswuniv291u_stc_vc_custom.pdb"\r
                                 TargetMachine="1"\r
+                               OptimizeReferences="2"\r
+                               EnableCOMDATFolding="2"\r
                         />\r
                         <Tool\r
                                 Name="VCALinkTool"\r
diff --git a/build/msw/wx_vc8_xml.vcproj b/build/msw/wx_vc8_xml.vcproj

index 0eaf84bb7b0f46fe35a687bcc0619b705b635cff..04cc1b42e155cc1b3520f93381cc3559f63d2488 100644 (file)
--- a/build/msw/wx_vc8_xml.vcproj
+++ b/build/msw/wx_vc8_xml.vcproj
@@ -510,7 +510,7 @@
                                 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 ..\..\lib\vc_dll\wxbase29u.lib"\r
                                 OutputFile="..\..\lib\vc_dll\wxbase291u_xml_vc_custom.dll"\r
-                               LinkIncremental="2"\r
+                               LinkIncremental="1"\r
                                 ImportLibrary="..\..\lib\vc_dll\wxbase29u_xml.lib"\r
                                 SuppressStartupBanner="true"\r
                                 AdditionalLibraryDirectories="..\..\lib\vc_dll"\r
@@ -518,6 +518,8 @@
                                 GenerateDebugInformation="true"\r
                                 ProgramDatabaseFile="..\..\lib\vc_dll\wxbase291u_xml_vc_custom.pdb"\r
                                 TargetMachine="1"\r
+                               OptimizeReferences="2"\r
+                               EnableCOMDATFolding="2"\r
                         />\r
                         <Tool\r
                                 Name="VCALinkTool"\r
@@ -695,7 +697,7 @@
                                 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 ..\..\lib\vc_dll\wxbase29u.lib"\r
                                 OutputFile="..\..\lib\vc_dll\wxbase291u_xml_vc_custom.dll"\r
-                               LinkIncremental="2"\r
+                               LinkIncremental="1"\r
                                 ImportLibrary="..\..\lib\vc_dll\wxbase29u_xml.lib"\r
                                 SuppressStartupBanner="true"\r
                                 AdditionalLibraryDirectories="..\..\lib\vc_dll"\r
@@ -703,6 +705,8 @@
                                 GenerateDebugInformation="true"\r
                                 ProgramDatabaseFile="..\..\lib\vc_dll\wxbase291u_xml_vc_custom.pdb"\r
                                 TargetMachine="1"\r
+                               OptimizeReferences="2"\r
+                               EnableCOMDATFolding="2"\r
                         />\r
                         <Tool\r
                                 Name="VCALinkTool"\r
diff --git a/build/msw/wx_vc8_xrc.vcproj b/build/msw/wx_vc8_xrc.vcproj

index c2820001dcc8b5f84cea1a75c59b5f8ec06e971d..27bdf9deff41c8b7e32e29ebbda8255ddec4ad6a 100644 (file)
--- a/build/msw/wx_vc8_xrc.vcproj
+++ b/build/msw/wx_vc8_xrc.vcproj
@@ -510,7 +510,7 @@
                                 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_html.lib ..\..\lib\vc_dll\wxmsw29u_adv.lib ..\..\lib\vc_dll\wxmsw29u_core.lib ..\..\lib\vc_dll\wxbase29u_xml.lib ..\..\lib\vc_dll\wxbase29u.lib"\r
                                 OutputFile="..\..\lib\vc_dll\wxmsw291u_xrc_vc_custom.dll"\r
-                               LinkIncremental="2"\r
+                               LinkIncremental="1"\r
                                 ImportLibrary="..\..\lib\vc_dll\wxmsw29u_xrc.lib"\r
                                 SuppressStartupBanner="true"\r
                                 AdditionalLibraryDirectories="..\..\lib\vc_dll"\r
@@ -518,6 +518,8 @@
                                 GenerateDebugInformation="true"\r
                                 ProgramDatabaseFile="..\..\lib\vc_dll\wxmsw291u_xrc_vc_custom.pdb"\r
                                 TargetMachine="1"\r
+                               OptimizeReferences="2"\r
+                               EnableCOMDATFolding="2"\r
                         />\r
                         <Tool\r
                                 Name="VCALinkTool"\r
@@ -695,7 +697,7 @@
                                 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_html.lib ..\..\lib\vc_dll\wxmswuniv29u_adv.lib ..\..\lib\vc_dll\wxmswuniv29u_core.lib ..\..\lib\vc_dll\wxbase29u_xml.lib ..\..\lib\vc_dll\wxbase29u.lib"\r
                                 OutputFile="..\..\lib\vc_dll\wxmswuniv291u_xrc_vc_custom.dll"\r
-                               LinkIncremental="2"\r
+                               LinkIncremental="1"\r
                                 ImportLibrary="..\..\lib\vc_dll\wxmswuniv29u_xrc.lib"\r
                                 SuppressStartupBanner="true"\r
                                 AdditionalLibraryDirectories="..\..\lib\vc_dll"\r
@@ -703,6 +705,8 @@
                                 GenerateDebugInformation="true"\r
                                 ProgramDatabaseFile="..\..\lib\vc_dll\wxmswuniv291u_xrc_vc_custom.pdb"\r
                                 TargetMachine="1"\r
+                               OptimizeReferences="2"\r
+                               EnableCOMDATFolding="2"\r
                         />\r
                         <Tool\r
                                 Name="VCALinkTool"\r
diff --git a/build/msw/wx_vc9_adv.vcproj b/build/msw/wx_vc9_adv.vcproj

index 0828623f0317c6bc47dd39402c89d6dccb5fb665..db8f487f8399f081459db8cc33149d335dff4d99 100644 (file)
--- a/build/msw/wx_vc9_adv.vcproj
+++ b/build/msw/wx_vc9_adv.vcproj
@@ -43,7 +43,7 @@
                                 Name="VCWebServiceProxyGeneratorTool"\r
                         />\r
                         <Tool\r
-                               Name="VCIDLTool"\r
+                               Name="VCMIDLTool"\r
                                 PreprocessorDefinitions="WIN32;_LIB;_DEBUG;__WXMSW__;_UNICODE;WXBUILDING"\r
                                 AdditionalIncludeDirectories="..\..\lib\vc_lib\mswud;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib"\r
                         />\r
@@ -127,7 +127,7 @@
                                 Name="VCWebServiceProxyGeneratorTool"\r
                         />\r
                         <Tool\r
-                               Name="VCIDLTool"\r
+                               Name="VCMIDLTool"\r
                                 PreprocessorDefinitions="WIN32;_LIB;__WXMSW__;_UNICODE;WXBUILDING"\r
                                 AdditionalIncludeDirectories="..\..\lib\vc_lib\mswu;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib"\r
                         />\r
@@ -209,7 +209,7 @@
                                 Name="VCWebServiceProxyGeneratorTool"\r
                         />\r
                         <Tool\r
-                               Name="VCIDLTool"\r
+                               Name="VCMIDLTool"\r
                                 PreprocessorDefinitions="WIN32;_LIB;_DEBUG;__WXMSW__;__WXUNIVERSAL__;_UNICODE;WXBUILDING"\r
                                 AdditionalIncludeDirectories="..\..\lib\vc_lib\mswunivud;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib"\r
                         />\r
@@ -293,7 +293,7 @@
                                 Name="VCWebServiceProxyGeneratorTool"\r
                         />\r
                         <Tool\r
-                               Name="VCIDLTool"\r
+                               Name="VCMIDLTool"\r
                                 PreprocessorDefinitions="WIN32;_LIB;__WXMSW__;__WXUNIVERSAL__;_UNICODE;WXBUILDING"\r
                                 AdditionalIncludeDirectories="..\..\lib\vc_lib\mswunivu;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib"\r
                         />\r
@@ -375,7 +375,7 @@
                                 Name="VCWebServiceProxyGeneratorTool"\r
                         />\r
                         <Tool\r
-                               Name="VCIDLTool"\r
+                               Name="VCMIDLTool"\r
                                 PreprocessorDefinitions="WIN32;_USRDLL;DLL_EXPORTS;_DEBUG;__WXMSW__;_UNICODE;WXBUILDING;WXUSINGDLL;WXMAKINGDLL_ADV"\r
                                 AdditionalIncludeDirectories="..\..\lib\vc_dll\mswud;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib"\r
                         />\r
@@ -468,7 +468,7 @@
                                 Name="VCWebServiceProxyGeneratorTool"\r
                         />\r
                         <Tool\r
-                               Name="VCIDLTool"\r
+                               Name="VCMIDLTool"\r
                                 PreprocessorDefinitions="WIN32;_USRDLL;DLL_EXPORTS;__WXMSW__;_UNICODE;WXBUILDING;WXUSINGDLL;WXMAKINGDLL_ADV"\r
                                 AdditionalIncludeDirectories="..\..\lib\vc_dll\mswu;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib"\r
                         />\r
@@ -507,7 +507,7 @@
                                 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
@@ -515,6 +515,8 @@
                                 GenerateDebugInformation="true"\r
                                 ProgramDatabaseFile="..\..\lib\vc_dll\wxmsw291u_adv_vc_custom.pdb"\r
                                 TargetMachine="1"\r
+                               OptimizeReferences="2"\r
+                               EnableCOMDATFolding="2"\r
                         />\r
                         <Tool\r
                                 Name="VCALinkTool"\r
@@ -559,7 +561,7 @@
                                 Name="VCWebServiceProxyGeneratorTool"\r
                         />\r
                         <Tool\r
-                               Name="VCIDLTool"\r
+                               Name="VCMIDLTool"\r
                                 PreprocessorDefinitions="WIN32;_USRDLL;DLL_EXPORTS;_DEBUG;__WXMSW__;__WXUNIVERSAL__;_UNICODE;WXBUILDING;WXUSINGDLL;WXMAKINGDLL_ADV"\r
                                 AdditionalIncludeDirectories="..\..\lib\vc_dll\mswunivud;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib"\r
                         />\r
@@ -652,7 +654,7 @@
                                 Name="VCWebServiceProxyGeneratorTool"\r
                         />\r
                         <Tool\r
-                               Name="VCIDLTool"\r
+                               Name="VCMIDLTool"\r
                                 PreprocessorDefinitions="WIN32;_USRDLL;DLL_EXPORTS;__WXMSW__;__WXUNIVERSAL__;_UNICODE;WXBUILDING;WXUSINGDLL;WXMAKINGDLL_ADV"\r
                                 AdditionalIncludeDirectories="..\..\lib\vc_dll\mswunivu;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib"\r
                         />\r
@@ -691,7 +693,7 @@
                                 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
@@ -699,6 +701,8 @@
                                 GenerateDebugInformation="true"\r
                                 ProgramDatabaseFile="..\..\lib\vc_dll\wxmswuniv291u_adv_vc_custom.pdb"\r
                                 TargetMachine="1"\r
+                               OptimizeReferences="2"\r
+                               EnableCOMDATFolding="2"\r
                         />\r
                         <Tool\r
                                 Name="VCALinkTool"\r
@@ -1005,10 +1009,10 @@
                                 >\r
                         </File>\r
                         <File\r
-                               RelativePath="..\..\src\generic\infobar.cpp"
-                               >
-                       </File>
-                       <File
+                               RelativePath="..\..\src\generic\infobar.cpp"\r
+                               >\r
+                       </File>\r
+                       <File\r
                                 RelativePath="..\..\src\generic\laywin.cpp"\r
                                 >\r
                         </File>\r
@@ -1344,10 +1348,10 @@
                                 >\r
                         </File>\r
                         <File\r
-                               RelativePath="..\..\include\wx\generic\infobar.h"
-                               >
-                       </File>
-                       <File
+                               RelativePath="..\..\include\wx\generic\infobar.h"\r
+                               >\r
+                       </File>\r
+                       <File\r
                                 RelativePath="..\..\include\wx\generic\laywin.h"\r
                                 >\r
                         </File>\r
@@ -1421,10 +1425,10 @@
                                 >\r
                         </File>\r
                         <File\r
-                               RelativePath="..\..\include\wx\infobar.h"
-                               >
-                       </File>
-                       <File
+                               RelativePath="..\..\include\wx\infobar.h"\r
+                               >\r
+                       </File>\r
+                       <File\r
                                 RelativePath="..\..\include\wx\joystick.h"\r
                                 >\r
                         </File>\r
diff --git a/build/msw/wx_vc9_aui.vcproj b/build/msw/wx_vc9_aui.vcproj

index 13764f1e00ee7e3cb7b3e6dfeeed73b28b4b977d..7f8bb34fe31001464fbdfd4565bf436412cf7acb 100644 (file)
--- a/build/msw/wx_vc9_aui.vcproj
+++ b/build/msw/wx_vc9_aui.vcproj
@@ -43,7 +43,7 @@
                                 Name="VCWebServiceProxyGeneratorTool"\r
                         />\r
                         <Tool\r
-                               Name="VCIDLTool"\r
+                               Name="VCMIDLTool"\r
                                 PreprocessorDefinitions="WIN32;_LIB;_DEBUG;__WXMSW__;_UNICODE;WXBUILDING"\r
                                 AdditionalIncludeDirectories="..\..\lib\vc_lib\mswud;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib"\r
                         />\r
@@ -127,7 +127,7 @@
                                 Name="VCWebServiceProxyGeneratorTool"\r
                         />\r
                         <Tool\r
-                               Name="VCIDLTool"\r
+                               Name="VCMIDLTool"\r
                                 PreprocessorDefinitions="WIN32;_LIB;__WXMSW__;_UNICODE;WXBUILDING"\r
                                 AdditionalIncludeDirectories="..\..\lib\vc_lib\mswu;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib"\r
                         />\r
@@ -209,7 +209,7 @@
                                 Name="VCWebServiceProxyGeneratorTool"\r
                         />\r
                         <Tool\r
-                               Name="VCIDLTool"\r
+                               Name="VCMIDLTool"\r
                                 PreprocessorDefinitions="WIN32;_LIB;_DEBUG;__WXMSW__;__WXUNIVERSAL__;_UNICODE;WXBUILDING"\r
                                 AdditionalIncludeDirectories="..\..\lib\vc_lib\mswunivud;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib"\r
                         />\r
@@ -293,7 +293,7 @@
                                 Name="VCWebServiceProxyGeneratorTool"\r
                         />\r
                         <Tool\r
-                               Name="VCIDLTool"\r
+                               Name="VCMIDLTool"\r
                                 PreprocessorDefinitions="WIN32;_LIB;__WXMSW__;__WXUNIVERSAL__;_UNICODE;WXBUILDING"\r
                                 AdditionalIncludeDirectories="..\..\lib\vc_lib\mswunivu;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib"\r
                         />\r
@@ -375,7 +375,7 @@
                                 Name="VCWebServiceProxyGeneratorTool"\r
                         />\r
                         <Tool\r
-                               Name="VCIDLTool"\r
+                               Name="VCMIDLTool"\r
                                 PreprocessorDefinitions="WIN32;_USRDLL;DLL_EXPORTS;_DEBUG;__WXMSW__;_UNICODE;WXBUILDING;WXUSINGDLL;WXMAKINGDLL_AUI"\r
                                 AdditionalIncludeDirectories="..\..\lib\vc_dll\mswud;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib"\r
                         />\r
@@ -468,7 +468,7 @@
                                 Name="VCWebServiceProxyGeneratorTool"\r
                         />\r
                         <Tool\r
-                               Name="VCIDLTool"\r
+                               Name="VCMIDLTool"\r
                                 PreprocessorDefinitions="WIN32;_USRDLL;DLL_EXPORTS;__WXMSW__;_UNICODE;WXBUILDING;WXUSINGDLL;WXMAKINGDLL_AUI"\r
                                 AdditionalIncludeDirectories="..\..\lib\vc_dll\mswu;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib"\r
                         />\r
@@ -507,7 +507,7 @@
                                 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_adv.lib ..\..\lib\vc_dll\wxmsw29u_core.lib ..\..\lib\vc_dll\wxbase29u.lib"\r
                                 OutputFile="..\..\lib\vc_dll\wxmsw291u_aui_vc_custom.dll"\r
-                               LinkIncremental="2"\r
+                               LinkIncremental="1"\r
                                 ImportLibrary="..\..\lib\vc_dll\wxmsw29u_aui.lib"\r
                                 SuppressStartupBanner="true"\r
                                 AdditionalLibraryDirectories="..\..\lib\vc_dll"\r
@@ -515,6 +515,8 @@
                                 GenerateDebugInformation="true"\r
                                 ProgramDatabaseFile="..\..\lib\vc_dll\wxmsw291u_aui_vc_custom.pdb"\r
                                 TargetMachine="1"\r
+                               OptimizeReferences="2"\r
+                               EnableCOMDATFolding="2"\r
                         />\r
                         <Tool\r
                                 Name="VCALinkTool"\r
@@ -559,7 +561,7 @@
                                 Name="VCWebServiceProxyGeneratorTool"\r
                         />\r
                         <Tool\r
-                               Name="VCIDLTool"\r
+                               Name="VCMIDLTool"\r
                                 PreprocessorDefinitions="WIN32;_USRDLL;DLL_EXPORTS;_DEBUG;__WXMSW__;__WXUNIVERSAL__;_UNICODE;WXBUILDING;WXUSINGDLL;WXMAKINGDLL_AUI"\r
                                 AdditionalIncludeDirectories="..\..\lib\vc_dll\mswunivud;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib"\r
                         />\r
@@ -652,7 +654,7 @@
                                 Name="VCWebServiceProxyGeneratorTool"\r
                         />\r
                         <Tool\r
-                               Name="VCIDLTool"\r
+                               Name="VCMIDLTool"\r
                                 PreprocessorDefinitions="WIN32;_USRDLL;DLL_EXPORTS;__WXMSW__;__WXUNIVERSAL__;_UNICODE;WXBUILDING;WXUSINGDLL;WXMAKINGDLL_AUI"\r
                                 AdditionalIncludeDirectories="..\..\lib\vc_dll\mswunivu;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib"\r
                         />\r
@@ -691,7 +693,7 @@
                                 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_adv.lib ..\..\lib\vc_dll\wxmswuniv29u_core.lib ..\..\lib\vc_dll\wxbase29u.lib"\r
                                 OutputFile="..\..\lib\vc_dll\wxmswuniv291u_aui_vc_custom.dll"\r
-                               LinkIncremental="2"\r
+                               LinkIncremental="1"\r
                                 ImportLibrary="..\..\lib\vc_dll\wxmswuniv29u_aui.lib"\r
                                 SuppressStartupBanner="true"\r
                                 AdditionalLibraryDirectories="..\..\lib\vc_dll"\r
@@ -699,6 +701,8 @@
                                 GenerateDebugInformation="true"\r
                                 ProgramDatabaseFile="..\..\lib\vc_dll\wxmswuniv291u_aui_vc_custom.pdb"\r
                                 TargetMachine="1"\r
+                               OptimizeReferences="2"\r
+                               EnableCOMDATFolding="2"\r
                         />\r
                         <Tool\r
                                 Name="VCALinkTool"\r
diff --git a/build/msw/wx_vc9_base.vcproj b/build/msw/wx_vc9_base.vcproj

index c5af22ed92453ca31dea0024be9e5fad99c5832d..4f865ca92850c35b5a0c314352aaa662a6391123 100644 (file)
--- a/build/msw/wx_vc9_base.vcproj
+++ b/build/msw/wx_vc9_base.vcproj
@@ -43,7 +43,7 @@
                                 Name="VCWebServiceProxyGeneratorTool"\r
                         />\r
                         <Tool\r
-                               Name="VCIDLTool"\r
+                               Name="VCMIDLTool"\r
                                 PreprocessorDefinitions="WIN32;_LIB;_DEBUG;__WXMSW__;_UNICODE;WXBUILDING;wxUSE_GUI=0;wxUSE_BASE=1"\r
                                 AdditionalIncludeDirectories="..\..\lib\vc_lib\mswud;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib"\r
                         />\r
@@ -127,7 +127,7 @@
                                 Name="VCWebServiceProxyGeneratorTool"\r
                         />\r
                         <Tool\r
-                               Name="VCIDLTool"\r
+                               Name="VCMIDLTool"\r
                                 PreprocessorDefinitions="WIN32;_LIB;__WXMSW__;_UNICODE;WXBUILDING;wxUSE_GUI=0;wxUSE_BASE=1"\r
                                 AdditionalIncludeDirectories="..\..\lib\vc_lib\mswu;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib"\r
                         />\r
@@ -209,7 +209,7 @@
                                 Name="VCWebServiceProxyGeneratorTool"\r
                         />\r
                         <Tool\r
-                               Name="VCIDLTool"\r
+                               Name="VCMIDLTool"\r
                                 PreprocessorDefinitions="WIN32;_LIB;_DEBUG;__WXMSW__;__WXUNIVERSAL__;_UNICODE;WXBUILDING;wxUSE_GUI=0;wxUSE_BASE=1"\r
                                 AdditionalIncludeDirectories="..\..\lib\vc_lib\mswunivud;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib"\r
                         />\r
@@ -293,7 +293,7 @@
                                 Name="VCWebServiceProxyGeneratorTool"\r
                         />\r
                         <Tool\r
-                               Name="VCIDLTool"\r
+                               Name="VCMIDLTool"\r
                                 PreprocessorDefinitions="WIN32;_LIB;__WXMSW__;__WXUNIVERSAL__;_UNICODE;WXBUILDING;wxUSE_GUI=0;wxUSE_BASE=1"\r
                                 AdditionalIncludeDirectories="..\..\lib\vc_lib\mswunivu;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib"\r
                         />\r
@@ -375,7 +375,7 @@
                                 Name="VCWebServiceProxyGeneratorTool"\r
                         />\r
                         <Tool\r
-                               Name="VCIDLTool"\r
+                               Name="VCMIDLTool"\r
                                 PreprocessorDefinitions="WIN32;_USRDLL;DLL_EXPORTS;_DEBUG;__WXMSW__;_UNICODE;WXBUILDING;wxUSE_GUI=0;WXMAKINGDLL_BASE;wxUSE_BASE=1"\r
                                 AdditionalIncludeDirectories="..\..\lib\vc_dll\mswud;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib"\r
                         />\r
@@ -468,7 +468,7 @@
                                 Name="VCWebServiceProxyGeneratorTool"\r
                         />\r
                         <Tool\r
-                               Name="VCIDLTool"\r
+                               Name="VCMIDLTool"\r
                                 PreprocessorDefinitions="WIN32;_USRDLL;DLL_EXPORTS;__WXMSW__;_UNICODE;WXBUILDING;wxUSE_GUI=0;WXMAKINGDLL_BASE;wxUSE_BASE=1"\r
                                 AdditionalIncludeDirectories="..\..\lib\vc_dll\mswu;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib"\r
                         />\r
@@ -507,7 +507,7 @@
                                 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"\r
                                 OutputFile="..\..\lib\vc_dll\wxbase291u_vc_custom.dll"\r
-                               LinkIncremental="2"\r
+                               LinkIncremental="1"\r
                                 ImportLibrary="..\..\lib\vc_dll\wxbase29u.lib"\r
                                 SuppressStartupBanner="true"\r
                                 AdditionalLibraryDirectories="..\..\lib\vc_dll"\r
@@ -515,6 +515,8 @@
                                 GenerateDebugInformation="true"\r
                                 ProgramDatabaseFile="..\..\lib\vc_dll\wxbase291u_vc_custom.pdb"\r
                                 TargetMachine="1"\r
+                               OptimizeReferences="2"\r
+                               EnableCOMDATFolding="2"\r
                         />\r
                         <Tool\r
                                 Name="VCALinkTool"\r
@@ -559,7 +561,7 @@
                                 Name="VCWebServiceProxyGeneratorTool"\r
                         />\r
                         <Tool\r
-                               Name="VCIDLTool"\r
+                               Name="VCMIDLTool"\r
                                 PreprocessorDefinitions="WIN32;_USRDLL;DLL_EXPORTS;_DEBUG;__WXMSW__;__WXUNIVERSAL__;_UNICODE;WXBUILDING;wxUSE_GUI=0;WXMAKINGDLL_BASE;wxUSE_BASE=1"\r
                                 AdditionalIncludeDirectories="..\..\lib\vc_dll\mswunivud;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib"\r
                         />\r
@@ -652,7 +654,7 @@
                                 Name="VCWebServiceProxyGeneratorTool"\r
                         />\r
                         <Tool\r
-                               Name="VCIDLTool"\r
+                               Name="VCMIDLTool"\r
                                 PreprocessorDefinitions="WIN32;_USRDLL;DLL_EXPORTS;__WXMSW__;__WXUNIVERSAL__;_UNICODE;WXBUILDING;wxUSE_GUI=0;WXMAKINGDLL_BASE;wxUSE_BASE=1"\r
                                 AdditionalIncludeDirectories="..\..\lib\vc_dll\mswunivu;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib"\r
                         />\r
@@ -691,7 +693,7 @@
                                 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"\r
                                 OutputFile="..\..\lib\vc_dll\wxbase291u_vc_custom.dll"\r
-                               LinkIncremental="2"\r
+                               LinkIncremental="1"\r
                                 ImportLibrary="..\..\lib\vc_dll\wxbase29u.lib"\r
                                 SuppressStartupBanner="true"\r
                                 AdditionalLibraryDirectories="..\..\lib\vc_dll"\r
@@ -699,6 +701,8 @@
                                 GenerateDebugInformation="true"\r
                                 ProgramDatabaseFile="..\..\lib\vc_dll\wxbase291u_vc_custom.pdb"\r
                                 TargetMachine="1"\r
+                               OptimizeReferences="2"\r
+                               EnableCOMDATFolding="2"\r
                         />\r
                         <Tool\r
                                 Name="VCALinkTool"\r
diff --git a/build/msw/wx_vc9_core.vcproj b/build/msw/wx_vc9_core.vcproj

index 2f038474de97fa4609547d34b1b466c1b0d5fd45..0ecb9c7253a39057def4ea35612ac4dd0630ee76 100644 (file)
--- a/build/msw/wx_vc9_core.vcproj
+++ b/build/msw/wx_vc9_core.vcproj
@@ -43,7 +43,7 @@
                                 Name="VCWebServiceProxyGeneratorTool"\r
                         />\r
                         <Tool\r
-                               Name="VCIDLTool"\r
+                               Name="VCMIDLTool"\r
                                 PreprocessorDefinitions="WIN32;_LIB;_DEBUG;__WXMSW__;_UNICODE;WXBUILDING;wxUSE_BASE=0"\r
                                 AdditionalIncludeDirectories="..\..\lib\vc_lib\mswud;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib"\r
                         />\r
@@ -127,7 +127,7 @@
                                 Name="VCWebServiceProxyGeneratorTool"\r
                         />\r
                         <Tool\r
-                               Name="VCIDLTool"\r
+                               Name="VCMIDLTool"\r
                                 PreprocessorDefinitions="WIN32;_LIB;__WXMSW__;_UNICODE;WXBUILDING;wxUSE_BASE=0"\r
                                 AdditionalIncludeDirectories="..\..\lib\vc_lib\mswu;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib"\r
                         />\r
@@ -209,7 +209,7 @@
                                 Name="VCWebServiceProxyGeneratorTool"\r
                         />\r
                         <Tool\r
-                               Name="VCIDLTool"\r
+                               Name="VCMIDLTool"\r
                                 PreprocessorDefinitions="WIN32;_LIB;_DEBUG;__WXMSW__;__WXUNIVERSAL__;_UNICODE;WXBUILDING;wxUSE_BASE=0"\r
                                 AdditionalIncludeDirectories="..\..\lib\vc_lib\mswunivud;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib"\r
                         />\r
@@ -293,7 +293,7 @@
                                 Name="VCWebServiceProxyGeneratorTool"\r
                         />\r
                         <Tool\r
-                               Name="VCIDLTool"\r
+                               Name="VCMIDLTool"\r
                                 PreprocessorDefinitions="WIN32;_LIB;__WXMSW__;__WXUNIVERSAL__;_UNICODE;WXBUILDING;wxUSE_BASE=0"\r
                                 AdditionalIncludeDirectories="..\..\lib\vc_lib\mswunivu;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib"\r
                         />\r
@@ -375,7 +375,7 @@
                                 Name="VCWebServiceProxyGeneratorTool"\r
                         />\r
                         <Tool\r
-                               Name="VCIDLTool"\r
+                               Name="VCMIDLTool"\r
                                 PreprocessorDefinitions="WIN32;_USRDLL;DLL_EXPORTS;_DEBUG;__WXMSW__;_UNICODE;WXBUILDING;WXUSINGDLL;WXMAKINGDLL_CORE;wxUSE_BASE=0"\r
                                 AdditionalIncludeDirectories="..\..\lib\vc_dll\mswud;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib"\r
                         />\r
@@ -468,7 +468,7 @@
                                 Name="VCWebServiceProxyGeneratorTool"\r
                         />\r
                         <Tool\r
-                               Name="VCIDLTool"\r
+                               Name="VCMIDLTool"\r
                                 PreprocessorDefinitions="WIN32;_USRDLL;DLL_EXPORTS;__WXMSW__;_UNICODE;WXBUILDING;WXUSINGDLL;WXMAKINGDLL_CORE;wxUSE_BASE=0"\r
                                 AdditionalIncludeDirectories="..\..\lib\vc_dll\mswu;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib"\r
                         />\r
@@ -507,7 +507,7 @@
                                 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\wxbase29u.lib"\r
                                 OutputFile="..\..\lib\vc_dll\wxmsw291u_core_vc_custom.dll"\r
-                               LinkIncremental="2"\r
+                               LinkIncremental="1"\r
                                 ImportLibrary="..\..\lib\vc_dll\wxmsw29u_core.lib"\r
                                 SuppressStartupBanner="true"\r
                                 AdditionalLibraryDirectories="..\..\lib\vc_dll"\r
@@ -515,6 +515,8 @@
                                 GenerateDebugInformation="true"\r
                                 ProgramDatabaseFile="..\..\lib\vc_dll\wxmsw291u_core_vc_custom.pdb"\r
                                 TargetMachine="1"\r
+                               OptimizeReferences="2"\r
+                               EnableCOMDATFolding="2"\r
                         />\r
                         <Tool\r
                                 Name="VCALinkTool"\r
@@ -559,7 +561,7 @@
                                 Name="VCWebServiceProxyGeneratorTool"\r
                         />\r
                         <Tool\r
-                               Name="VCIDLTool"\r
+                               Name="VCMIDLTool"\r
                                 PreprocessorDefinitions="WIN32;_USRDLL;DLL_EXPORTS;_DEBUG;__WXMSW__;__WXUNIVERSAL__;_UNICODE;WXBUILDING;WXUSINGDLL;WXMAKINGDLL_CORE;wxUSE_BASE=0"\r
                                 AdditionalIncludeDirectories="..\..\lib\vc_dll\mswunivud;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib"\r
                         />\r
@@ -652,7 +654,7 @@
                                 Name="VCWebServiceProxyGeneratorTool"\r
                         />\r
                         <Tool\r
-                               Name="VCIDLTool"\r
+                               Name="VCMIDLTool"\r
                                 PreprocessorDefinitions="WIN32;_USRDLL;DLL_EXPORTS;__WXMSW__;__WXUNIVERSAL__;_UNICODE;WXBUILDING;WXUSINGDLL;WXMAKINGDLL_CORE;wxUSE_BASE=0"\r
                                 AdditionalIncludeDirectories="..\..\lib\vc_dll\mswunivu;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib"\r
                         />\r
@@ -691,7 +693,7 @@
                                 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\wxbase29u.lib"\r
                                 OutputFile="..\..\lib\vc_dll\wxmswuniv291u_core_vc_custom.dll"\r
-                               LinkIncremental="2"\r
+                               LinkIncremental="1"\r
                                 ImportLibrary="..\..\lib\vc_dll\wxmswuniv29u_core.lib"\r
                                 SuppressStartupBanner="true"\r
                                 AdditionalLibraryDirectories="..\..\lib\vc_dll"\r
@@ -699,6 +701,8 @@
                                 GenerateDebugInformation="true"\r
                                 ProgramDatabaseFile="..\..\lib\vc_dll\wxmswuniv291u_core_vc_custom.pdb"\r
                                 TargetMachine="1"\r
+                               OptimizeReferences="2"\r
+                               EnableCOMDATFolding="2"\r
                         />\r
                         <Tool\r
                                 Name="VCALinkTool"\r
@@ -6157,10 +6161,10 @@
                                 >\r
                         </File>\r
                         <File\r
-                               RelativePath="..\..\include\wx\generic\infobar.h"
-                               >
-                       </File>
-                       <File
+                               RelativePath="..\..\include\wx\generic\infobar.h"\r
+                               >\r
+                       </File>\r
+                       <File\r
                                 RelativePath="..\..\include\wx\generic\laywin.h"\r
                                 >\r
                         </File>\r
@@ -6956,10 +6960,10 @@
                                 >\r
                         </File>\r
                         <File\r
-                               RelativePath="..\..\include\wx\infobar.h"
-                               >
-                       </File>
-                       <File
+                               RelativePath="..\..\include\wx\infobar.h"\r
+                               >\r
+                       </File>\r
+                       <File\r
                                 RelativePath="..\..\include\wx\joystick.h"\r
                                 >\r
                         </File>\r
diff --git a/build/msw/wx_vc9_gl.vcproj b/build/msw/wx_vc9_gl.vcproj

index fbce2a7ce68aa7883e5b8f9f0141dcfe411202f0..df5870a6b9ffd32c58c7ab7d87e777b047d95cca 100644 (file)
--- a/build/msw/wx_vc9_gl.vcproj
+++ b/build/msw/wx_vc9_gl.vcproj
@@ -43,7 +43,7 @@
                                 Name="VCWebServiceProxyGeneratorTool"\r
                         />\r
                         <Tool\r
-                               Name="VCIDLTool"\r
+                               Name="VCMIDLTool"\r
                                 PreprocessorDefinitions="WIN32;_LIB;_DEBUG;__WXMSW__;_UNICODE;WXBUILDING"\r
                                 AdditionalIncludeDirectories="..\..\lib\vc_lib\mswud;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib"\r
                         />\r
@@ -127,7 +127,7 @@
                                 Name="VCWebServiceProxyGeneratorTool"\r
                         />\r
                         <Tool\r
-                               Name="VCIDLTool"\r
+                               Name="VCMIDLTool"\r
                                 PreprocessorDefinitions="WIN32;_LIB;__WXMSW__;_UNICODE;WXBUILDING"\r
                                 AdditionalIncludeDirectories="..\..\lib\vc_lib\mswu;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib"\r
                         />\r
@@ -209,7 +209,7 @@
                                 Name="VCWebServiceProxyGeneratorTool"\r
                         />\r
                         <Tool\r
-                               Name="VCIDLTool"\r
+                               Name="VCMIDLTool"\r
                                 PreprocessorDefinitions="WIN32;_LIB;_DEBUG;__WXMSW__;__WXUNIVERSAL__;_UNICODE;WXBUILDING"\r
                                 AdditionalIncludeDirectories="..\..\lib\vc_lib\mswunivud;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib"\r
                         />\r
@@ -293,7 +293,7 @@
                                 Name="VCWebServiceProxyGeneratorTool"\r
                         />\r
                         <Tool\r
-                               Name="VCIDLTool"\r
+                               Name="VCMIDLTool"\r
                                 PreprocessorDefinitions="WIN32;_LIB;__WXMSW__;__WXUNIVERSAL__;_UNICODE;WXBUILDING"\r
                                 AdditionalIncludeDirectories="..\..\lib\vc_lib\mswunivu;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib"\r
                         />\r
@@ -375,7 +375,7 @@
                                 Name="VCWebServiceProxyGeneratorTool"\r
                         />\r
                         <Tool\r
-                               Name="VCIDLTool"\r
+                               Name="VCMIDLTool"\r
                                 PreprocessorDefinitions="WIN32;_USRDLL;DLL_EXPORTS;_DEBUG;__WXMSW__;_UNICODE;WXBUILDING;WXUSINGDLL;WXMAKINGDLL_GL"\r
                                 AdditionalIncludeDirectories="..\..\lib\vc_dll\mswud;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib"\r
                         />\r
@@ -468,7 +468,7 @@
                                 Name="VCWebServiceProxyGeneratorTool"\r
                         />\r
                         <Tool\r
-                               Name="VCIDLTool"\r
+                               Name="VCMIDLTool"\r
                                 PreprocessorDefinitions="WIN32;_USRDLL;DLL_EXPORTS;__WXMSW__;_UNICODE;WXBUILDING;WXUSINGDLL;WXMAKINGDLL_GL"\r
                                 AdditionalIncludeDirectories="..\..\lib\vc_dll\mswu;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib"\r
                         />\r
@@ -507,7 +507,7 @@
                                 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 wxmsw29u_core.lib wxbase29u.lib  opengl32.lib glu32.lib"\r
                                 OutputFile="..\..\lib\vc_dll\wxmsw291u_gl_vc_custom.dll"\r
-                               LinkIncremental="2"\r
+                               LinkIncremental="1"\r
                                 ImportLibrary="..\..\lib\vc_dll\wxmsw29u_gl.lib"\r
                                 SuppressStartupBanner="true"\r
                                 AdditionalLibraryDirectories="..\..\lib\vc_dll"\r
@@ -515,6 +515,8 @@
                                 GenerateDebugInformation="true"\r
                                 ProgramDatabaseFile="..\..\lib\vc_dll\wxmsw291u_gl_vc_custom.pdb"\r
                                 TargetMachine="1"\r
+                               OptimizeReferences="2"\r
+                               EnableCOMDATFolding="2"\r
                         />\r
                         <Tool\r
                                 Name="VCALinkTool"\r
@@ -559,7 +561,7 @@
                                 Name="VCWebServiceProxyGeneratorTool"\r
                         />\r
                         <Tool\r
-                               Name="VCIDLTool"\r
+                               Name="VCMIDLTool"\r
                                 PreprocessorDefinitions="WIN32;_USRDLL;DLL_EXPORTS;_DEBUG;__WXMSW__;__WXUNIVERSAL__;_UNICODE;WXBUILDING;WXUSINGDLL;WXMAKINGDLL_GL"\r
                                 AdditionalIncludeDirectories="..\..\lib\vc_dll\mswunivud;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib"\r
                         />\r
@@ -652,7 +654,7 @@
                                 Name="VCWebServiceProxyGeneratorTool"\r
                         />\r
                         <Tool\r
-                               Name="VCIDLTool"\r
+                               Name="VCMIDLTool"\r
                                 PreprocessorDefinitions="WIN32;_USRDLL;DLL_EXPORTS;__WXMSW__;__WXUNIVERSAL__;_UNICODE;WXBUILDING;WXUSINGDLL;WXMAKINGDLL_GL"\r
                                 AdditionalIncludeDirectories="..\..\lib\vc_dll\mswunivu;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib"\r
                         />\r
@@ -691,7 +693,7 @@
                                 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 wxmswuniv29u_core.lib wxbase29u.lib  opengl32.lib glu32.lib"\r
                                 OutputFile="..\..\lib\vc_dll\wxmswuniv291u_gl_vc_custom.dll"\r
-                               LinkIncremental="2"\r
+                               LinkIncremental="1"\r
                                 ImportLibrary="..\..\lib\vc_dll\wxmswuniv29u_gl.lib"\r
                                 SuppressStartupBanner="true"\r
                                 AdditionalLibraryDirectories="..\..\lib\vc_dll"\r
@@ -699,6 +701,8 @@
                                 GenerateDebugInformation="true"\r
                                 ProgramDatabaseFile="..\..\lib\vc_dll\wxmswuniv291u_gl_vc_custom.pdb"\r
                                 TargetMachine="1"\r
+                               OptimizeReferences="2"\r
+                               EnableCOMDATFolding="2"\r
                         />\r
                         <Tool\r
                                 Name="VCALinkTool"\r
diff --git a/build/msw/wx_vc9_html.vcproj b/build/msw/wx_vc9_html.vcproj

index 5eeb15c54235f61b36ab98700314bfc9c561ba2e..9c2911553c1523f99fcdfce4c24cb12df54ad6c4 100644 (file)
--- a/build/msw/wx_vc9_html.vcproj
+++ b/build/msw/wx_vc9_html.vcproj
@@ -43,7 +43,7 @@
                                 Name="VCWebServiceProxyGeneratorTool"\r
                         />\r
                         <Tool\r
-                               Name="VCIDLTool"\r
+                               Name="VCMIDLTool"\r
                                 PreprocessorDefinitions="WIN32;_LIB;_DEBUG;__WXMSW__;_UNICODE;WXBUILDING"\r
                                 AdditionalIncludeDirectories="..\..\lib\vc_lib\mswud;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib"\r
                         />\r
@@ -127,7 +127,7 @@
                                 Name="VCWebServiceProxyGeneratorTool"\r
                         />\r
                         <Tool\r
-                               Name="VCIDLTool"\r
+                               Name="VCMIDLTool"\r
                                 PreprocessorDefinitions="WIN32;_LIB;__WXMSW__;_UNICODE;WXBUILDING"\r
                                 AdditionalIncludeDirectories="..\..\lib\vc_lib\mswu;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib"\r
                         />\r
@@ -209,7 +209,7 @@
                                 Name="VCWebServiceProxyGeneratorTool"\r
                         />\r
                         <Tool\r
-                               Name="VCIDLTool"\r
+                               Name="VCMIDLTool"\r
                                 PreprocessorDefinitions="WIN32;_LIB;_DEBUG;__WXMSW__;__WXUNIVERSAL__;_UNICODE;WXBUILDING"\r
                                 AdditionalIncludeDirectories="..\..\lib\vc_lib\mswunivud;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib"\r
                         />\r
@@ -293,7 +293,7 @@
                                 Name="VCWebServiceProxyGeneratorTool"\r
                         />\r
                         <Tool\r
-                               Name="VCIDLTool"\r
+                               Name="VCMIDLTool"\r
                                 PreprocessorDefinitions="WIN32;_LIB;__WXMSW__;__WXUNIVERSAL__;_UNICODE;WXBUILDING"\r
                                 AdditionalIncludeDirectories="..\..\lib\vc_lib\mswunivu;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib"\r
                         />\r
@@ -375,7 +375,7 @@
                                 Name="VCWebServiceProxyGeneratorTool"\r
                         />\r
                         <Tool\r
-                               Name="VCIDLTool"\r
+                               Name="VCMIDLTool"\r
                                 PreprocessorDefinitions="WIN32;_USRDLL;DLL_EXPORTS;_DEBUG;__WXMSW__;_UNICODE;WXBUILDING;WXUSINGDLL;WXMAKINGDLL_HTML"\r
                                 AdditionalIncludeDirectories="..\..\lib\vc_dll\mswud;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib"\r
                         />\r
@@ -468,7 +468,7 @@
                                 Name="VCWebServiceProxyGeneratorTool"\r
                         />\r
                         <Tool\r
-                               Name="VCIDLTool"\r
+                               Name="VCMIDLTool"\r
                                 PreprocessorDefinitions="WIN32;_USRDLL;DLL_EXPORTS;__WXMSW__;_UNICODE;WXBUILDING;WXUSINGDLL;WXMAKINGDLL_HTML"\r
                                 AdditionalIncludeDirectories="..\..\lib\vc_dll\mswu;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib"\r
                         />\r
@@ -507,7 +507,7 @@
                                 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_html_vc_custom.dll"\r
-                               LinkIncremental="2"\r
+                               LinkIncremental="1"\r
                                 ImportLibrary="..\..\lib\vc_dll\wxmsw29u_html.lib"\r
                                 SuppressStartupBanner="true"\r
                                 AdditionalLibraryDirectories="..\..\lib\vc_dll"\r
@@ -515,6 +515,8 @@
                                 GenerateDebugInformation="true"\r
                                 ProgramDatabaseFile="..\..\lib\vc_dll\wxmsw291u_html_vc_custom.pdb"\r
                                 TargetMachine="1"\r
+                               OptimizeReferences="2"\r
+                               EnableCOMDATFolding="2"\r
                         />\r
                         <Tool\r
                                 Name="VCALinkTool"\r
@@ -559,7 +561,7 @@
                                 Name="VCWebServiceProxyGeneratorTool"\r
                         />\r
                         <Tool\r
-                               Name="VCIDLTool"\r
+                               Name="VCMIDLTool"\r
                                 PreprocessorDefinitions="WIN32;_USRDLL;DLL_EXPORTS;_DEBUG;__WXMSW__;__WXUNIVERSAL__;_UNICODE;WXBUILDING;WXUSINGDLL;WXMAKINGDLL_HTML"\r
                                 AdditionalIncludeDirectories="..\..\lib\vc_dll\mswunivud;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib"\r
                         />\r
@@ -652,7 +654,7 @@
                                 Name="VCWebServiceProxyGeneratorTool"\r
                         />\r
                         <Tool\r
-                               Name="VCIDLTool"\r
+                               Name="VCMIDLTool"\r
                                 PreprocessorDefinitions="WIN32;_USRDLL;DLL_EXPORTS;__WXMSW__;__WXUNIVERSAL__;_UNICODE;WXBUILDING;WXUSINGDLL;WXMAKINGDLL_HTML"\r
                                 AdditionalIncludeDirectories="..\..\lib\vc_dll\mswunivu;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib"\r
                         />\r
@@ -691,7 +693,7 @@
                                 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_html_vc_custom.dll"\r
-                               LinkIncremental="2"\r
+                               LinkIncremental="1"\r
                                 ImportLibrary="..\..\lib\vc_dll\wxmswuniv29u_html.lib"\r
                                 SuppressStartupBanner="true"\r
                                 AdditionalLibraryDirectories="..\..\lib\vc_dll"\r
@@ -699,6 +701,8 @@
                                 GenerateDebugInformation="true"\r
                                 ProgramDatabaseFile="..\..\lib\vc_dll\wxmswuniv291u_html_vc_custom.pdb"\r
                                 TargetMachine="1"\r
+                               OptimizeReferences="2"\r
+                               EnableCOMDATFolding="2"\r
                         />\r
                         <Tool\r
                                 Name="VCALinkTool"\r
diff --git a/build/msw/wx_vc9_media.vcproj b/build/msw/wx_vc9_media.vcproj

index 59dfc9ccc7c37b5db786d8cba95722ea71875186..750615ce3ee803e7186f7ab2fd359fc62e1f7a97 100644 (file)
--- a/build/msw/wx_vc9_media.vcproj
+++ b/build/msw/wx_vc9_media.vcproj
@@ -43,7 +43,7 @@
                                 Name="VCWebServiceProxyGeneratorTool"\r
                         />\r
                         <Tool\r
-                               Name="VCIDLTool"\r
+                               Name="VCMIDLTool"\r
                                 PreprocessorDefinitions="WIN32;_LIB;_DEBUG;__WXMSW__;_UNICODE;WXBUILDING"\r
                                 AdditionalIncludeDirectories="..\..\lib\vc_lib\mswud;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib"\r
                         />\r
@@ -127,7 +127,7 @@
                                 Name="VCWebServiceProxyGeneratorTool"\r
                         />\r
                         <Tool\r
-                               Name="VCIDLTool"\r
+                               Name="VCMIDLTool"\r
                                 PreprocessorDefinitions="WIN32;_LIB;__WXMSW__;_UNICODE;WXBUILDING"\r
                                 AdditionalIncludeDirectories="..\..\lib\vc_lib\mswu;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib"\r
                         />\r
@@ -209,7 +209,7 @@
                                 Name="VCWebServiceProxyGeneratorTool"\r
                         />\r
                         <Tool\r
-                               Name="VCIDLTool"\r
+                               Name="VCMIDLTool"\r
                                 PreprocessorDefinitions="WIN32;_LIB;_DEBUG;__WXMSW__;__WXUNIVERSAL__;_UNICODE;WXBUILDING"\r
                                 AdditionalIncludeDirectories="..\..\lib\vc_lib\mswunivud;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib"\r
                         />\r
@@ -293,7 +293,7 @@
                                 Name="VCWebServiceProxyGeneratorTool"\r
                         />\r
                         <Tool\r
-                               Name="VCIDLTool"\r
+                               Name="VCMIDLTool"\r
                                 PreprocessorDefinitions="WIN32;_LIB;__WXMSW__;__WXUNIVERSAL__;_UNICODE;WXBUILDING"\r
                                 AdditionalIncludeDirectories="..\..\lib\vc_lib\mswunivu;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib"\r
                         />\r
@@ -375,7 +375,7 @@
                                 Name="VCWebServiceProxyGeneratorTool"\r
                         />\r
                         <Tool\r
-                               Name="VCIDLTool"\r
+                               Name="VCMIDLTool"\r
                                 PreprocessorDefinitions="WIN32;_USRDLL;DLL_EXPORTS;_DEBUG;__WXMSW__;_UNICODE;WXBUILDING;WXUSINGDLL;WXMAKINGDLL_MEDIA"\r
                                 AdditionalIncludeDirectories="..\..\lib\vc_dll\mswud;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib"\r
                         />\r
@@ -468,7 +468,7 @@
                                 Name="VCWebServiceProxyGeneratorTool"\r
                         />\r
                         <Tool\r
-                               Name="VCIDLTool"\r
+                               Name="VCMIDLTool"\r
                                 PreprocessorDefinitions="WIN32;_USRDLL;DLL_EXPORTS;__WXMSW__;_UNICODE;WXBUILDING;WXUSINGDLL;WXMAKINGDLL_MEDIA"\r
                                 AdditionalIncludeDirectories="..\..\lib\vc_dll\mswu;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib"\r
                         />\r
@@ -507,7 +507,7 @@
                                 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_media_vc_custom.dll"\r
-                               LinkIncremental="2"\r
+                               LinkIncremental="1"\r
                                 ImportLibrary="..\..\lib\vc_dll\wxmsw29u_media.lib"\r
                                 SuppressStartupBanner="true"\r
                                 AdditionalLibraryDirectories="..\..\lib\vc_dll"\r
@@ -515,6 +515,8 @@
                                 GenerateDebugInformation="true"\r
                                 ProgramDatabaseFile="..\..\lib\vc_dll\wxmsw291u_media_vc_custom.pdb"\r
                                 TargetMachine="1"\r
+                               OptimizeReferences="2"\r
+                               EnableCOMDATFolding="2"\r
                         />\r
                         <Tool\r
                                 Name="VCALinkTool"\r
@@ -559,7 +561,7 @@
                                 Name="VCWebServiceProxyGeneratorTool"\r
                         />\r
                         <Tool\r
-                               Name="VCIDLTool"\r
+                               Name="VCMIDLTool"\r
                                 PreprocessorDefinitions="WIN32;_USRDLL;DLL_EXPORTS;_DEBUG;__WXMSW__;__WXUNIVERSAL__;_UNICODE;WXBUILDING;WXUSINGDLL;WXMAKINGDLL_MEDIA"\r
                                 AdditionalIncludeDirectories="..\..\lib\vc_dll\mswunivud;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib"\r
                         />\r
@@ -652,7 +654,7 @@
                                 Name="VCWebServiceProxyGeneratorTool"\r
                         />\r
                         <Tool\r
-                               Name="VCIDLTool"\r
+                               Name="VCMIDLTool"\r
                                 PreprocessorDefinitions="WIN32;_USRDLL;DLL_EXPORTS;__WXMSW__;__WXUNIVERSAL__;_UNICODE;WXBUILDING;WXUSINGDLL;WXMAKINGDLL_MEDIA"\r
                                 AdditionalIncludeDirectories="..\..\lib\vc_dll\mswunivu;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib"\r
                         />\r
@@ -691,7 +693,7 @@
                                 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_media_vc_custom.dll"\r
-                               LinkIncremental="2"\r
+                               LinkIncremental="1"\r
                                 ImportLibrary="..\..\lib\vc_dll\wxmswuniv29u_media.lib"\r
                                 SuppressStartupBanner="true"\r
                                 AdditionalLibraryDirectories="..\..\lib\vc_dll"\r
@@ -699,6 +701,8 @@
                                 GenerateDebugInformation="true"\r
                                 ProgramDatabaseFile="..\..\lib\vc_dll\wxmswuniv291u_media_vc_custom.pdb"\r
                                 TargetMachine="1"\r
+                               OptimizeReferences="2"\r
+                               EnableCOMDATFolding="2"\r
                         />\r
                         <Tool\r
                                 Name="VCALinkTool"\r
diff --git a/build/msw/wx_vc9_net.vcproj b/build/msw/wx_vc9_net.vcproj

index 38e9be6ac200f50d880e224991c537eba163ba63..f6e37bc9845b08899d0cb36baa4b5eddc52d7219 100644 (file)
--- a/build/msw/wx_vc9_net.vcproj
+++ b/build/msw/wx_vc9_net.vcproj
@@ -43,7 +43,7 @@
                                 Name="VCWebServiceProxyGeneratorTool"\r
                         />\r
                         <Tool\r
-                               Name="VCIDLTool"\r
+                               Name="VCMIDLTool"\r
                                 PreprocessorDefinitions="WIN32;_LIB;_DEBUG;__WXMSW__;_UNICODE;WXBUILDING;wxUSE_GUI=0"\r
                                 AdditionalIncludeDirectories="..\..\lib\vc_lib\mswud;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib"\r
                         />\r
@@ -127,7 +127,7 @@
                                 Name="VCWebServiceProxyGeneratorTool"\r
                         />\r
                         <Tool\r
-                               Name="VCIDLTool"\r
+                               Name="VCMIDLTool"\r
                                 PreprocessorDefinitions="WIN32;_LIB;__WXMSW__;_UNICODE;WXBUILDING;wxUSE_GUI=0"\r
                                 AdditionalIncludeDirectories="..\..\lib\vc_lib\mswu;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib"\r
                         />\r
@@ -209,7 +209,7 @@
                                 Name="VCWebServiceProxyGeneratorTool"\r
                         />\r
                         <Tool\r
-                               Name="VCIDLTool"\r
+                               Name="VCMIDLTool"\r
                                 PreprocessorDefinitions="WIN32;_LIB;_DEBUG;__WXMSW__;__WXUNIVERSAL__;_UNICODE;WXBUILDING;wxUSE_GUI=0"\r
                                 AdditionalIncludeDirectories="..\..\lib\vc_lib\mswunivud;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib"\r
                         />\r
@@ -293,7 +293,7 @@
                                 Name="VCWebServiceProxyGeneratorTool"\r
                         />\r
                         <Tool\r
-                               Name="VCIDLTool"\r
+                               Name="VCMIDLTool"\r
                                 PreprocessorDefinitions="WIN32;_LIB;__WXMSW__;__WXUNIVERSAL__;_UNICODE;WXBUILDING;wxUSE_GUI=0"\r
                                 AdditionalIncludeDirectories="..\..\lib\vc_lib\mswunivu;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib"\r
                         />\r
@@ -375,7 +375,7 @@
                                 Name="VCWebServiceProxyGeneratorTool"\r
                         />\r
                         <Tool\r
-                               Name="VCIDLTool"\r
+                               Name="VCMIDLTool"\r
                                 PreprocessorDefinitions="WIN32;_USRDLL;DLL_EXPORTS;_DEBUG;__WXMSW__;_UNICODE;WXBUILDING;wxUSE_GUI=0;WXUSINGDLL;WXMAKINGDLL_NET"\r
                                 AdditionalIncludeDirectories="..\..\lib\vc_dll\mswud;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib"\r
                         />\r
@@ -468,7 +468,7 @@
                                 Name="VCWebServiceProxyGeneratorTool"\r
                         />\r
                         <Tool\r
-                               Name="VCIDLTool"\r
+                               Name="VCMIDLTool"\r
                                 PreprocessorDefinitions="WIN32;_USRDLL;DLL_EXPORTS;__WXMSW__;_UNICODE;WXBUILDING;wxUSE_GUI=0;WXUSINGDLL;WXMAKINGDLL_NET"\r
                                 AdditionalIncludeDirectories="..\..\lib\vc_dll\mswu;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib"\r
                         />\r
@@ -507,7 +507,7 @@
                                 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 ..\..\lib\vc_dll\wxbase29u.lib"\r
                                 OutputFile="..\..\lib\vc_dll\wxbase291u_net_vc_custom.dll"\r
-                               LinkIncremental="2"\r
+                               LinkIncremental="1"\r
                                 ImportLibrary="..\..\lib\vc_dll\wxbase29u_net.lib"\r
                                 SuppressStartupBanner="true"\r
                                 AdditionalLibraryDirectories="..\..\lib\vc_dll"\r
@@ -515,6 +515,8 @@
                                 GenerateDebugInformation="true"\r
                                 ProgramDatabaseFile="..\..\lib\vc_dll\wxbase291u_net_vc_custom.pdb"\r
                                 TargetMachine="1"\r
+                               OptimizeReferences="2"\r
+                               EnableCOMDATFolding="2"\r
                         />\r
                         <Tool\r
                                 Name="VCALinkTool"\r
@@ -559,7 +561,7 @@
                                 Name="VCWebServiceProxyGeneratorTool"\r
                         />\r
                         <Tool\r
-                               Name="VCIDLTool"\r
+                               Name="VCMIDLTool"\r
                                 PreprocessorDefinitions="WIN32;_USRDLL;DLL_EXPORTS;_DEBUG;__WXMSW__;__WXUNIVERSAL__;_UNICODE;WXBUILDING;wxUSE_GUI=0;WXUSINGDLL;WXMAKINGDLL_NET"\r
                                 AdditionalIncludeDirectories="..\..\lib\vc_dll\mswunivud;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib"\r
                         />\r
@@ -652,7 +654,7 @@
                                 Name="VCWebServiceProxyGeneratorTool"\r
                         />\r
                         <Tool\r
-                               Name="VCIDLTool"\r
+                               Name="VCMIDLTool"\r
                                 PreprocessorDefinitions="WIN32;_USRDLL;DLL_EXPORTS;__WXMSW__;__WXUNIVERSAL__;_UNICODE;WXBUILDING;wxUSE_GUI=0;WXUSINGDLL;WXMAKINGDLL_NET"\r
                                 AdditionalIncludeDirectories="..\..\lib\vc_dll\mswunivu;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib"\r
                         />\r
@@ -691,7 +693,7 @@
                                 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 ..\..\lib\vc_dll\wxbase29u.lib"\r
                                 OutputFile="..\..\lib\vc_dll\wxbase291u_net_vc_custom.dll"\r
-                               LinkIncremental="2"\r
+                               LinkIncremental="1"\r
                                 ImportLibrary="..\..\lib\vc_dll\wxbase29u_net.lib"\r
                                 SuppressStartupBanner="true"\r
                                 AdditionalLibraryDirectories="..\..\lib\vc_dll"\r
@@ -699,6 +701,8 @@
                                 GenerateDebugInformation="true"\r
                                 ProgramDatabaseFile="..\..\lib\vc_dll\wxbase291u_net_vc_custom.pdb"\r
                                 TargetMachine="1"\r
+                               OptimizeReferences="2"\r
+                               EnableCOMDATFolding="2"\r
                         />\r
                         <Tool\r
                                 Name="VCALinkTool"\r
diff --git a/build/msw/wx_vc9_propgrid.vcproj b/build/msw/wx_vc9_propgrid.vcproj

index cbad72163770454510a302e48092beb6ffad352a..a7b8dddca5c2b5b36955883529e04fd9d75a01e9 100644 (file)
--- a/build/msw/wx_vc9_propgrid.vcproj
+++ b/build/msw/wx_vc9_propgrid.vcproj
@@ -43,7 +43,7 @@
                                 Name="VCWebServiceProxyGeneratorTool"\r
                         />\r
                         <Tool\r
-                               Name="VCIDLTool"\r
+                               Name="VCMIDLTool"\r
                                 PreprocessorDefinitions="WIN32;_LIB;_DEBUG;__WXMSW__;_UNICODE;WXBUILDING"\r
                                 AdditionalIncludeDirectories="..\..\lib\vc_lib\mswud;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib"\r
                         />\r
@@ -127,7 +127,7 @@
                                 Name="VCWebServiceProxyGeneratorTool"\r
                         />\r
                         <Tool\r
-                               Name="VCIDLTool"\r
+                               Name="VCMIDLTool"\r
                                 PreprocessorDefinitions="WIN32;_LIB;__WXMSW__;_UNICODE;WXBUILDING"\r
                                 AdditionalIncludeDirectories="..\..\lib\vc_lib\mswu;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib"\r
                         />\r
@@ -209,7 +209,7 @@
                                 Name="VCWebServiceProxyGeneratorTool"\r
                         />\r
                         <Tool\r
-                               Name="VCIDLTool"\r
+                               Name="VCMIDLTool"\r
                                 PreprocessorDefinitions="WIN32;_LIB;_DEBUG;__WXMSW__;__WXUNIVERSAL__;_UNICODE;WXBUILDING"\r
                                 AdditionalIncludeDirectories="..\..\lib\vc_lib\mswunivud;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib"\r
                         />\r
@@ -293,7 +293,7 @@
                                 Name="VCWebServiceProxyGeneratorTool"\r
                         />\r
                         <Tool\r
-                               Name="VCIDLTool"\r
+                               Name="VCMIDLTool"\r
                                 PreprocessorDefinitions="WIN32;_LIB;__WXMSW__;__WXUNIVERSAL__;_UNICODE;WXBUILDING"\r
                                 AdditionalIncludeDirectories="..\..\lib\vc_lib\mswunivu;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib"\r
                         />\r
@@ -375,7 +375,7 @@
                                 Name="VCWebServiceProxyGeneratorTool"\r
                         />\r
                         <Tool\r
-                               Name="VCIDLTool"\r
+                               Name="VCMIDLTool"\r
                                 PreprocessorDefinitions="WIN32;_USRDLL;DLL_EXPORTS;_DEBUG;__WXMSW__;_UNICODE;WXBUILDING;WXUSINGDLL;WXMAKINGDLL_PROPGRID"\r
                                 AdditionalIncludeDirectories="..\..\lib\vc_dll\mswud;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib"\r
                         />\r
@@ -468,7 +468,7 @@
                                 Name="VCWebServiceProxyGeneratorTool"\r
                         />\r
                         <Tool\r
-                               Name="VCIDLTool"\r
+                               Name="VCMIDLTool"\r
                                 PreprocessorDefinitions="WIN32;_USRDLL;DLL_EXPORTS;__WXMSW__;_UNICODE;WXBUILDING;WXUSINGDLL;WXMAKINGDLL_PROPGRID"\r
                                 AdditionalIncludeDirectories="..\..\lib\vc_dll\mswu;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib"\r
                         />\r
@@ -507,7 +507,7 @@
                                 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_adv.lib ..\..\lib\vc_dll\wxmsw29u_core.lib ..\..\lib\vc_dll\wxbase29u.lib"\r
                                 OutputFile="..\..\lib\vc_dll\wxmsw291u_propgrid_vc_custom.dll"\r
-                               LinkIncremental="2"\r
+                               LinkIncremental="1"\r
                                 ImportLibrary="..\..\lib\vc_dll\wxmsw29u_propgrid.lib"\r
                                 SuppressStartupBanner="true"\r
                                 AdditionalLibraryDirectories="..\..\lib\vc_dll"\r
@@ -515,6 +515,8 @@
                                 GenerateDebugInformation="true"\r
                                 ProgramDatabaseFile="..\..\lib\vc_dll\wxmsw291u_propgrid_vc_custom.pdb"\r
                                 TargetMachine="1"\r
+                               OptimizeReferences="2"\r
+                               EnableCOMDATFolding="2"\r
                         />\r
                         <Tool\r
                                 Name="VCALinkTool"\r
@@ -559,7 +561,7 @@
                                 Name="VCWebServiceProxyGeneratorTool"\r
                         />\r
                         <Tool\r
-                               Name="VCIDLTool"\r
+                               Name="VCMIDLTool"\r
                                 PreprocessorDefinitions="WIN32;_USRDLL;DLL_EXPORTS;_DEBUG;__WXMSW__;__WXUNIVERSAL__;_UNICODE;WXBUILDING;WXUSINGDLL;WXMAKINGDLL_PROPGRID"\r
                                 AdditionalIncludeDirectories="..\..\lib\vc_dll\mswunivud;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib"\r
                         />\r
@@ -652,7 +654,7 @@
                                 Name="VCWebServiceProxyGeneratorTool"\r
                         />\r
                         <Tool\r
-                               Name="VCIDLTool"\r
+                               Name="VCMIDLTool"\r
                                 PreprocessorDefinitions="WIN32;_USRDLL;DLL_EXPORTS;__WXMSW__;__WXUNIVERSAL__;_UNICODE;WXBUILDING;WXUSINGDLL;WXMAKINGDLL_PROPGRID"\r
                                 AdditionalIncludeDirectories="..\..\lib\vc_dll\mswunivu;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib"\r
                         />\r
@@ -691,7 +693,7 @@
                                 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_adv.lib ..\..\lib\vc_dll\wxmswuniv29u_core.lib ..\..\lib\vc_dll\wxbase29u.lib"\r
                                 OutputFile="..\..\lib\vc_dll\wxmswuniv291u_propgrid_vc_custom.dll"\r
-                               LinkIncremental="2"\r
+                               LinkIncremental="1"\r
                                 ImportLibrary="..\..\lib\vc_dll\wxmswuniv29u_propgrid.lib"\r
                                 SuppressStartupBanner="true"\r
                                 AdditionalLibraryDirectories="..\..\lib\vc_dll"\r
@@ -699,6 +701,8 @@
                                 GenerateDebugInformation="true"\r
                                 ProgramDatabaseFile="..\..\lib\vc_dll\wxmswuniv291u_propgrid_vc_custom.pdb"\r
                                 TargetMachine="1"\r
+                               OptimizeReferences="2"\r
+                               EnableCOMDATFolding="2"\r
                         />\r
                         <Tool\r
                                 Name="VCALinkTool"\r
diff --git a/build/msw/wx_vc9_qa.vcproj b/build/msw/wx_vc9_qa.vcproj

index 4295b49cba9283373a3bca1bf842f7c4582d63d1..4e91e49f8dd3a73ee4f2eab759a67547b4b57962 100644 (file)
--- a/build/msw/wx_vc9_qa.vcproj
+++ b/build/msw/wx_vc9_qa.vcproj
@@ -43,7 +43,7 @@
                                 Name="VCWebServiceProxyGeneratorTool"\r
                         />\r
                         <Tool\r
-                               Name="VCIDLTool"\r
+                               Name="VCMIDLTool"\r
                                 PreprocessorDefinitions="WIN32;_LIB;_DEBUG;__WXMSW__;_UNICODE;WXBUILDING"\r
                                 AdditionalIncludeDirectories="..\..\lib\vc_lib\mswud;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib"\r
                         />\r
@@ -127,7 +127,7 @@
                                 Name="VCWebServiceProxyGeneratorTool"\r
                         />\r
                         <Tool\r
-                               Name="VCIDLTool"\r
+                               Name="VCMIDLTool"\r
                                 PreprocessorDefinitions="WIN32;_LIB;__WXMSW__;_UNICODE;WXBUILDING"\r
                                 AdditionalIncludeDirectories="..\..\lib\vc_lib\mswu;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib"\r
                         />\r
@@ -209,7 +209,7 @@
                                 Name="VCWebServiceProxyGeneratorTool"\r
                         />\r
                         <Tool\r
-                               Name="VCIDLTool"\r
+                               Name="VCMIDLTool"\r
                                 PreprocessorDefinitions="WIN32;_LIB;_DEBUG;__WXMSW__;__WXUNIVERSAL__;_UNICODE;WXBUILDING"\r
                                 AdditionalIncludeDirectories="..\..\lib\vc_lib\mswunivud;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib"\r
                         />\r
@@ -293,7 +293,7 @@
                                 Name="VCWebServiceProxyGeneratorTool"\r
                         />\r
                         <Tool\r
-                               Name="VCIDLTool"\r
+                               Name="VCMIDLTool"\r
                                 PreprocessorDefinitions="WIN32;_LIB;__WXMSW__;__WXUNIVERSAL__;_UNICODE;WXBUILDING"\r
                                 AdditionalIncludeDirectories="..\..\lib\vc_lib\mswunivu;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib"\r
                         />\r
@@ -375,7 +375,7 @@
                                 Name="VCWebServiceProxyGeneratorTool"\r
                         />\r
                         <Tool\r
-                               Name="VCIDLTool"\r
+                               Name="VCMIDLTool"\r
                                 PreprocessorDefinitions="WIN32;_USRDLL;DLL_EXPORTS;_DEBUG;__WXMSW__;_UNICODE;WXBUILDING;WXUSINGDLL;WXMAKINGDLL_QA"\r
                                 AdditionalIncludeDirectories="..\..\lib\vc_dll\mswud;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib"\r
                         />\r
@@ -468,7 +468,7 @@
                                 Name="VCWebServiceProxyGeneratorTool"\r
                         />\r
                         <Tool\r
-                               Name="VCIDLTool"\r
+                               Name="VCMIDLTool"\r
                                 PreprocessorDefinitions="WIN32;_USRDLL;DLL_EXPORTS;__WXMSW__;_UNICODE;WXBUILDING;WXUSINGDLL;WXMAKINGDLL_QA"\r
                                 AdditionalIncludeDirectories="..\..\lib\vc_dll\mswu;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib"\r
                         />\r
@@ -507,7 +507,7 @@
                                 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 ..\..\lib\vc_dll\wxbase29u_xml.lib"\r
                                 OutputFile="..\..\lib\vc_dll\wxmsw291u_qa_vc_custom.dll"\r
-                               LinkIncremental="2"\r
+                               LinkIncremental="1"\r
                                 ImportLibrary="..\..\lib\vc_dll\wxmsw29u_qa.lib"\r
                                 SuppressStartupBanner="true"\r
                                 AdditionalLibraryDirectories="..\..\lib\vc_dll"\r
@@ -515,6 +515,8 @@
                                 GenerateDebugInformation="true"\r
                                 ProgramDatabaseFile="..\..\lib\vc_dll\wxmsw291u_qa_vc_custom.pdb"\r
                                 TargetMachine="1"\r
+                               OptimizeReferences="2"\r
+                               EnableCOMDATFolding="2"\r
                         />\r
                         <Tool\r
                                 Name="VCALinkTool"\r
@@ -559,7 +561,7 @@
                                 Name="VCWebServiceProxyGeneratorTool"\r
                         />\r
                         <Tool\r
-                               Name="VCIDLTool"\r
+                               Name="VCMIDLTool"\r
                                 PreprocessorDefinitions="WIN32;_USRDLL;DLL_EXPORTS;_DEBUG;__WXMSW__;__WXUNIVERSAL__;_UNICODE;WXBUILDING;WXUSINGDLL;WXMAKINGDLL_QA"\r
                                 AdditionalIncludeDirectories="..\..\lib\vc_dll\mswunivud;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib"\r
                         />\r
@@ -652,7 +654,7 @@
                                 Name="VCWebServiceProxyGeneratorTool"\r
                         />\r
                         <Tool\r
-                               Name="VCIDLTool"\r
+                               Name="VCMIDLTool"\r
                                 PreprocessorDefinitions="WIN32;_USRDLL;DLL_EXPORTS;__WXMSW__;__WXUNIVERSAL__;_UNICODE;WXBUILDING;WXUSINGDLL;WXMAKINGDLL_QA"\r
                                 AdditionalIncludeDirectories="..\..\lib\vc_dll\mswunivu;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib"\r
                         />\r
@@ -691,7 +693,7 @@
                                 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 ..\..\lib\vc_dll\wxbase29u_xml.lib"\r
                                 OutputFile="..\..\lib\vc_dll\wxmswuniv291u_qa_vc_custom.dll"\r
-                               LinkIncremental="2"\r
+                               LinkIncremental="1"\r
                                 ImportLibrary="..\..\lib\vc_dll\wxmswuniv29u_qa.lib"\r
                                 SuppressStartupBanner="true"\r
                                 AdditionalLibraryDirectories="..\..\lib\vc_dll"\r
@@ -699,6 +701,8 @@
                                 GenerateDebugInformation="true"\r
                                 ProgramDatabaseFile="..\..\lib\vc_dll\wxmswuniv291u_qa_vc_custom.pdb"\r
                                 TargetMachine="1"\r
+                               OptimizeReferences="2"\r
+                               EnableCOMDATFolding="2"\r
                         />\r
                         <Tool\r
                                 Name="VCALinkTool"\r
diff --git a/build/msw/wx_vc9_ribbon.vcproj b/build/msw/wx_vc9_ribbon.vcproj

index e549271b251fc6ac56c85bd909afe4ed17f104b4..d7e4ad08297fdb3435713d127035cd75b93a8f0d 100644 (file)
--- a/build/msw/wx_vc9_ribbon.vcproj
+++ b/build/msw/wx_vc9_ribbon.vcproj
@@ -43,7 +43,7 @@
                                 Name="VCWebServiceProxyGeneratorTool"\r
                         />\r
                         <Tool\r
-                               Name="VCIDLTool"\r
+                               Name="VCMIDLTool"\r
                                 PreprocessorDefinitions="WIN32;_LIB;_DEBUG;__WXMSW__;_UNICODE;WXBUILDING"\r
                                 AdditionalIncludeDirectories="..\..\lib\vc_lib\mswud;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib"\r
                         />\r
@@ -127,7 +127,7 @@
                                 Name="VCWebServiceProxyGeneratorTool"\r
                         />\r
                         <Tool\r
-                               Name="VCIDLTool"\r
+                               Name="VCMIDLTool"\r
                                 PreprocessorDefinitions="WIN32;_LIB;__WXMSW__;_UNICODE;WXBUILDING"\r
                                 AdditionalIncludeDirectories="..\..\lib\vc_lib\mswu;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib"\r
                         />\r
@@ -209,7 +209,7 @@
                                 Name="VCWebServiceProxyGeneratorTool"\r
                         />\r
                         <Tool\r
-                               Name="VCIDLTool"\r
+                               Name="VCMIDLTool"\r
                                 PreprocessorDefinitions="WIN32;_LIB;_DEBUG;__WXMSW__;__WXUNIVERSAL__;_UNICODE;WXBUILDING"\r
                                 AdditionalIncludeDirectories="..\..\lib\vc_lib\mswunivud;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib"\r
                         />\r
@@ -293,7 +293,7 @@
                                 Name="VCWebServiceProxyGeneratorTool"\r
                         />\r
                         <Tool\r
-                               Name="VCIDLTool"\r
+                               Name="VCMIDLTool"\r
                                 PreprocessorDefinitions="WIN32;_LIB;__WXMSW__;__WXUNIVERSAL__;_UNICODE;WXBUILDING"\r
                                 AdditionalIncludeDirectories="..\..\lib\vc_lib\mswunivu;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib"\r
                         />\r
@@ -375,7 +375,7 @@
                                 Name="VCWebServiceProxyGeneratorTool"\r
                         />\r
                         <Tool\r
-                               Name="VCIDLTool"\r
+                               Name="VCMIDLTool"\r
                                 PreprocessorDefinitions="WIN32;_USRDLL;DLL_EXPORTS;_DEBUG;__WXMSW__;_UNICODE;WXBUILDING;WXUSINGDLL;WXMAKINGDLL_RIBBON"\r
                                 AdditionalIncludeDirectories="..\..\lib\vc_dll\mswud;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib"\r
                         />\r
@@ -468,7 +468,7 @@
                                 Name="VCWebServiceProxyGeneratorTool"\r
                         />\r
                         <Tool\r
-                               Name="VCIDLTool"\r
+                               Name="VCMIDLTool"\r
                                 PreprocessorDefinitions="WIN32;_USRDLL;DLL_EXPORTS;__WXMSW__;_UNICODE;WXBUILDING;WXUSINGDLL;WXMAKINGDLL_RIBBON"\r
                                 AdditionalIncludeDirectories="..\..\lib\vc_dll\mswu;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib"\r
                         />\r
@@ -507,7 +507,7 @@
                                 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_adv.lib ..\..\lib\vc_dll\wxmsw29u_core.lib ..\..\lib\vc_dll\wxbase29u.lib"\r
                                 OutputFile="..\..\lib\vc_dll\wxmsw291u_ribbon_vc_custom.dll"\r
-                               LinkIncremental="2"\r
+                               LinkIncremental="1"\r
                                 ImportLibrary="..\..\lib\vc_dll\wxmsw29u_ribbon.lib"\r
                                 SuppressStartupBanner="true"\r
                                 AdditionalLibraryDirectories="..\..\lib\vc_dll"\r
@@ -515,6 +515,8 @@
                                 GenerateDebugInformation="true"\r
                                 ProgramDatabaseFile="..\..\lib\vc_dll\wxmsw291u_ribbon_vc_custom.pdb"\r
                                 TargetMachine="1"\r
+                               OptimizeReferences="2"\r
+                               EnableCOMDATFolding="2"\r
                         />\r
                         <Tool\r
                                 Name="VCALinkTool"\r
@@ -559,7 +561,7 @@
                                 Name="VCWebServiceProxyGeneratorTool"\r
                         />\r
                         <Tool\r
-                               Name="VCIDLTool"\r
+                               Name="VCMIDLTool"\r
                                 PreprocessorDefinitions="WIN32;_USRDLL;DLL_EXPORTS;_DEBUG;__WXMSW__;__WXUNIVERSAL__;_UNICODE;WXBUILDING;WXUSINGDLL;WXMAKINGDLL_RIBBON"\r
                                 AdditionalIncludeDirectories="..\..\lib\vc_dll\mswunivud;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib"\r
                         />\r
@@ -652,7 +654,7 @@
                                 Name="VCWebServiceProxyGeneratorTool"\r
                         />\r
                         <Tool\r
-                               Name="VCIDLTool"\r
+                               Name="VCMIDLTool"\r
                                 PreprocessorDefinitions="WIN32;_USRDLL;DLL_EXPORTS;__WXMSW__;__WXUNIVERSAL__;_UNICODE;WXBUILDING;WXUSINGDLL;WXMAKINGDLL_RIBBON"\r
                                 AdditionalIncludeDirectories="..\..\lib\vc_dll\mswunivu;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib"\r
                         />\r
@@ -691,7 +693,7 @@
                                 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_adv.lib ..\..\lib\vc_dll\wxmswuniv29u_core.lib ..\..\lib\vc_dll\wxbase29u.lib"\r
                                 OutputFile="..\..\lib\vc_dll\wxmswuniv291u_ribbon_vc_custom.dll"\r
-                               LinkIncremental="2"\r
+                               LinkIncremental="1"\r
                                 ImportLibrary="..\..\lib\vc_dll\wxmswuniv29u_ribbon.lib"\r
                                 SuppressStartupBanner="true"\r
                                 AdditionalLibraryDirectories="..\..\lib\vc_dll"\r
@@ -699,6 +701,8 @@
                                 GenerateDebugInformation="true"\r
                                 ProgramDatabaseFile="..\..\lib\vc_dll\wxmswuniv291u_ribbon_vc_custom.pdb"\r
                                 TargetMachine="1"\r
+                               OptimizeReferences="2"\r
+                               EnableCOMDATFolding="2"\r
                         />\r
                         <Tool\r
                                 Name="VCALinkTool"\r
diff --git a/build/msw/wx_vc9_richtext.vcproj b/build/msw/wx_vc9_richtext.vcproj

index b60d8a2bc738f464e3e83d09f56384ad5e660ab1..16a58bdf97e4efe4d260580a83f972b7b45c4b47 100644 (file)
--- a/build/msw/wx_vc9_richtext.vcproj
+++ b/build/msw/wx_vc9_richtext.vcproj
@@ -43,7 +43,7 @@
                                 Name="VCWebServiceProxyGeneratorTool"\r
                         />\r
                         <Tool\r
-                               Name="VCIDLTool"\r
+                               Name="VCMIDLTool"\r
                                 PreprocessorDefinitions="WIN32;_LIB;_DEBUG;__WXMSW__;_UNICODE;WXBUILDING"\r
                                 AdditionalIncludeDirectories="..\..\lib\vc_lib\mswud;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib"\r
                         />\r
@@ -127,7 +127,7 @@
                                 Name="VCWebServiceProxyGeneratorTool"\r
                         />\r
                         <Tool\r
-                               Name="VCIDLTool"\r
+                               Name="VCMIDLTool"\r
                                 PreprocessorDefinitions="WIN32;_LIB;__WXMSW__;_UNICODE;WXBUILDING"\r
                                 AdditionalIncludeDirectories="..\..\lib\vc_lib\mswu;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib"\r
                         />\r
@@ -209,7 +209,7 @@
                                 Name="VCWebServiceProxyGeneratorTool"\r
                         />\r
                         <Tool\r
-                               Name="VCIDLTool"\r
+                               Name="VCMIDLTool"\r
                                 PreprocessorDefinitions="WIN32;_LIB;_DEBUG;__WXMSW__;__WXUNIVERSAL__;_UNICODE;WXBUILDING"\r
                                 AdditionalIncludeDirectories="..\..\lib\vc_lib\mswunivud;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib"\r
                         />\r
@@ -293,7 +293,7 @@
                                 Name="VCWebServiceProxyGeneratorTool"\r
                         />\r
                         <Tool\r
-                               Name="VCIDLTool"\r
+                               Name="VCMIDLTool"\r
                                 PreprocessorDefinitions="WIN32;_LIB;__WXMSW__;__WXUNIVERSAL__;_UNICODE;WXBUILDING"\r
                                 AdditionalIncludeDirectories="..\..\lib\vc_lib\mswunivu;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib"\r
                         />\r
@@ -375,7 +375,7 @@
                                 Name="VCWebServiceProxyGeneratorTool"\r
                         />\r
                         <Tool\r
-                               Name="VCIDLTool"\r
+                               Name="VCMIDLTool"\r
                                 PreprocessorDefinitions="WIN32;_USRDLL;DLL_EXPORTS;_DEBUG;__WXMSW__;_UNICODE;WXBUILDING;WXUSINGDLL;WXMAKINGDLL_RICHTEXT"\r
                                 AdditionalIncludeDirectories="..\..\lib\vc_dll\mswud;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib"\r
                         />\r
@@ -468,7 +468,7 @@
                                 Name="VCWebServiceProxyGeneratorTool"\r
                         />\r
                         <Tool\r
-                               Name="VCIDLTool"\r
+                               Name="VCMIDLTool"\r
                                 PreprocessorDefinitions="WIN32;_USRDLL;DLL_EXPORTS;__WXMSW__;_UNICODE;WXBUILDING;WXUSINGDLL;WXMAKINGDLL_RICHTEXT"\r
                                 AdditionalIncludeDirectories="..\..\lib\vc_dll\mswu;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib"\r
                         />\r
@@ -507,7 +507,7 @@
                                 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_adv.lib ..\..\lib\vc_dll\wxmsw29u_html.lib ..\..\lib\vc_dll\wxbase29u_xml.lib ..\..\lib\vc_dll\wxmsw29u_core.lib ..\..\lib\vc_dll\wxbase29u.lib"\r
                                 OutputFile="..\..\lib\vc_dll\wxmsw291u_richtext_vc_custom.dll"\r
-                               LinkIncremental="2"\r
+                               LinkIncremental="1"\r
                                 ImportLibrary="..\..\lib\vc_dll\wxmsw29u_richtext.lib"\r
                                 SuppressStartupBanner="true"\r
                                 AdditionalLibraryDirectories="..\..\lib\vc_dll"\r
@@ -515,6 +515,8 @@
                                 GenerateDebugInformation="true"\r
                                 ProgramDatabaseFile="..\..\lib\vc_dll\wxmsw291u_richtext_vc_custom.pdb"\r
                                 TargetMachine="1"\r
+                               OptimizeReferences="2"\r
+                               EnableCOMDATFolding="2"\r
                         />\r
                         <Tool\r
                                 Name="VCALinkTool"\r
@@ -559,7 +561,7 @@
                                 Name="VCWebServiceProxyGeneratorTool"\r
                         />\r
                         <Tool\r
-                               Name="VCIDLTool"\r
+                               Name="VCMIDLTool"\r
                                 PreprocessorDefinitions="WIN32;_USRDLL;DLL_EXPORTS;_DEBUG;__WXMSW__;__WXUNIVERSAL__;_UNICODE;WXBUILDING;WXUSINGDLL;WXMAKINGDLL_RICHTEXT"\r
                                 AdditionalIncludeDirectories="..\..\lib\vc_dll\mswunivud;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib"\r
                         />\r
@@ -652,7 +654,7 @@
                                 Name="VCWebServiceProxyGeneratorTool"\r
                         />\r
                         <Tool\r
-                               Name="VCIDLTool"\r
+                               Name="VCMIDLTool"\r
                                 PreprocessorDefinitions="WIN32;_USRDLL;DLL_EXPORTS;__WXMSW__;__WXUNIVERSAL__;_UNICODE;WXBUILDING;WXUSINGDLL;WXMAKINGDLL_RICHTEXT"\r
                                 AdditionalIncludeDirectories="..\..\lib\vc_dll\mswunivu;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib"\r
                         />\r
@@ -691,7 +693,7 @@
                                 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_adv.lib ..\..\lib\vc_dll\wxmswuniv29u_html.lib ..\..\lib\vc_dll\wxbase29u_xml.lib ..\..\lib\vc_dll\wxmswuniv29u_core.lib ..\..\lib\vc_dll\wxbase29u.lib"\r
                                 OutputFile="..\..\lib\vc_dll\wxmswuniv291u_richtext_vc_custom.dll"\r
-                               LinkIncremental="2"\r
+                               LinkIncremental="1"\r
                                 ImportLibrary="..\..\lib\vc_dll\wxmswuniv29u_richtext.lib"\r
                                 SuppressStartupBanner="true"\r
                                 AdditionalLibraryDirectories="..\..\lib\vc_dll"\r
@@ -699,6 +701,8 @@
                                 GenerateDebugInformation="true"\r
                                 ProgramDatabaseFile="..\..\lib\vc_dll\wxmswuniv291u_richtext_vc_custom.pdb"\r
                                 TargetMachine="1"\r
+                               OptimizeReferences="2"\r
+                               EnableCOMDATFolding="2"\r
                         />\r
                         <Tool\r
                                 Name="VCALinkTool"\r
diff --git a/build/msw/wx_vc9_stc.vcproj b/build/msw/wx_vc9_stc.vcproj

index 6542cc08d6671129ba0eb95c4807d28592d553a2..026ba68a14bb01a562041b2e0745f483c02038d8 100644 (file)
--- a/build/msw/wx_vc9_stc.vcproj
+++ b/build/msw/wx_vc9_stc.vcproj
@@ -43,7 +43,7 @@
                                 Name="VCWebServiceProxyGeneratorTool"\r
                         />\r
                         <Tool\r
-                               Name="VCIDLTool"\r
+                               Name="VCMIDLTool"\r
                                 PreprocessorDefinitions="WIN32;_LIB;_DEBUG;__WXMSW__;_UNICODE;WXBUILDING;__WX__;SCI_LEXER;LINK_LEXERS"\r
                                 AdditionalIncludeDirectories="..\..\lib\vc_lib\mswud;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib;..\..\src\stc\scintilla\include;..\..\src\stc\scintilla\src"\r
                         />\r
@@ -127,7 +127,7 @@
                                 Name="VCWebServiceProxyGeneratorTool"\r
                         />\r
                         <Tool\r
-                               Name="VCIDLTool"\r
+                               Name="VCMIDLTool"\r
                                 PreprocessorDefinitions="WIN32;_LIB;__WXMSW__;_UNICODE;WXBUILDING;__WX__;SCI_LEXER;LINK_LEXERS"\r
                                 AdditionalIncludeDirectories="..\..\lib\vc_lib\mswu;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib;..\..\src\stc\scintilla\include;..\..\src\stc\scintilla\src"\r
                         />\r
@@ -209,7 +209,7 @@
                                 Name="VCWebServiceProxyGeneratorTool"\r
                         />\r
                         <Tool\r
-                               Name="VCIDLTool"\r
+                               Name="VCMIDLTool"\r
                                 PreprocessorDefinitions="WIN32;_LIB;_DEBUG;__WXMSW__;__WXUNIVERSAL__;_UNICODE;WXBUILDING;__WX__;SCI_LEXER;LINK_LEXERS"\r
                                 AdditionalIncludeDirectories="..\..\lib\vc_lib\mswunivud;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib;..\..\src\stc\scintilla\include;..\..\src\stc\scintilla\src"\r
                         />\r
@@ -293,7 +293,7 @@
                                 Name="VCWebServiceProxyGeneratorTool"\r
                         />\r
                         <Tool\r
-                               Name="VCIDLTool"\r
+                               Name="VCMIDLTool"\r
                                 PreprocessorDefinitions="WIN32;_LIB;__WXMSW__;__WXUNIVERSAL__;_UNICODE;WXBUILDING;__WX__;SCI_LEXER;LINK_LEXERS"\r
                                 AdditionalIncludeDirectories="..\..\lib\vc_lib\mswunivu;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib;..\..\src\stc\scintilla\include;..\..\src\stc\scintilla\src"\r
                         />\r
@@ -375,7 +375,7 @@
                                 Name="VCWebServiceProxyGeneratorTool"\r
                         />\r
                         <Tool\r
-                               Name="VCIDLTool"\r
+                               Name="VCMIDLTool"\r
                                 PreprocessorDefinitions="WIN32;_USRDLL;DLL_EXPORTS;_DEBUG;__WXMSW__;_UNICODE;WXBUILDING;__WX__;SCI_LEXER;LINK_LEXERS;WXUSINGDLL;WXMAKINGDLL_STC"\r
                                 AdditionalIncludeDirectories="..\..\lib\vc_dll\mswud;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib;..\..\src\stc\scintilla\include;..\..\src\stc\scintilla\src"\r
                         />\r
@@ -468,7 +468,7 @@
                                 Name="VCWebServiceProxyGeneratorTool"\r
                         />\r
                         <Tool\r
-                               Name="VCIDLTool"\r
+                               Name="VCMIDLTool"\r
                                 PreprocessorDefinitions="WIN32;_USRDLL;DLL_EXPORTS;__WXMSW__;_UNICODE;WXBUILDING;__WX__;SCI_LEXER;LINK_LEXERS;WXUSINGDLL;WXMAKINGDLL_STC"\r
                                 AdditionalIncludeDirectories="..\..\lib\vc_dll\mswu;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib;..\..\src\stc\scintilla\include;..\..\src\stc\scintilla\src"\r
                         />\r
@@ -507,7 +507,7 @@
                                 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\wxscintilla.lib ..\..\lib\vc_dll\wxmsw29u_core.lib ..\..\lib\vc_dll\wxbase29u.lib"\r
                                 OutputFile="..\..\lib\vc_dll\wxmsw291u_stc_vc_custom.dll"\r
-                               LinkIncremental="2"\r
+                               LinkIncremental="1"\r
                                 ImportLibrary="..\..\lib\vc_dll\wxmsw29u_stc.lib"\r
                                 SuppressStartupBanner="true"\r
                                 AdditionalLibraryDirectories="..\..\lib\vc_dll"\r
@@ -515,6 +515,8 @@
                                 GenerateDebugInformation="true"\r
                                 ProgramDatabaseFile="..\..\lib\vc_dll\wxmsw291u_stc_vc_custom.pdb"\r
                                 TargetMachine="1"\r
+                               OptimizeReferences="2"\r
+                               EnableCOMDATFolding="2"\r
                         />\r
                         <Tool\r
                                 Name="VCALinkTool"\r
@@ -559,7 +561,7 @@
                                 Name="VCWebServiceProxyGeneratorTool"\r
                         />\r
                         <Tool\r
-                               Name="VCIDLTool"\r
+                               Name="VCMIDLTool"\r
                                 PreprocessorDefinitions="WIN32;_USRDLL;DLL_EXPORTS;_DEBUG;__WXMSW__;__WXUNIVERSAL__;_UNICODE;WXBUILDING;__WX__;SCI_LEXER;LINK_LEXERS;WXUSINGDLL;WXMAKINGDLL_STC"\r
                                 AdditionalIncludeDirectories="..\..\lib\vc_dll\mswunivud;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib;..\..\src\stc\scintilla\include;..\..\src\stc\scintilla\src"\r
                         />\r
@@ -652,7 +654,7 @@
                                 Name="VCWebServiceProxyGeneratorTool"\r
                         />\r
                         <Tool\r
-                               Name="VCIDLTool"\r
+                               Name="VCMIDLTool"\r
                                 PreprocessorDefinitions="WIN32;_USRDLL;DLL_EXPORTS;__WXMSW__;__WXUNIVERSAL__;_UNICODE;WXBUILDING;__WX__;SCI_LEXER;LINK_LEXERS;WXUSINGDLL;WXMAKINGDLL_STC"\r
                                 AdditionalIncludeDirectories="..\..\lib\vc_dll\mswunivu;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib;..\..\src\stc\scintilla\include;..\..\src\stc\scintilla\src"\r
                         />\r
@@ -691,7 +693,7 @@
                                 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\wxscintilla.lib ..\..\lib\vc_dll\wxmswuniv29u_core.lib ..\..\lib\vc_dll\wxbase29u.lib"\r
                                 OutputFile="..\..\lib\vc_dll\wxmswuniv291u_stc_vc_custom.dll"\r
-                               LinkIncremental="2"\r
+                               LinkIncremental="1"\r
                                 ImportLibrary="..\..\lib\vc_dll\wxmswuniv29u_stc.lib"\r
                                 SuppressStartupBanner="true"\r
                                 AdditionalLibraryDirectories="..\..\lib\vc_dll"\r
@@ -699,6 +701,8 @@
                                 GenerateDebugInformation="true"\r
                                 ProgramDatabaseFile="..\..\lib\vc_dll\wxmswuniv291u_stc_vc_custom.pdb"\r
                                 TargetMachine="1"\r
+                               OptimizeReferences="2"\r
+                               EnableCOMDATFolding="2"\r
                         />\r
                         <Tool\r
                                 Name="VCALinkTool"\r
diff --git a/build/msw/wx_vc9_wxexpat.vcproj b/build/msw/wx_vc9_wxexpat.vcproj

index b7a8f33b0777739b7e191dbde219e4f9703f00e9..cd8a1ba930b45a16f9e374b61a0ba2438dfec9db 100644 (file)
--- a/build/msw/wx_vc9_wxexpat.vcproj
+++ b/build/msw/wx_vc9_wxexpat.vcproj
@@ -42,8 +42,8 @@
                                 Name="VCWebServiceProxyGeneratorTool"\r
                         />\r
                         <Tool\r
-                               Name="VCIDLTool"\r
-                               PreprocessorDefinitions="WIN32;_LIB;_DEBUG;NDEBUG;COMPILED_FROM_DSP"
+                               Name="VCMIDLTool"\r
+                               PreprocessorDefinitions="WIN32;_LIB;_DEBUG;NDEBUG;COMPILED_FROM_DSP"\r
                                 AdditionalIncludeDirectories="..\..\lib\vc_lib"\r
                         />\r
                         <Tool\r
@@ -51,7 +51,7 @@
                                 AdditionalOptions="/MP"\r
                                 Optimization="0"\r
                                 AdditionalIncludeDirectories="..\..\lib\vc_lib"\r
-                               PreprocessorDefinitions="WIN32;_LIB;_DEBUG;NDEBUG;COMPILED_FROM_DSP"
+                               PreprocessorDefinitions="WIN32;_LIB;_DEBUG;NDEBUG;COMPILED_FROM_DSP"\r
                                 ExceptionHandling="1"\r
                                 BasicRuntimeChecks="3"\r
                                 RuntimeLibrary="3"\r
@@ -68,7 +68,7 @@
                         />\r
                         <Tool\r
                                 Name="VCResourceCompilerTool"\r
-                               PreprocessorDefinitions="_DEBUG;NDEBUG;COMPILED_FROM_DSP"
+                               PreprocessorDefinitions="_DEBUG;NDEBUG;COMPILED_FROM_DSP"\r
                                 Culture="1033"\r
                                 AdditionalIncludeDirectories="..\..\lib\vc_lib"\r
                         />\r
@@ -122,8 +122,8 @@
                                 Name="VCWebServiceProxyGeneratorTool"\r
                         />\r
                         <Tool\r
-                               Name="VCIDLTool"\r
-                               PreprocessorDefinitions="WIN32;_LIB;NDEBUG;COMPILED_FROM_DSP"
+                               Name="VCMIDLTool"\r
+                               PreprocessorDefinitions="WIN32;_LIB;NDEBUG;COMPILED_FROM_DSP"\r
                                 AdditionalIncludeDirectories="..\..\lib\vc_lib"\r
                         />\r
                         <Tool\r
@@ -131,7 +131,7 @@
                                 AdditionalOptions="/MP"\r
                                 Optimization="2"\r
                                 AdditionalIncludeDirectories="..\..\lib\vc_lib"\r
-                               PreprocessorDefinitions="WIN32;_LIB;NDEBUG;COMPILED_FROM_DSP"
+                               PreprocessorDefinitions="WIN32;_LIB;NDEBUG;COMPILED_FROM_DSP"\r
                                 ExceptionHandling="1"\r
                                 RuntimeLibrary="2"\r
                                 RuntimeTypeInfo="true"\r
@@ -146,7 +146,7 @@
                         />\r
                         <Tool\r
                                 Name="VCResourceCompilerTool"\r
-                               PreprocessorDefinitions="NDEBUG;COMPILED_FROM_DSP"
+                               PreprocessorDefinitions="NDEBUG;COMPILED_FROM_DSP"\r
                                 Culture="1033"\r
                                 AdditionalIncludeDirectories="..\..\lib\vc_lib"\r
                         />\r
@@ -200,8 +200,8 @@
                                 Name="VCWebServiceProxyGeneratorTool"\r
                         />\r
                         <Tool\r
-                               Name="VCIDLTool"\r
-                               PreprocessorDefinitions="WIN32;_LIB;_DEBUG;NDEBUG;COMPILED_FROM_DSP"
+                               Name="VCMIDLTool"\r
+                               PreprocessorDefinitions="WIN32;_LIB;_DEBUG;NDEBUG;COMPILED_FROM_DSP"\r
                                 AdditionalIncludeDirectories="..\..\lib\vc_lib"\r
                         />\r
                         <Tool\r
@@ -209,7 +209,7 @@
                                 AdditionalOptions="/MP"\r
                                 Optimization="0"\r
                                 AdditionalIncludeDirectories="..\..\lib\vc_lib"\r
-                               PreprocessorDefinitions="WIN32;_LIB;_DEBUG;NDEBUG;COMPILED_FROM_DSP"
+                               PreprocessorDefinitions="WIN32;_LIB;_DEBUG;NDEBUG;COMPILED_FROM_DSP"\r
                                 ExceptionHandling="1"\r
                                 BasicRuntimeChecks="3"\r
                                 RuntimeLibrary="3"\r
@@ -226,7 +226,7 @@
                         />\r
                         <Tool\r
                                 Name="VCResourceCompilerTool"\r
-                               PreprocessorDefinitions="_DEBUG;NDEBUG;COMPILED_FROM_DSP"
+                               PreprocessorDefinitions="_DEBUG;NDEBUG;COMPILED_FROM_DSP"\r
                                 Culture="1033"\r
                                 AdditionalIncludeDirectories="..\..\lib\vc_lib"\r
                         />\r
@@ -280,8 +280,8 @@
                                 Name="VCWebServiceProxyGeneratorTool"\r
                         />\r
                         <Tool\r
-                               Name="VCIDLTool"\r
-                               PreprocessorDefinitions="WIN32;_LIB;NDEBUG;COMPILED_FROM_DSP"
+                               Name="VCMIDLTool"\r
+                               PreprocessorDefinitions="WIN32;_LIB;NDEBUG;COMPILED_FROM_DSP"\r
                                 AdditionalIncludeDirectories="..\..\lib\vc_lib"\r
                         />\r
                         <Tool\r
@@ -289,7 +289,7 @@
                                 AdditionalOptions="/MP"\r
                                 Optimization="2"\r
                                 AdditionalIncludeDirectories="..\..\lib\vc_lib"\r
-                               PreprocessorDefinitions="WIN32;_LIB;NDEBUG;COMPILED_FROM_DSP"
+                               PreprocessorDefinitions="WIN32;_LIB;NDEBUG;COMPILED_FROM_DSP"\r
                                 ExceptionHandling="1"\r
                                 RuntimeLibrary="2"\r
                                 RuntimeTypeInfo="true"\r
@@ -304,7 +304,7 @@
                         />\r
                         <Tool\r
                                 Name="VCResourceCompilerTool"\r
-                               PreprocessorDefinitions="NDEBUG;COMPILED_FROM_DSP"
+                               PreprocessorDefinitions="NDEBUG;COMPILED_FROM_DSP"\r
                                 Culture="1033"\r
                                 AdditionalIncludeDirectories="..\..\lib\vc_lib"\r
                         />\r
@@ -358,8 +358,8 @@
                                 Name="VCWebServiceProxyGeneratorTool"\r
                         />\r
                         <Tool\r
-                               Name="VCIDLTool"\r
-                               PreprocessorDefinitions="WIN32;_LIB;_DEBUG;NDEBUG;COMPILED_FROM_DSP"
+                               Name="VCMIDLTool"\r
+                               PreprocessorDefinitions="WIN32;_LIB;_DEBUG;NDEBUG;COMPILED_FROM_DSP"\r
                                 AdditionalIncludeDirectories="..\..\lib\vc_dll"\r
                         />\r
                         <Tool\r
@@ -367,7 +367,7 @@
                                 AdditionalOptions="/MP"\r
                                 Optimization="0"\r
                                 AdditionalIncludeDirectories="..\..\lib\vc_dll"\r
-                               PreprocessorDefinitions="WIN32;_LIB;_DEBUG;NDEBUG;COMPILED_FROM_DSP"
+                               PreprocessorDefinitions="WIN32;_LIB;_DEBUG;NDEBUG;COMPILED_FROM_DSP"\r
                                 ExceptionHandling="1"\r
                                 BasicRuntimeChecks="3"\r
                                 RuntimeLibrary="3"\r
@@ -384,7 +384,7 @@
                         />\r
                         <Tool\r
                                 Name="VCResourceCompilerTool"\r
-                               PreprocessorDefinitions="_DEBUG;NDEBUG;COMPILED_FROM_DSP"
+                               PreprocessorDefinitions="_DEBUG;NDEBUG;COMPILED_FROM_DSP"\r
                                 Culture="1033"\r
                                 AdditionalIncludeDirectories="..\..\lib\vc_dll"\r
                         />\r
@@ -438,8 +438,8 @@
                                 Name="VCWebServiceProxyGeneratorTool"\r
                         />\r
                         <Tool\r
-                               Name="VCIDLTool"\r
-                               PreprocessorDefinitions="WIN32;_LIB;NDEBUG;COMPILED_FROM_DSP"
+                               Name="VCMIDLTool"\r
+                               PreprocessorDefinitions="WIN32;_LIB;NDEBUG;COMPILED_FROM_DSP"\r
                                 AdditionalIncludeDirectories="..\..\lib\vc_dll"\r
                         />\r
                         <Tool\r
@@ -447,7 +447,7 @@
                                 AdditionalOptions="/MP"\r
                                 Optimization="2"\r
                                 AdditionalIncludeDirectories="..\..\lib\vc_dll"\r
-                               PreprocessorDefinitions="WIN32;_LIB;NDEBUG;COMPILED_FROM_DSP"
+                               PreprocessorDefinitions="WIN32;_LIB;NDEBUG;COMPILED_FROM_DSP"\r
                                 ExceptionHandling="1"\r
                                 RuntimeLibrary="2"\r
                                 RuntimeTypeInfo="true"\r
@@ -462,7 +462,7 @@
                         />\r
                         <Tool\r
                                 Name="VCResourceCompilerTool"\r
-                               PreprocessorDefinitions="NDEBUG;COMPILED_FROM_DSP"
+                               PreprocessorDefinitions="NDEBUG;COMPILED_FROM_DSP"\r
                                 Culture="1033"\r
                                 AdditionalIncludeDirectories="..\..\lib\vc_dll"\r
                         />\r
@@ -516,8 +516,8 @@
                                 Name="VCWebServiceProxyGeneratorTool"\r
                         />\r
                         <Tool\r
-                               Name="VCIDLTool"\r
-                               PreprocessorDefinitions="WIN32;_LIB;_DEBUG;NDEBUG;COMPILED_FROM_DSP"
+                               Name="VCMIDLTool"\r
+                               PreprocessorDefinitions="WIN32;_LIB;_DEBUG;NDEBUG;COMPILED_FROM_DSP"\r
                                 AdditionalIncludeDirectories="..\..\lib\vc_dll"\r
                         />\r
                         <Tool\r
@@ -525,7 +525,7 @@
                                 AdditionalOptions="/MP"\r
                                 Optimization="0"\r
                                 AdditionalIncludeDirectories="..\..\lib\vc_dll"\r
-                               PreprocessorDefinitions="WIN32;_LIB;_DEBUG;NDEBUG;COMPILED_FROM_DSP"
+                               PreprocessorDefinitions="WIN32;_LIB;_DEBUG;NDEBUG;COMPILED_FROM_DSP"\r
                                 ExceptionHandling="1"\r
                                 BasicRuntimeChecks="3"\r
                                 RuntimeLibrary="3"\r
@@ -542,7 +542,7 @@
                         />\r
                         <Tool\r
                                 Name="VCResourceCompilerTool"\r
-                               PreprocessorDefinitions="_DEBUG;NDEBUG;COMPILED_FROM_DSP"
+                               PreprocessorDefinitions="_DEBUG;NDEBUG;COMPILED_FROM_DSP"\r
                                 Culture="1033"\r
                                 AdditionalIncludeDirectories="..\..\lib\vc_dll"\r
                         />\r
@@ -596,8 +596,8 @@
                                 Name="VCWebServiceProxyGeneratorTool"\r
                         />\r
                         <Tool\r
-                               Name="VCIDLTool"\r
-                               PreprocessorDefinitions="WIN32;_LIB;NDEBUG;COMPILED_FROM_DSP"
+                               Name="VCMIDLTool"\r
+                               PreprocessorDefinitions="WIN32;_LIB;NDEBUG;COMPILED_FROM_DSP"\r
                                 AdditionalIncludeDirectories="..\..\lib\vc_dll"\r
                         />\r
                         <Tool\r
@@ -605,7 +605,7 @@
                                 AdditionalOptions="/MP"\r
                                 Optimization="2"\r
                                 AdditionalIncludeDirectories="..\..\lib\vc_dll"\r
-                               PreprocessorDefinitions="WIN32;_LIB;NDEBUG;COMPILED_FROM_DSP"
+                               PreprocessorDefinitions="WIN32;_LIB;NDEBUG;COMPILED_FROM_DSP"\r
                                 ExceptionHandling="1"\r
                                 RuntimeLibrary="2"\r
                                 RuntimeTypeInfo="true"\r
@@ -620,7 +620,7 @@
                         />\r
                         <Tool\r
                                 Name="VCResourceCompilerTool"\r
-                               PreprocessorDefinitions="NDEBUG;COMPILED_FROM_DSP"
+                               PreprocessorDefinitions="NDEBUG;COMPILED_FROM_DSP"\r
                                 Culture="1033"\r
                                 AdditionalIncludeDirectories="..\..\lib\vc_dll"\r
                         />\r
diff --git a/build/msw/wx_vc9_wxjpeg.vcproj b/build/msw/wx_vc9_wxjpeg.vcproj

index 95cf3ed06bef78b5313a173661b29c443fc38b27..678b8ff2d718f66ae0319767e54c45adb9f2e7cc 100644 (file)
--- a/build/msw/wx_vc9_wxjpeg.vcproj
+++ b/build/msw/wx_vc9_wxjpeg.vcproj
@@ -42,8 +42,8 @@
                                 Name="VCWebServiceProxyGeneratorTool"\r
                         />\r
                         <Tool\r
-                               Name="VCIDLTool"\r
-                               PreprocessorDefinitions="WIN32;_LIB;_DEBUG;NDEBUG"
+                               Name="VCMIDLTool"\r
+                               PreprocessorDefinitions="WIN32;_LIB;_DEBUG;NDEBUG"\r
                                 AdditionalIncludeDirectories="..\..\lib\vc_lib\mswud"\r
                         />\r
                         <Tool\r
@@ -51,7 +51,7 @@
                                 AdditionalOptions="/MP"\r
                                 Optimization="0"\r
                                 AdditionalIncludeDirectories="..\..\lib\vc_lib\mswud"\r
-                               PreprocessorDefinitions="WIN32;_LIB;_DEBUG;NDEBUG"
+                               PreprocessorDefinitions="WIN32;_LIB;_DEBUG;NDEBUG"\r
                                 ExceptionHandling="1"\r
                                 BasicRuntimeChecks="3"\r
                                 RuntimeLibrary="3"\r
@@ -68,7 +68,7 @@
                         />\r
                         <Tool\r
                                 Name="VCResourceCompilerTool"\r
-                               PreprocessorDefinitions="_DEBUG;NDEBUG"
+                               PreprocessorDefinitions="_DEBUG;NDEBUG"\r
                                 Culture="1033"\r
                                 AdditionalIncludeDirectories="..\..\lib\vc_lib\mswud"\r
                         />\r
@@ -122,8 +122,8 @@
                                 Name="VCWebServiceProxyGeneratorTool"\r
                         />\r
                         <Tool\r
-                               Name="VCIDLTool"\r
-                               PreprocessorDefinitions="WIN32;_LIB;NDEBUG"
+                               Name="VCMIDLTool"\r
+                               PreprocessorDefinitions="WIN32;_LIB;NDEBUG"\r
                                 AdditionalIncludeDirectories="..\..\lib\vc_lib\mswu"\r
                         />\r
                         <Tool\r
@@ -131,7 +131,7 @@
                                 AdditionalOptions="/MP"\r
                                 Optimization="2"\r
                                 AdditionalIncludeDirectories="..\..\lib\vc_lib\mswu"\r
-                               PreprocessorDefinitions="WIN32;_LIB;NDEBUG"
+                               PreprocessorDefinitions="WIN32;_LIB;NDEBUG"\r
                                 ExceptionHandling="1"\r
                                 RuntimeLibrary="2"\r
                                 RuntimeTypeInfo="true"\r
@@ -146,7 +146,7 @@
                         />\r
                         <Tool\r
                                 Name="VCResourceCompilerTool"\r
-                               PreprocessorDefinitions="NDEBUG"
+                               PreprocessorDefinitions="NDEBUG"\r
                                 Culture="1033"\r
                                 AdditionalIncludeDirectories="..\..\lib\vc_lib\mswu"\r
                         />\r
@@ -200,8 +200,8 @@
                                 Name="VCWebServiceProxyGeneratorTool"\r
                         />\r
                         <Tool\r
-                               Name="VCIDLTool"\r
-                               PreprocessorDefinitions="WIN32;_LIB;_DEBUG;NDEBUG"
+                               Name="VCMIDLTool"\r
+                               PreprocessorDefinitions="WIN32;_LIB;_DEBUG;NDEBUG"\r
                                 AdditionalIncludeDirectories="..\..\lib\vc_lib\mswunivud"\r
                         />\r
                         <Tool\r
@@ -209,7 +209,7 @@
                                 AdditionalOptions="/MP"\r
                                 Optimization="0"\r
                                 AdditionalIncludeDirectories="..\..\lib\vc_lib\mswunivud"\r
-                               PreprocessorDefinitions="WIN32;_LIB;_DEBUG;NDEBUG"
+                               PreprocessorDefinitions="WIN32;_LIB;_DEBUG;NDEBUG"\r
                                 ExceptionHandling="1"\r
                                 BasicRuntimeChecks="3"\r
                                 RuntimeLibrary="3"\r
@@ -226,7 +226,7 @@
                         />\r
                         <Tool\r
                                 Name="VCResourceCompilerTool"\r
-                               PreprocessorDefinitions="_DEBUG;NDEBUG"
+                               PreprocessorDefinitions="_DEBUG;NDEBUG"\r
                                 Culture="1033"\r
                                 AdditionalIncludeDirectories="..\..\lib\vc_lib\mswunivud"\r
                         />\r
@@ -280,8 +280,8 @@
                                 Name="VCWebServiceProxyGeneratorTool"\r
                         />\r
                         <Tool\r
-                               Name="VCIDLTool"\r
-                               PreprocessorDefinitions="WIN32;_LIB;NDEBUG"
+                               Name="VCMIDLTool"\r
+                               PreprocessorDefinitions="WIN32;_LIB;NDEBUG"\r
                                 AdditionalIncludeDirectories="..\..\lib\vc_lib\mswunivu"\r
                         />\r
                         <Tool\r
@@ -289,7 +289,7 @@
                                 AdditionalOptions="/MP"\r
                                 Optimization="2"\r
                                 AdditionalIncludeDirectories="..\..\lib\vc_lib\mswunivu"\r
-                               PreprocessorDefinitions="WIN32;_LIB;NDEBUG"
+                               PreprocessorDefinitions="WIN32;_LIB;NDEBUG"\r
                                 ExceptionHandling="1"\r
                                 RuntimeLibrary="2"\r
                                 RuntimeTypeInfo="true"\r
@@ -304,7 +304,7 @@
                         />\r
                         <Tool\r
                                 Name="VCResourceCompilerTool"\r
-                               PreprocessorDefinitions="NDEBUG"
+                               PreprocessorDefinitions="NDEBUG"\r
                                 Culture="1033"\r
                                 AdditionalIncludeDirectories="..\..\lib\vc_lib\mswunivu"\r
                         />\r
@@ -358,8 +358,8 @@
                                 Name="VCWebServiceProxyGeneratorTool"\r
                         />\r
                         <Tool\r
-                               Name="VCIDLTool"\r
-                               PreprocessorDefinitions="WIN32;_LIB;_DEBUG;NDEBUG"
+                               Name="VCMIDLTool"\r
+                               PreprocessorDefinitions="WIN32;_LIB;_DEBUG;NDEBUG"\r
                                 AdditionalIncludeDirectories="..\..\lib\vc_dll\mswud"\r
                         />\r
                         <Tool\r
@@ -367,7 +367,7 @@
                                 AdditionalOptions="/MP"\r
                                 Optimization="0"\r
                                 AdditionalIncludeDirectories="..\..\lib\vc_dll\mswud"\r
-                               PreprocessorDefinitions="WIN32;_LIB;_DEBUG;NDEBUG"
+                               PreprocessorDefinitions="WIN32;_LIB;_DEBUG;NDEBUG"\r
                                 ExceptionHandling="1"\r
                                 BasicRuntimeChecks="3"\r
                                 RuntimeLibrary="3"\r
@@ -384,7 +384,7 @@
                         />\r
                         <Tool\r
                                 Name="VCResourceCompilerTool"\r
-                               PreprocessorDefinitions="_DEBUG;NDEBUG"
+                               PreprocessorDefinitions="_DEBUG;NDEBUG"\r
                                 Culture="1033"\r
                                 AdditionalIncludeDirectories="..\..\lib\vc_dll\mswud"\r
                         />\r
@@ -438,8 +438,8 @@
                                 Name="VCWebServiceProxyGeneratorTool"\r
                         />\r
                         <Tool\r
-                               Name="VCIDLTool"\r
-                               PreprocessorDefinitions="WIN32;_LIB;NDEBUG"
+                               Name="VCMIDLTool"\r
+                               PreprocessorDefinitions="WIN32;_LIB;NDEBUG"\r
                                 AdditionalIncludeDirectories="..\..\lib\vc_dll\mswu"\r
                         />\r
                         <Tool\r
@@ -447,7 +447,7 @@
                                 AdditionalOptions="/MP"\r
                                 Optimization="2"\r
                                 AdditionalIncludeDirectories="..\..\lib\vc_dll\mswu"\r
-                               PreprocessorDefinitions="WIN32;_LIB;NDEBUG"
+                               PreprocessorDefinitions="WIN32;_LIB;NDEBUG"\r
                                 ExceptionHandling="1"\r
                                 RuntimeLibrary="2"\r
                                 RuntimeTypeInfo="true"\r
@@ -462,7 +462,7 @@
                         />\r
                         <Tool\r
                                 Name="VCResourceCompilerTool"\r
-                               PreprocessorDefinitions="NDEBUG"
+                               PreprocessorDefinitions="NDEBUG"\r
                                 Culture="1033"\r
                                 AdditionalIncludeDirectories="..\..\lib\vc_dll\mswu"\r
                         />\r
@@ -516,8 +516,8 @@
                                 Name="VCWebServiceProxyGeneratorTool"\r
                         />\r
                         <Tool\r
-                               Name="VCIDLTool"\r
-                               PreprocessorDefinitions="WIN32;_LIB;_DEBUG;NDEBUG"
+                               Name="VCMIDLTool"\r
+                               PreprocessorDefinitions="WIN32;_LIB;_DEBUG;NDEBUG"\r
                                 AdditionalIncludeDirectories="..\..\lib\vc_dll\mswunivud"\r
                         />\r
                         <Tool\r
@@ -525,7 +525,7 @@
                                 AdditionalOptions="/MP"\r
                                 Optimization="0"\r
                                 AdditionalIncludeDirectories="..\..\lib\vc_dll\mswunivud"\r
-                               PreprocessorDefinitions="WIN32;_LIB;_DEBUG;NDEBUG"
+                               PreprocessorDefinitions="WIN32;_LIB;_DEBUG;NDEBUG"\r
                                 ExceptionHandling="1"\r
                                 BasicRuntimeChecks="3"\r
                                 RuntimeLibrary="3"\r
@@ -542,7 +542,7 @@
                         />\r
                         <Tool\r
                                 Name="VCResourceCompilerTool"\r
-                               PreprocessorDefinitions="_DEBUG;NDEBUG"
+                               PreprocessorDefinitions="_DEBUG;NDEBUG"\r
                                 Culture="1033"\r
                                 AdditionalIncludeDirectories="..\..\lib\vc_dll\mswunivud"\r
                         />\r
@@ -596,8 +596,8 @@
                                 Name="VCWebServiceProxyGeneratorTool"\r
                         />\r
                         <Tool\r
-                               Name="VCIDLTool"\r
-                               PreprocessorDefinitions="WIN32;_LIB;NDEBUG"
+                               Name="VCMIDLTool"\r
+                               PreprocessorDefinitions="WIN32;_LIB;NDEBUG"\r
                                 AdditionalIncludeDirectories="..\..\lib\vc_dll\mswunivu"\r
                         />\r
                         <Tool\r
@@ -605,7 +605,7 @@
                                 AdditionalOptions="/MP"\r
                                 Optimization="2"\r
                                 AdditionalIncludeDirectories="..\..\lib\vc_dll\mswunivu"\r
-                               PreprocessorDefinitions="WIN32;_LIB;NDEBUG"
+                               PreprocessorDefinitions="WIN32;_LIB;NDEBUG"\r
                                 ExceptionHandling="1"\r
                                 RuntimeLibrary="2"\r
                                 RuntimeTypeInfo="true"\r
@@ -620,7 +620,7 @@
                         />\r
                         <Tool\r
                                 Name="VCResourceCompilerTool"\r
-                               PreprocessorDefinitions="NDEBUG"
+                               PreprocessorDefinitions="NDEBUG"\r
                                 Culture="1033"\r
                                 AdditionalIncludeDirectories="..\..\lib\vc_dll\mswunivu"\r
                         />\r
diff --git a/build/msw/wx_vc9_wxpng.vcproj b/build/msw/wx_vc9_wxpng.vcproj

index 355ed1c06eba4d96a2dfebf52d1f6d4bfc62e903..dbc0dec458aac53697af97b394dbbc2f0819c91f 100644 (file)
--- a/build/msw/wx_vc9_wxpng.vcproj
+++ b/build/msw/wx_vc9_wxpng.vcproj
@@ -42,8 +42,8 @@
                                 Name="VCWebServiceProxyGeneratorTool"\r
                         />\r
                         <Tool\r
-                               Name="VCIDLTool"\r
-                               PreprocessorDefinitions="WIN32;_LIB;_DEBUG;NDEBUG"
+                               Name="VCMIDLTool"\r
+                               PreprocessorDefinitions="WIN32;_LIB;_DEBUG;NDEBUG"\r
                                 AdditionalIncludeDirectories="..\..\src\zlib"\r
                         />\r
                         <Tool\r
@@ -51,7 +51,7 @@
                                 AdditionalOptions="/MP"\r
                                 Optimization="0"\r
                                 AdditionalIncludeDirectories="..\..\src\zlib"\r
-                               PreprocessorDefinitions="WIN32;_LIB;_DEBUG;NDEBUG"
+                               PreprocessorDefinitions="WIN32;_LIB;_DEBUG;NDEBUG"\r
                                 ExceptionHandling="1"\r
                                 BasicRuntimeChecks="3"\r
                                 RuntimeLibrary="3"\r
@@ -68,7 +68,7 @@
                         />\r
                         <Tool\r
                                 Name="VCResourceCompilerTool"\r
-                               PreprocessorDefinitions="_DEBUG;NDEBUG"
+                               PreprocessorDefinitions="_DEBUG;NDEBUG"\r
                                 Culture="1033"\r
                                 AdditionalIncludeDirectories="..\..\src\zlib"\r
                         />\r
@@ -122,8 +122,8 @@
                                 Name="VCWebServiceProxyGeneratorTool"\r
                         />\r
                         <Tool\r
-                               Name="VCIDLTool"\r
-                               PreprocessorDefinitions="WIN32;_LIB;NDEBUG"
+                               Name="VCMIDLTool"\r
+                               PreprocessorDefinitions="WIN32;_LIB;NDEBUG"\r
                                 AdditionalIncludeDirectories="..\..\src\zlib"\r
                         />\r
                         <Tool\r
@@ -131,7 +131,7 @@
                                 AdditionalOptions="/MP"\r
                                 Optimization="2"\r
                                 AdditionalIncludeDirectories="..\..\src\zlib"\r
-                               PreprocessorDefinitions="WIN32;_LIB;NDEBUG"
+                               PreprocessorDefinitions="WIN32;_LIB;NDEBUG"\r
                                 ExceptionHandling="1"\r
                                 RuntimeLibrary="2"\r
                                 RuntimeTypeInfo="true"\r
@@ -146,7 +146,7 @@
                         />\r
                         <Tool\r
                                 Name="VCResourceCompilerTool"\r
-                               PreprocessorDefinitions="NDEBUG"
+                               PreprocessorDefinitions="NDEBUG"\r
                                 Culture="1033"\r
                                 AdditionalIncludeDirectories="..\..\src\zlib"\r
                         />\r
@@ -200,8 +200,8 @@
                                 Name="VCWebServiceProxyGeneratorTool"\r
                         />\r
                         <Tool\r
-                               Name="VCIDLTool"\r
-                               PreprocessorDefinitions="WIN32;_LIB;_DEBUG;NDEBUG"
+                               Name="VCMIDLTool"\r
+                               PreprocessorDefinitions="WIN32;_LIB;_DEBUG;NDEBUG"\r
                                 AdditionalIncludeDirectories="..\..\src\zlib"\r
                         />\r
                         <Tool\r
@@ -209,7 +209,7 @@
                                 AdditionalOptions="/MP"\r
                                 Optimization="0"\r
                                 AdditionalIncludeDirectories="..\..\src\zlib"\r
-                               PreprocessorDefinitions="WIN32;_LIB;_DEBUG;NDEBUG"
+                               PreprocessorDefinitions="WIN32;_LIB;_DEBUG;NDEBUG"\r
                                 ExceptionHandling="1"\r
                                 BasicRuntimeChecks="3"\r
                                 RuntimeLibrary="3"\r
@@ -226,7 +226,7 @@
                         />\r
                         <Tool\r
                                 Name="VCResourceCompilerTool"\r
-                               PreprocessorDefinitions="_DEBUG;NDEBUG"
+                               PreprocessorDefinitions="_DEBUG;NDEBUG"\r
                                 Culture="1033"\r
                                 AdditionalIncludeDirectories="..\..\src\zlib"\r
                         />\r
@@ -280,8 +280,8 @@
                                 Name="VCWebServiceProxyGeneratorTool"\r
                         />\r
                         <Tool\r
-                               Name="VCIDLTool"\r
-                               PreprocessorDefinitions="WIN32;_LIB;NDEBUG"
+                               Name="VCMIDLTool"\r
+                               PreprocessorDefinitions="WIN32;_LIB;NDEBUG"\r
                                 AdditionalIncludeDirectories="..\..\src\zlib"\r
                         />\r
                         <Tool\r
@@ -289,7 +289,7 @@
                                 AdditionalOptions="/MP"\r
                                 Optimization="2"\r
                                 AdditionalIncludeDirectories="..\..\src\zlib"\r
-                               PreprocessorDefinitions="WIN32;_LIB;NDEBUG"
+                               PreprocessorDefinitions="WIN32;_LIB;NDEBUG"\r
                                 ExceptionHandling="1"\r
                                 RuntimeLibrary="2"\r
                                 RuntimeTypeInfo="true"\r
@@ -304,7 +304,7 @@
                         />\r
                         <Tool\r
                                 Name="VCResourceCompilerTool"\r
-                               PreprocessorDefinitions="NDEBUG"
+                               PreprocessorDefinitions="NDEBUG"\r
                                 Culture="1033"\r
                                 AdditionalIncludeDirectories="..\..\src\zlib"\r
                         />\r
@@ -358,8 +358,8 @@
                                 Name="VCWebServiceProxyGeneratorTool"\r
                         />\r
                         <Tool\r
-                               Name="VCIDLTool"\r
-                               PreprocessorDefinitions="WIN32;_LIB;_DEBUG;NDEBUG"
+                               Name="VCMIDLTool"\r
+                               PreprocessorDefinitions="WIN32;_LIB;_DEBUG;NDEBUG"\r
                                 AdditionalIncludeDirectories="..\..\src\zlib"\r
                         />\r
                         <Tool\r
@@ -367,7 +367,7 @@
                                 AdditionalOptions="/MP"\r
                                 Optimization="0"\r
                                 AdditionalIncludeDirectories="..\..\src\zlib"\r
-                               PreprocessorDefinitions="WIN32;_LIB;_DEBUG;NDEBUG"
+                               PreprocessorDefinitions="WIN32;_LIB;_DEBUG;NDEBUG"\r
                                 ExceptionHandling="1"\r
                                 BasicRuntimeChecks="3"\r
                                 RuntimeLibrary="3"\r
@@ -384,7 +384,7 @@
                         />\r
                         <Tool\r
                                 Name="VCResourceCompilerTool"\r
-                               PreprocessorDefinitions="_DEBUG;NDEBUG"
+                               PreprocessorDefinitions="_DEBUG;NDEBUG"\r
                                 Culture="1033"\r
                                 AdditionalIncludeDirectories="..\..\src\zlib"\r
                         />\r
@@ -438,8 +438,8 @@
                                 Name="VCWebServiceProxyGeneratorTool"\r
                         />\r
                         <Tool\r
-                               Name="VCIDLTool"\r
-                               PreprocessorDefinitions="WIN32;_LIB;NDEBUG"
+                               Name="VCMIDLTool"\r
+                               PreprocessorDefinitions="WIN32;_LIB;NDEBUG"\r
                                 AdditionalIncludeDirectories="..\..\src\zlib"\r
                         />\r
                         <Tool\r
@@ -447,7 +447,7 @@
                                 AdditionalOptions="/MP"\r
                                 Optimization="2"\r
                                 AdditionalIncludeDirectories="..\..\src\zlib"\r
-                               PreprocessorDefinitions="WIN32;_LIB;NDEBUG"
+                               PreprocessorDefinitions="WIN32;_LIB;NDEBUG"\r
                                 ExceptionHandling="1"\r
                                 RuntimeLibrary="2"\r
                                 RuntimeTypeInfo="true"\r
@@ -462,7 +462,7 @@
                         />\r
                         <Tool\r
                                 Name="VCResourceCompilerTool"\r
-                               PreprocessorDefinitions="NDEBUG"
+                               PreprocessorDefinitions="NDEBUG"\r
                                 Culture="1033"\r
                                 AdditionalIncludeDirectories="..\..\src\zlib"\r
                         />\r
@@ -516,8 +516,8 @@
                                 Name="VCWebServiceProxyGeneratorTool"\r
                         />\r
                         <Tool\r
-                               Name="VCIDLTool"\r
-                               PreprocessorDefinitions="WIN32;_LIB;_DEBUG;NDEBUG"
+                               Name="VCMIDLTool"\r
+                               PreprocessorDefinitions="WIN32;_LIB;_DEBUG;NDEBUG"\r
                                 AdditionalIncludeDirectories="..\..\src\zlib"\r
                         />\r
                         <Tool\r
@@ -525,7 +525,7 @@
                                 AdditionalOptions="/MP"\r
                                 Optimization="0"\r
                                 AdditionalIncludeDirectories="..\..\src\zlib"\r
-                               PreprocessorDefinitions="WIN32;_LIB;_DEBUG;NDEBUG"
+                               PreprocessorDefinitions="WIN32;_LIB;_DEBUG;NDEBUG"\r
                                 ExceptionHandling="1"\r
                                 BasicRuntimeChecks="3"\r
                                 RuntimeLibrary="3"\r
@@ -542,7 +542,7 @@
                         />\r
                         <Tool\r
                                 Name="VCResourceCompilerTool"\r
-                               PreprocessorDefinitions="_DEBUG;NDEBUG"
+                               PreprocessorDefinitions="_DEBUG;NDEBUG"\r
                                 Culture="1033"\r
                                 AdditionalIncludeDirectories="..\..\src\zlib"\r
                         />\r
@@ -596,8 +596,8 @@
                                 Name="VCWebServiceProxyGeneratorTool"\r
                         />\r
                         <Tool\r
-                               Name="VCIDLTool"\r
-                               PreprocessorDefinitions="WIN32;_LIB;NDEBUG"
+                               Name="VCMIDLTool"\r
+                               PreprocessorDefinitions="WIN32;_LIB;NDEBUG"\r
                                 AdditionalIncludeDirectories="..\..\src\zlib"\r
                         />\r
                         <Tool\r
@@ -605,7 +605,7 @@
                                 AdditionalOptions="/MP"\r
                                 Optimization="2"\r
                                 AdditionalIncludeDirectories="..\..\src\zlib"\r
-                               PreprocessorDefinitions="WIN32;_LIB;NDEBUG"
+                               PreprocessorDefinitions="WIN32;_LIB;NDEBUG"\r
                                 ExceptionHandling="1"\r
                                 RuntimeLibrary="2"\r
                                 RuntimeTypeInfo="true"\r
@@ -620,7 +620,7 @@
                         />\r
                         <Tool\r
                                 Name="VCResourceCompilerTool"\r
-                               PreprocessorDefinitions="NDEBUG"
+                               PreprocessorDefinitions="NDEBUG"\r
                                 Culture="1033"\r
                                 AdditionalIncludeDirectories="..\..\src\zlib"\r
                         />\r
diff --git a/build/msw/wx_vc9_wxregex.vcproj b/build/msw/wx_vc9_wxregex.vcproj

index 21021bd6afef5bcf02335ae423aa251247051a3c..750d13d278896506704516a0ba77f2d35132eb25 100644 (file)
--- a/build/msw/wx_vc9_wxregex.vcproj
+++ b/build/msw/wx_vc9_wxregex.vcproj
@@ -43,8 +43,8 @@
                                 Name="VCWebServiceProxyGeneratorTool"\r
                         />\r
                         <Tool\r
-                               Name="VCIDLTool"\r
-                               PreprocessorDefinitions="WIN32;_LIB;_DEBUG;NDEBUG;__WXMSW__;_UNICODE"
+                               Name="VCMIDLTool"\r
+                               PreprocessorDefinitions="WIN32;_LIB;_DEBUG;NDEBUG;__WXMSW__;_UNICODE"\r
                                 AdditionalIncludeDirectories="..\..\include;..\..\lib\vc_lib\mswud"\r
                         />\r
                         <Tool\r
@@ -52,7 +52,7 @@
                                 AdditionalOptions="/MP"\r
                                 Optimization="0"\r
                                 AdditionalIncludeDirectories="..\..\include;..\..\lib\vc_lib\mswud"\r
-                               PreprocessorDefinitions="WIN32;_LIB;_DEBUG;NDEBUG;__WXMSW__;_UNICODE"
+                               PreprocessorDefinitions="WIN32;_LIB;_DEBUG;NDEBUG;__WXMSW__;_UNICODE"\r
                                 ExceptionHandling="1"\r
                                 BasicRuntimeChecks="3"\r
                                 RuntimeLibrary="3"\r
@@ -69,7 +69,7 @@
                         />\r
                         <Tool\r
                                 Name="VCResourceCompilerTool"\r
-                               PreprocessorDefinitions="_DEBUG;NDEBUG;__WXMSW__;_UNICODE"
+                               PreprocessorDefinitions="_DEBUG;NDEBUG;__WXMSW__;_UNICODE"\r
                                 Culture="1033"\r
                                 AdditionalIncludeDirectories="..\..\include;..\..\lib\vc_lib\mswud"\r
                         />\r
@@ -124,8 +124,8 @@
                                 Name="VCWebServiceProxyGeneratorTool"\r
                         />\r
                         <Tool\r
-                               Name="VCIDLTool"\r
-                               PreprocessorDefinitions="WIN32;_LIB;NDEBUG;__WXMSW__;_UNICODE"
+                               Name="VCMIDLTool"\r
+                               PreprocessorDefinitions="WIN32;_LIB;NDEBUG;__WXMSW__;_UNICODE"\r
                                 AdditionalIncludeDirectories="..\..\include;..\..\lib\vc_lib\mswu"\r
                         />\r
                         <Tool\r
@@ -133,7 +133,7 @@
                                 AdditionalOptions="/MP"\r
                                 Optimization="2"\r
                                 AdditionalIncludeDirectories="..\..\include;..\..\lib\vc_lib\mswu"\r
-                               PreprocessorDefinitions="WIN32;_LIB;NDEBUG;__WXMSW__;_UNICODE"
+                               PreprocessorDefinitions="WIN32;_LIB;NDEBUG;__WXMSW__;_UNICODE"\r
                                 ExceptionHandling="1"\r
                                 RuntimeLibrary="2"\r
                                 RuntimeTypeInfo="true"\r
@@ -148,7 +148,7 @@
                         />\r
                         <Tool\r
                                 Name="VCResourceCompilerTool"\r
-                               PreprocessorDefinitions="NDEBUG;__WXMSW__;_UNICODE"
+                               PreprocessorDefinitions="NDEBUG;__WXMSW__;_UNICODE"\r
                                 Culture="1033"\r
                                 AdditionalIncludeDirectories="..\..\include;..\..\lib\vc_lib\mswu"\r
                         />\r
@@ -203,8 +203,8 @@
                                 Name="VCWebServiceProxyGeneratorTool"\r
                         />\r
                         <Tool\r
-                               Name="VCIDLTool"\r
-                               PreprocessorDefinitions="WIN32;_LIB;_DEBUG;NDEBUG;__WXMSW__;__WXUNIVERSAL__;_UNICODE"
+                               Name="VCMIDLTool"\r
+                               PreprocessorDefinitions="WIN32;_LIB;_DEBUG;NDEBUG;__WXMSW__;__WXUNIVERSAL__;_UNICODE"\r
                                 AdditionalIncludeDirectories="..\..\include;..\..\lib\vc_lib\mswunivud"\r
                         />\r
                         <Tool\r
@@ -212,7 +212,7 @@
                                 AdditionalOptions="/MP"\r
                                 Optimization="0"\r
                                 AdditionalIncludeDirectories="..\..\include;..\..\lib\vc_lib\mswunivud"\r
-                               PreprocessorDefinitions="WIN32;_LIB;_DEBUG;NDEBUG;__WXMSW__;__WXUNIVERSAL__;_UNICODE"
+                               PreprocessorDefinitions="WIN32;_LIB;_DEBUG;NDEBUG;__WXMSW__;__WXUNIVERSAL__;_UNICODE"\r
                                 ExceptionHandling="1"\r
                                 BasicRuntimeChecks="3"\r
                                 RuntimeLibrary="3"\r
@@ -229,7 +229,7 @@
                         />\r
                         <Tool\r
                                 Name="VCResourceCompilerTool"\r
-                               PreprocessorDefinitions="_DEBUG;NDEBUG;__WXMSW__;__WXUNIVERSAL__;_UNICODE"
+                               PreprocessorDefinitions="_DEBUG;NDEBUG;__WXMSW__;__WXUNIVERSAL__;_UNICODE"\r
                                 Culture="1033"\r
                                 AdditionalIncludeDirectories="..\..\include;..\..\lib\vc_lib\mswunivud"\r
                         />\r
@@ -284,8 +284,8 @@
                                 Name="VCWebServiceProxyGeneratorTool"\r
                         />\r
                         <Tool\r
-                               Name="VCIDLTool"\r
-                               PreprocessorDefinitions="WIN32;_LIB;NDEBUG;__WXMSW__;__WXUNIVERSAL__;_UNICODE"
+                               Name="VCMIDLTool"\r
+                               PreprocessorDefinitions="WIN32;_LIB;NDEBUG;__WXMSW__;__WXUNIVERSAL__;_UNICODE"\r
                                 AdditionalIncludeDirectories="..\..\include;..\..\lib\vc_lib\mswunivu"\r
                         />\r
                         <Tool\r
@@ -293,7 +293,7 @@
                                 AdditionalOptions="/MP"\r
                                 Optimization="2"\r
                                 AdditionalIncludeDirectories="..\..\include;..\..\lib\vc_lib\mswunivu"\r
-                               PreprocessorDefinitions="WIN32;_LIB;NDEBUG;__WXMSW__;__WXUNIVERSAL__;_UNICODE"
+                               PreprocessorDefinitions="WIN32;_LIB;NDEBUG;__WXMSW__;__WXUNIVERSAL__;_UNICODE"\r
                                 ExceptionHandling="1"\r
                                 RuntimeLibrary="2"\r
                                 RuntimeTypeInfo="true"\r
@@ -308,7 +308,7 @@
                         />\r
                         <Tool\r
                                 Name="VCResourceCompilerTool"\r
-                               PreprocessorDefinitions="NDEBUG;__WXMSW__;__WXUNIVERSAL__;_UNICODE"
+                               PreprocessorDefinitions="NDEBUG;__WXMSW__;__WXUNIVERSAL__;_UNICODE"\r
                                 Culture="1033"\r
                                 AdditionalIncludeDirectories="..\..\include;..\..\lib\vc_lib\mswunivu"\r
                         />\r
@@ -363,8 +363,8 @@
                                 Name="VCWebServiceProxyGeneratorTool"\r
                         />\r
                         <Tool\r
-                               Name="VCIDLTool"\r
-                               PreprocessorDefinitions="WIN32;_LIB;_DEBUG;NDEBUG;__WXMSW__;_UNICODE"
+                               Name="VCMIDLTool"\r
+                               PreprocessorDefinitions="WIN32;_LIB;_DEBUG;NDEBUG;__WXMSW__;_UNICODE"\r
                                 AdditionalIncludeDirectories="..\..\include;..\..\lib\vc_dll\mswud"\r
                         />\r
                         <Tool\r
@@ -372,7 +372,7 @@
                                 AdditionalOptions="/MP"\r
                                 Optimization="0"\r
                                 AdditionalIncludeDirectories="..\..\include;..\..\lib\vc_dll\mswud"\r
-                               PreprocessorDefinitions="WIN32;_LIB;_DEBUG;NDEBUG;__WXMSW__;_UNICODE"
+                               PreprocessorDefinitions="WIN32;_LIB;_DEBUG;NDEBUG;__WXMSW__;_UNICODE"\r
                                 ExceptionHandling="1"\r
                                 BasicRuntimeChecks="3"\r
                                 RuntimeLibrary="3"\r
@@ -389,7 +389,7 @@
                         />\r
                         <Tool\r
                                 Name="VCResourceCompilerTool"\r
-                               PreprocessorDefinitions="_DEBUG;NDEBUG;__WXMSW__;_UNICODE"
+                               PreprocessorDefinitions="_DEBUG;NDEBUG;__WXMSW__;_UNICODE"\r
                                 Culture="1033"\r
                                 AdditionalIncludeDirectories="..\..\include;..\..\lib\vc_dll\mswud"\r
                         />\r
@@ -444,8 +444,8 @@
                                 Name="VCWebServiceProxyGeneratorTool"\r
                         />\r
                         <Tool\r
-                               Name="VCIDLTool"\r
-                               PreprocessorDefinitions="WIN32;_LIB;NDEBUG;__WXMSW__;_UNICODE"
+                               Name="VCMIDLTool"\r
+                               PreprocessorDefinitions="WIN32;_LIB;NDEBUG;__WXMSW__;_UNICODE"\r
                                 AdditionalIncludeDirectories="..\..\include;..\..\lib\vc_dll\mswu"\r
                         />\r
                         <Tool\r
@@ -453,7 +453,7 @@
                                 AdditionalOptions="/MP"\r
                                 Optimization="2"\r
                                 AdditionalIncludeDirectories="..\..\include;..\..\lib\vc_dll\mswu"\r
-                               PreprocessorDefinitions="WIN32;_LIB;NDEBUG;__WXMSW__;_UNICODE"
+                               PreprocessorDefinitions="WIN32;_LIB;NDEBUG;__WXMSW__;_UNICODE"\r
                                 ExceptionHandling="1"\r
                                 RuntimeLibrary="2"\r
                                 RuntimeTypeInfo="true"\r
@@ -468,7 +468,7 @@
                         />\r
                         <Tool\r
                                 Name="VCResourceCompilerTool"\r
-                               PreprocessorDefinitions="NDEBUG;__WXMSW__;_UNICODE"
+                               PreprocessorDefinitions="NDEBUG;__WXMSW__;_UNICODE"\r
                                 Culture="1033"\r
                                 AdditionalIncludeDirectories="..\..\include;..\..\lib\vc_dll\mswu"\r
                         />\r
@@ -523,8 +523,8 @@
                                 Name="VCWebServiceProxyGeneratorTool"\r
                         />\r
                         <Tool\r
-                               Name="VCIDLTool"\r
-                               PreprocessorDefinitions="WIN32;_LIB;_DEBUG;NDEBUG;__WXMSW__;__WXUNIVERSAL__;_UNICODE"
+                               Name="VCMIDLTool"\r
+                               PreprocessorDefinitions="WIN32;_LIB;_DEBUG;NDEBUG;__WXMSW__;__WXUNIVERSAL__;_UNICODE"\r
                                 AdditionalIncludeDirectories="..\..\include;..\..\lib\vc_dll\mswunivud"\r
                         />\r
                         <Tool\r
@@ -532,7 +532,7 @@
                                 AdditionalOptions="/MP"\r
                                 Optimization="0"\r
                                 AdditionalIncludeDirectories="..\..\include;..\..\lib\vc_dll\mswunivud"\r
-                               PreprocessorDefinitions="WIN32;_LIB;_DEBUG;NDEBUG;__WXMSW__;__WXUNIVERSAL__;_UNICODE"
+                               PreprocessorDefinitions="WIN32;_LIB;_DEBUG;NDEBUG;__WXMSW__;__WXUNIVERSAL__;_UNICODE"\r
                                 ExceptionHandling="1"\r
                                 BasicRuntimeChecks="3"\r
                                 RuntimeLibrary="3"\r
@@ -549,7 +549,7 @@
                         />\r
                         <Tool\r
                                 Name="VCResourceCompilerTool"\r
-                               PreprocessorDefinitions="_DEBUG;NDEBUG;__WXMSW__;__WXUNIVERSAL__;_UNICODE"
+                               PreprocessorDefinitions="_DEBUG;NDEBUG;__WXMSW__;__WXUNIVERSAL__;_UNICODE"\r
                                 Culture="1033"\r
                                 AdditionalIncludeDirectories="..\..\include;..\..\lib\vc_dll\mswunivud"\r
                         />\r
@@ -604,8 +604,8 @@
                                 Name="VCWebServiceProxyGeneratorTool"\r
                         />\r
                         <Tool\r
-                               Name="VCIDLTool"\r
-                               PreprocessorDefinitions="WIN32;_LIB;NDEBUG;__WXMSW__;__WXUNIVERSAL__;_UNICODE"
+                               Name="VCMIDLTool"\r
+                               PreprocessorDefinitions="WIN32;_LIB;NDEBUG;__WXMSW__;__WXUNIVERSAL__;_UNICODE"\r
                                 AdditionalIncludeDirectories="..\..\include;..\..\lib\vc_dll\mswunivu"\r
                         />\r
                         <Tool\r
@@ -613,7 +613,7 @@
                                 AdditionalOptions="/MP"\r
                                 Optimization="2"\r
                                 AdditionalIncludeDirectories="..\..\include;..\..\lib\vc_dll\mswunivu"\r
-                               PreprocessorDefinitions="WIN32;_LIB;NDEBUG;__WXMSW__;__WXUNIVERSAL__;_UNICODE"
+                               PreprocessorDefinitions="WIN32;_LIB;NDEBUG;__WXMSW__;__WXUNIVERSAL__;_UNICODE"\r
                                 ExceptionHandling="1"\r
                                 RuntimeLibrary="2"\r
                                 RuntimeTypeInfo="true"\r
@@ -628,7 +628,7 @@
                         />\r
                         <Tool\r
                                 Name="VCResourceCompilerTool"\r
-                               PreprocessorDefinitions="NDEBUG;__WXMSW__;__WXUNIVERSAL__;_UNICODE"
+                               PreprocessorDefinitions="NDEBUG;__WXMSW__;__WXUNIVERSAL__;_UNICODE"\r
                                 Culture="1033"\r
                                 AdditionalIncludeDirectories="..\..\include;..\..\lib\vc_dll\mswunivu"\r
                         />\r
diff --git a/build/msw/wx_vc9_wxscintilla.vcproj b/build/msw/wx_vc9_wxscintilla.vcproj

index 541cd809e81903d003f776ffafdd534c9b5dc184..9ce2d4412491b89edd8a6b983187eb8b5ed6b9e5 100644 (file)
--- a/build/msw/wx_vc9_wxscintilla.vcproj
+++ b/build/msw/wx_vc9_wxscintilla.vcproj
@@ -42,8 +42,8 @@
                                 Name="VCWebServiceProxyGeneratorTool"\r
                         />\r
                         <Tool\r
-                               Name="VCIDLTool"\r
-                               PreprocessorDefinitions="WIN32;_LIB;_DEBUG;NDEBUG;__WX__;SCI_LEXER;LINK_LEXERS"
+                               Name="VCMIDLTool"\r
+                               PreprocessorDefinitions="WIN32;_LIB;_DEBUG;NDEBUG;__WX__;SCI_LEXER;LINK_LEXERS"\r
                                 AdditionalIncludeDirectories="..\..\src\stc\scintilla\include;..\..\src\stc\scintilla\src"\r
                         />\r
                         <Tool\r
@@ -51,7 +51,7 @@
                                 AdditionalOptions="/MP"\r
                                 Optimization="0"\r
                                 AdditionalIncludeDirectories="..\..\src\stc\scintilla\include;..\..\src\stc\scintilla\src"\r
-                               PreprocessorDefinitions="WIN32;_LIB;_DEBUG;NDEBUG;__WX__;SCI_LEXER;LINK_LEXERS"
+                               PreprocessorDefinitions="WIN32;_LIB;_DEBUG;NDEBUG;__WX__;SCI_LEXER;LINK_LEXERS"\r
                                 ExceptionHandling="1"\r
                                 BasicRuntimeChecks="3"\r
                                 RuntimeLibrary="3"\r
@@ -68,7 +68,7 @@
                         />\r
                         <Tool\r
                                 Name="VCResourceCompilerTool"\r
-                               PreprocessorDefinitions="_DEBUG;NDEBUG;__WX__;SCI_LEXER;LINK_LEXERS"
+                               PreprocessorDefinitions="_DEBUG;NDEBUG;__WX__;SCI_LEXER;LINK_LEXERS"\r
                                 Culture="1033"\r
                                 AdditionalIncludeDirectories="..\..\src\stc\scintilla\include;..\..\src\stc\scintilla\src"\r
                         />\r
@@ -122,8 +122,8 @@
                                 Name="VCWebServiceProxyGeneratorTool"\r
                         />\r
                         <Tool\r
-                               Name="VCIDLTool"\r
-                               PreprocessorDefinitions="WIN32;_LIB;NDEBUG;__WX__;SCI_LEXER;LINK_LEXERS"
+                               Name="VCMIDLTool"\r
+                               PreprocessorDefinitions="WIN32;_LIB;NDEBUG;__WX__;SCI_LEXER;LINK_LEXERS"\r
                                 AdditionalIncludeDirectories="..\..\src\stc\scintilla\include;..\..\src\stc\scintilla\src"\r
                         />\r
                         <Tool\r
@@ -131,7 +131,7 @@
                                 AdditionalOptions="/MP"\r
                                 Optimization="2"\r
                                 AdditionalIncludeDirectories="..\..\src\stc\scintilla\include;..\..\src\stc\scintilla\src"\r
-                               PreprocessorDefinitions="WIN32;_LIB;NDEBUG;__WX__;SCI_LEXER;LINK_LEXERS"
+                               PreprocessorDefinitions="WIN32;_LIB;NDEBUG;__WX__;SCI_LEXER;LINK_LEXERS"\r
                                 ExceptionHandling="1"\r
                                 RuntimeLibrary="2"\r
                                 RuntimeTypeInfo="true"\r
@@ -146,7 +146,7 @@
                         />\r
                         <Tool\r
                                 Name="VCResourceCompilerTool"\r
-                               PreprocessorDefinitions="NDEBUG;__WX__;SCI_LEXER;LINK_LEXERS"
+                               PreprocessorDefinitions="NDEBUG;__WX__;SCI_LEXER;LINK_LEXERS"\r
                                 Culture="1033"\r
                                 AdditionalIncludeDirectories="..\..\src\stc\scintilla\include;..\..\src\stc\scintilla\src"\r
                         />\r
@@ -200,8 +200,8 @@
                                 Name="VCWebServiceProxyGeneratorTool"\r
                         />\r
                         <Tool\r
-                               Name="VCIDLTool"\r
-                               PreprocessorDefinitions="WIN32;_LIB;_DEBUG;NDEBUG;__WX__;SCI_LEXER;LINK_LEXERS"
+                               Name="VCMIDLTool"\r
+                               PreprocessorDefinitions="WIN32;_LIB;_DEBUG;NDEBUG;__WX__;SCI_LEXER;LINK_LEXERS"\r
                                 AdditionalIncludeDirectories="..\..\src\stc\scintilla\include;..\..\src\stc\scintilla\src"\r
                         />\r
                         <Tool\r
@@ -209,7 +209,7 @@
                                 AdditionalOptions="/MP"\r
                                 Optimization="0"\r
                                 AdditionalIncludeDirectories="..\..\src\stc\scintilla\include;..\..\src\stc\scintilla\src"\r
-                               PreprocessorDefinitions="WIN32;_LIB;_DEBUG;NDEBUG;__WX__;SCI_LEXER;LINK_LEXERS"
+                               PreprocessorDefinitions="WIN32;_LIB;_DEBUG;NDEBUG;__WX__;SCI_LEXER;LINK_LEXERS"\r
                                 ExceptionHandling="1"\r
                                 BasicRuntimeChecks="3"\r
                                 RuntimeLibrary="3"\r
@@ -226,7 +226,7 @@
                         />\r
                         <Tool\r
                                 Name="VCResourceCompilerTool"\r
-                               PreprocessorDefinitions="_DEBUG;NDEBUG;__WX__;SCI_LEXER;LINK_LEXERS"
+                               PreprocessorDefinitions="_DEBUG;NDEBUG;__WX__;SCI_LEXER;LINK_LEXERS"\r
                                 Culture="1033"\r
                                 AdditionalIncludeDirectories="..\..\src\stc\scintilla\include;..\..\src\stc\scintilla\src"\r
                         />\r
@@ -280,8 +280,8 @@
                                 Name="VCWebServiceProxyGeneratorTool"\r
                         />\r
                         <Tool\r
-                               Name="VCIDLTool"\r
-                               PreprocessorDefinitions="WIN32;_LIB;NDEBUG;__WX__;SCI_LEXER;LINK_LEXERS"
+                               Name="VCMIDLTool"\r
+                               PreprocessorDefinitions="WIN32;_LIB;NDEBUG;__WX__;SCI_LEXER;LINK_LEXERS"\r
                                 AdditionalIncludeDirectories="..\..\src\stc\scintilla\include;..\..\src\stc\scintilla\src"\r
                         />\r
                         <Tool\r
@@ -289,7 +289,7 @@
                                 AdditionalOptions="/MP"\r
                                 Optimization="2"\r
                                 AdditionalIncludeDirectories="..\..\src\stc\scintilla\include;..\..\src\stc\scintilla\src"\r
-                               PreprocessorDefinitions="WIN32;_LIB;NDEBUG;__WX__;SCI_LEXER;LINK_LEXERS"
+                               PreprocessorDefinitions="WIN32;_LIB;NDEBUG;__WX__;SCI_LEXER;LINK_LEXERS"\r
                                 ExceptionHandling="1"\r
                                 RuntimeLibrary="2"\r
                                 RuntimeTypeInfo="true"\r
@@ -304,7 +304,7 @@
                         />\r
                         <Tool\r
                                 Name="VCResourceCompilerTool"\r
-                               PreprocessorDefinitions="NDEBUG;__WX__;SCI_LEXER;LINK_LEXERS"
+                               PreprocessorDefinitions="NDEBUG;__WX__;SCI_LEXER;LINK_LEXERS"\r
                                 Culture="1033"\r
                                 AdditionalIncludeDirectories="..\..\src\stc\scintilla\include;..\..\src\stc\scintilla\src"\r
                         />\r
@@ -358,8 +358,8 @@
                                 Name="VCWebServiceProxyGeneratorTool"\r
                         />\r
                         <Tool\r
-                               Name="VCIDLTool"\r
-                               PreprocessorDefinitions="WIN32;_LIB;_DEBUG;NDEBUG;__WX__;SCI_LEXER;LINK_LEXERS"
+                               Name="VCMIDLTool"\r
+                               PreprocessorDefinitions="WIN32;_LIB;_DEBUG;NDEBUG;__WX__;SCI_LEXER;LINK_LEXERS"\r
                                 AdditionalIncludeDirectories="..\..\src\stc\scintilla\include;..\..\src\stc\scintilla\src"\r
                         />\r
                         <Tool\r
@@ -367,7 +367,7 @@
                                 AdditionalOptions="/MP"\r
                                 Optimization="0"\r
                                 AdditionalIncludeDirectories="..\..\src\stc\scintilla\include;..\..\src\stc\scintilla\src"\r
-                               PreprocessorDefinitions="WIN32;_LIB;_DEBUG;NDEBUG;__WX__;SCI_LEXER;LINK_LEXERS"
+                               PreprocessorDefinitions="WIN32;_LIB;_DEBUG;NDEBUG;__WX__;SCI_LEXER;LINK_LEXERS"\r
                                 ExceptionHandling="1"\r
                                 BasicRuntimeChecks="3"\r
                                 RuntimeLibrary="3"\r
@@ -384,7 +384,7 @@
                         />\r
                         <Tool\r
                                 Name="VCResourceCompilerTool"\r
-                               PreprocessorDefinitions="_DEBUG;NDEBUG;__WX__;SCI_LEXER;LINK_LEXERS"
+                               PreprocessorDefinitions="_DEBUG;NDEBUG;__WX__;SCI_LEXER;LINK_LEXERS"\r
                                 Culture="1033"\r
                                 AdditionalIncludeDirectories="..\..\src\stc\scintilla\include;..\..\src\stc\scintilla\src"\r
                         />\r
@@ -438,8 +438,8 @@
                                 Name="VCWebServiceProxyGeneratorTool"\r
                         />\r
                         <Tool\r
-                               Name="VCIDLTool"\r
-                               PreprocessorDefinitions="WIN32;_LIB;NDEBUG;__WX__;SCI_LEXER;LINK_LEXERS"
+                               Name="VCMIDLTool"\r
+                               PreprocessorDefinitions="WIN32;_LIB;NDEBUG;__WX__;SCI_LEXER;LINK_LEXERS"\r
                                 AdditionalIncludeDirectories="..\..\src\stc\scintilla\include;..\..\src\stc\scintilla\src"\r
                         />\r
                         <Tool\r
@@ -447,7 +447,7 @@
                                 AdditionalOptions="/MP"\r
                                 Optimization="2"\r
                                 AdditionalIncludeDirectories="..\..\src\stc\scintilla\include;..\..\src\stc\scintilla\src"\r
-                               PreprocessorDefinitions="WIN32;_LIB;NDEBUG;__WX__;SCI_LEXER;LINK_LEXERS"
+                               PreprocessorDefinitions="WIN32;_LIB;NDEBUG;__WX__;SCI_LEXER;LINK_LEXERS"\r
                                 ExceptionHandling="1"\r
                                 RuntimeLibrary="2"\r
                                 RuntimeTypeInfo="true"\r
@@ -462,7 +462,7 @@
                         />\r
                         <Tool\r
                                 Name="VCResourceCompilerTool"\r
-                               PreprocessorDefinitions="NDEBUG;__WX__;SCI_LEXER;LINK_LEXERS"
+                               PreprocessorDefinitions="NDEBUG;__WX__;SCI_LEXER;LINK_LEXERS"\r
                                 Culture="1033"\r
                                 AdditionalIncludeDirectories="..\..\src\stc\scintilla\include;..\..\src\stc\scintilla\src"\r
                         />\r
@@ -516,8 +516,8 @@
                                 Name="VCWebServiceProxyGeneratorTool"\r
                         />\r
                         <Tool\r
-                               Name="VCIDLTool"\r
-                               PreprocessorDefinitions="WIN32;_LIB;_DEBUG;NDEBUG;__WX__;SCI_LEXER;LINK_LEXERS"
+                               Name="VCMIDLTool"\r
+                               PreprocessorDefinitions="WIN32;_LIB;_DEBUG;NDEBUG;__WX__;SCI_LEXER;LINK_LEXERS"\r
                                 AdditionalIncludeDirectories="..\..\src\stc\scintilla\include;..\..\src\stc\scintilla\src"\r
                         />\r
                         <Tool\r
@@ -525,7 +525,7 @@
                                 AdditionalOptions="/MP"\r
                                 Optimization="0"\r
                                 AdditionalIncludeDirectories="..\..\src\stc\scintilla\include;..\..\src\stc\scintilla\src"\r
-                               PreprocessorDefinitions="WIN32;_LIB;_DEBUG;NDEBUG;__WX__;SCI_LEXER;LINK_LEXERS"
+                               PreprocessorDefinitions="WIN32;_LIB;_DEBUG;NDEBUG;__WX__;SCI_LEXER;LINK_LEXERS"\r
                                 ExceptionHandling="1"\r
                                 BasicRuntimeChecks="3"\r
                                 RuntimeLibrary="3"\r
@@ -542,7 +542,7 @@
                         />\r
                         <Tool\r
                                 Name="VCResourceCompilerTool"\r
-                               PreprocessorDefinitions="_DEBUG;NDEBUG;__WX__;SCI_LEXER;LINK_LEXERS"
+                               PreprocessorDefinitions="_DEBUG;NDEBUG;__WX__;SCI_LEXER;LINK_LEXERS"\r
                                 Culture="1033"\r
                                 AdditionalIncludeDirectories="..\..\src\stc\scintilla\include;..\..\src\stc\scintilla\src"\r
                         />\r
@@ -596,8 +596,8 @@
                                 Name="VCWebServiceProxyGeneratorTool"\r
                         />\r
                         <Tool\r
-                               Name="VCIDLTool"\r
-                               PreprocessorDefinitions="WIN32;_LIB;NDEBUG;__WX__;SCI_LEXER;LINK_LEXERS"
+                               Name="VCMIDLTool"\r
+                               PreprocessorDefinitions="WIN32;_LIB;NDEBUG;__WX__;SCI_LEXER;LINK_LEXERS"\r
                                 AdditionalIncludeDirectories="..\..\src\stc\scintilla\include;..\..\src\stc\scintilla\src"\r
                         />\r
                         <Tool\r
@@ -605,7 +605,7 @@
                                 AdditionalOptions="/MP"\r
                                 Optimization="2"\r
                                 AdditionalIncludeDirectories="..\..\src\stc\scintilla\include;..\..\src\stc\scintilla\src"\r
-                               PreprocessorDefinitions="WIN32;_LIB;NDEBUG;__WX__;SCI_LEXER;LINK_LEXERS"
+                               PreprocessorDefinitions="WIN32;_LIB;NDEBUG;__WX__;SCI_LEXER;LINK_LEXERS"\r
                                 ExceptionHandling="1"\r
                                 RuntimeLibrary="2"\r
                                 RuntimeTypeInfo="true"\r
@@ -620,7 +620,7 @@
                         />\r
                         <Tool\r
                                 Name="VCResourceCompilerTool"\r
-                               PreprocessorDefinitions="NDEBUG;__WX__;SCI_LEXER;LINK_LEXERS"
+                               PreprocessorDefinitions="NDEBUG;__WX__;SCI_LEXER;LINK_LEXERS"\r
                                 Culture="1033"\r
                                 AdditionalIncludeDirectories="..\..\src\stc\scintilla\include;..\..\src\stc\scintilla\src"\r
                         />\r
diff --git a/build/msw/wx_vc9_wxtiff.vcproj b/build/msw/wx_vc9_wxtiff.vcproj

index 578cfc871dbe346f3efaaa142d620e2568fb1742..7bb22b64f1f9df794488f312eef92a3548632a1b 100644 (file)
--- a/build/msw/wx_vc9_wxtiff.vcproj
+++ b/build/msw/wx_vc9_wxtiff.vcproj
@@ -42,8 +42,8 @@
                                 Name="VCWebServiceProxyGeneratorTool"\r
                         />\r
                         <Tool\r
-                               Name="VCIDLTool"\r
-                               PreprocessorDefinitions="WIN32;_LIB;_DEBUG;NDEBUG"
+                               Name="VCMIDLTool"\r
+                               PreprocessorDefinitions="WIN32;_LIB;_DEBUG;NDEBUG"\r
                                 AdditionalIncludeDirectories="..\..\src\zlib;..\..\src\jpeg;..\..\src\tiff\libtiff"\r
                         />\r
                         <Tool\r
@@ -51,7 +51,7 @@
                                 AdditionalOptions="/MP"\r
                                 Optimization="0"\r
                                 AdditionalIncludeDirectories="..\..\src\zlib;..\..\src\jpeg;..\..\src\tiff\libtiff"\r
-                               PreprocessorDefinitions="WIN32;_LIB;_DEBUG;NDEBUG"
+                               PreprocessorDefinitions="WIN32;_LIB;_DEBUG;NDEBUG"\r
                                 ExceptionHandling="1"\r
                                 BasicRuntimeChecks="3"\r
                                 RuntimeLibrary="3"\r
@@ -68,7 +68,7 @@
                         />\r
                         <Tool\r
                                 Name="VCResourceCompilerTool"\r
-                               PreprocessorDefinitions="_DEBUG;NDEBUG"
+                               PreprocessorDefinitions="_DEBUG;NDEBUG"\r
                                 Culture="1033"\r
                                 AdditionalIncludeDirectories="..\..\src\zlib;..\..\src\jpeg;..\..\src\tiff\libtiff"\r
                         />\r
@@ -122,8 +122,8 @@
                                 Name="VCWebServiceProxyGeneratorTool"\r
                         />\r
                         <Tool\r
-                               Name="VCIDLTool"\r
-                               PreprocessorDefinitions="WIN32;_LIB;NDEBUG"
+                               Name="VCMIDLTool"\r
+                               PreprocessorDefinitions="WIN32;_LIB;NDEBUG"\r
                                 AdditionalIncludeDirectories="..\..\src\zlib;..\..\src\jpeg;..\..\src\tiff\libtiff"\r
                         />\r
                         <Tool\r
@@ -131,7 +131,7 @@
                                 AdditionalOptions="/MP"\r
                                 Optimization="2"\r
                                 AdditionalIncludeDirectories="..\..\src\zlib;..\..\src\jpeg;..\..\src\tiff\libtiff"\r
-                               PreprocessorDefinitions="WIN32;_LIB;NDEBUG"
+                               PreprocessorDefinitions="WIN32;_LIB;NDEBUG"\r
                                 ExceptionHandling="1"\r
                                 RuntimeLibrary="2"\r
                                 RuntimeTypeInfo="true"\r
@@ -146,7 +146,7 @@
                         />\r
                         <Tool\r
                                 Name="VCResourceCompilerTool"\r
-                               PreprocessorDefinitions="NDEBUG"
+                               PreprocessorDefinitions="NDEBUG"\r
                                 Culture="1033"\r
                                 AdditionalIncludeDirectories="..\..\src\zlib;..\..\src\jpeg;..\..\src\tiff\libtiff"\r
                         />\r
@@ -200,8 +200,8 @@
                                 Name="VCWebServiceProxyGeneratorTool"\r
                         />\r
                         <Tool\r
-                               Name="VCIDLTool"\r
-                               PreprocessorDefinitions="WIN32;_LIB;_DEBUG;NDEBUG"
+                               Name="VCMIDLTool"\r
+                               PreprocessorDefinitions="WIN32;_LIB;_DEBUG;NDEBUG"\r
                                 AdditionalIncludeDirectories="..\..\src\zlib;..\..\src\jpeg;..\..\src\tiff\libtiff"\r
                         />\r
                         <Tool\r
@@ -209,7 +209,7 @@
                                 AdditionalOptions="/MP"\r
                                 Optimization="0"\r
                                 AdditionalIncludeDirectories="..\..\src\zlib;..\..\src\jpeg;..\..\src\tiff\libtiff"\r
-                               PreprocessorDefinitions="WIN32;_LIB;_DEBUG;NDEBUG"
+                               PreprocessorDefinitions="WIN32;_LIB;_DEBUG;NDEBUG"\r
                                 ExceptionHandling="1"\r
                                 BasicRuntimeChecks="3"\r
                                 RuntimeLibrary="3"\r
@@ -226,7 +226,7 @@
                         />\r
                         <Tool\r
                                 Name="VCResourceCompilerTool"\r
-                               PreprocessorDefinitions="_DEBUG;NDEBUG"
+                               PreprocessorDefinitions="_DEBUG;NDEBUG"\r
                                 Culture="1033"\r
                                 AdditionalIncludeDirectories="..\..\src\zlib;..\..\src\jpeg;..\..\src\tiff\libtiff"\r
                         />\r
@@ -280,8 +280,8 @@
                                 Name="VCWebServiceProxyGeneratorTool"\r
                         />\r
                         <Tool\r
-                               Name="VCIDLTool"\r
-                               PreprocessorDefinitions="WIN32;_LIB;NDEBUG"
+                               Name="VCMIDLTool"\r
+                               PreprocessorDefinitions="WIN32;_LIB;NDEBUG"\r
                                 AdditionalIncludeDirectories="..\..\src\zlib;..\..\src\jpeg;..\..\src\tiff\libtiff"\r
                         />\r
                         <Tool\r
@@ -289,7 +289,7 @@
                                 AdditionalOptions="/MP"\r
                                 Optimization="2"\r
                                 AdditionalIncludeDirectories="..\..\src\zlib;..\..\src\jpeg;..\..\src\tiff\libtiff"\r
-                               PreprocessorDefinitions="WIN32;_LIB;NDEBUG"
+                               PreprocessorDefinitions="WIN32;_LIB;NDEBUG"\r
                                 ExceptionHandling="1"\r
                                 RuntimeLibrary="2"\r
                                 RuntimeTypeInfo="true"\r
@@ -304,7 +304,7 @@
                         />\r
                         <Tool\r
                                 Name="VCResourceCompilerTool"\r
-                               PreprocessorDefinitions="NDEBUG"
+                               PreprocessorDefinitions="NDEBUG"\r
                                 Culture="1033"\r
                                 AdditionalIncludeDirectories="..\..\src\zlib;..\..\src\jpeg;..\..\src\tiff\libtiff"\r
                         />\r
@@ -358,8 +358,8 @@
                                 Name="VCWebServiceProxyGeneratorTool"\r
                         />\r
                         <Tool\r
-                               Name="VCIDLTool"\r
-                               PreprocessorDefinitions="WIN32;_LIB;_DEBUG;NDEBUG"
+                               Name="VCMIDLTool"\r
+                               PreprocessorDefinitions="WIN32;_LIB;_DEBUG;NDEBUG"\r
                                 AdditionalIncludeDirectories="..\..\src\zlib;..\..\src\jpeg;..\..\src\tiff\libtiff"\r
                         />\r
                         <Tool\r
@@ -367,7 +367,7 @@
                                 AdditionalOptions="/MP"\r
                                 Optimization="0"\r
                                 AdditionalIncludeDirectories="..\..\src\zlib;..\..\src\jpeg;..\..\src\tiff\libtiff"\r
-                               PreprocessorDefinitions="WIN32;_LIB;_DEBUG;NDEBUG"
+                               PreprocessorDefinitions="WIN32;_LIB;_DEBUG;NDEBUG"\r
                                 ExceptionHandling="1"\r
                                 BasicRuntimeChecks="3"\r
                                 RuntimeLibrary="3"\r
@@ -384,7 +384,7 @@
                         />\r
                         <Tool\r
                                 Name="VCResourceCompilerTool"\r
-                               PreprocessorDefinitions="_DEBUG;NDEBUG"
+                               PreprocessorDefinitions="_DEBUG;NDEBUG"\r
                                 Culture="1033"\r
                                 AdditionalIncludeDirectories="..\..\src\zlib;..\..\src\jpeg;..\..\src\tiff\libtiff"\r
                         />\r
@@ -438,8 +438,8 @@
                                 Name="VCWebServiceProxyGeneratorTool"\r
                         />\r
                         <Tool\r
-                               Name="VCIDLTool"\r
-                               PreprocessorDefinitions="WIN32;_LIB;NDEBUG"
+                               Name="VCMIDLTool"\r
+                               PreprocessorDefinitions="WIN32;_LIB;NDEBUG"\r
                                 AdditionalIncludeDirectories="..\..\src\zlib;..\..\src\jpeg;..\..\src\tiff\libtiff"\r
                         />\r
                         <Tool\r
@@ -447,7 +447,7 @@
                                 AdditionalOptions="/MP"\r
                                 Optimization="2"\r
                                 AdditionalIncludeDirectories="..\..\src\zlib;..\..\src\jpeg;..\..\src\tiff\libtiff"\r
-                               PreprocessorDefinitions="WIN32;_LIB;NDEBUG"
+                               PreprocessorDefinitions="WIN32;_LIB;NDEBUG"\r
                                 ExceptionHandling="1"\r
                                 RuntimeLibrary="2"\r
                                 RuntimeTypeInfo="true"\r
@@ -462,7 +462,7 @@
                         />\r
                         <Tool\r
                                 Name="VCResourceCompilerTool"\r
-                               PreprocessorDefinitions="NDEBUG"
+                               PreprocessorDefinitions="NDEBUG"\r
                                 Culture="1033"\r
                                 AdditionalIncludeDirectories="..\..\src\zlib;..\..\src\jpeg;..\..\src\tiff\libtiff"\r
                         />\r
@@ -516,8 +516,8 @@
                                 Name="VCWebServiceProxyGeneratorTool"\r
                         />\r
                         <Tool\r
-                               Name="VCIDLTool"\r
-                               PreprocessorDefinitions="WIN32;_LIB;_DEBUG;NDEBUG"
+                               Name="VCMIDLTool"\r
+                               PreprocessorDefinitions="WIN32;_LIB;_DEBUG;NDEBUG"\r
                                 AdditionalIncludeDirectories="..\..\src\zlib;..\..\src\jpeg;..\..\src\tiff\libtiff"\r
                         />\r
                         <Tool\r
@@ -525,7 +525,7 @@
                                 AdditionalOptions="/MP"\r
                                 Optimization="0"\r
                                 AdditionalIncludeDirectories="..\..\src\zlib;..\..\src\jpeg;..\..\src\tiff\libtiff"\r
-                               PreprocessorDefinitions="WIN32;_LIB;_DEBUG;NDEBUG"
+                               PreprocessorDefinitions="WIN32;_LIB;_DEBUG;NDEBUG"\r
                                 ExceptionHandling="1"\r
                                 BasicRuntimeChecks="3"\r
                                 RuntimeLibrary="3"\r
@@ -542,7 +542,7 @@
                         />\r
                         <Tool\r
                                 Name="VCResourceCompilerTool"\r
-                               PreprocessorDefinitions="_DEBUG;NDEBUG"
+                               PreprocessorDefinitions="_DEBUG;NDEBUG"\r
                                 Culture="1033"\r
                                 AdditionalIncludeDirectories="..\..\src\zlib;..\..\src\jpeg;..\..\src\tiff\libtiff"\r
                         />\r
@@ -596,8 +596,8 @@
                                 Name="VCWebServiceProxyGeneratorTool"\r
                         />\r
                         <Tool\r
-                               Name="VCIDLTool"\r
-                               PreprocessorDefinitions="WIN32;_LIB;NDEBUG"
+                               Name="VCMIDLTool"\r
+                               PreprocessorDefinitions="WIN32;_LIB;NDEBUG"\r
                                 AdditionalIncludeDirectories="..\..\src\zlib;..\..\src\jpeg;..\..\src\tiff\libtiff"\r
                         />\r
                         <Tool\r
@@ -605,7 +605,7 @@
                                 AdditionalOptions="/MP"\r
                                 Optimization="2"\r
                                 AdditionalIncludeDirectories="..\..\src\zlib;..\..\src\jpeg;..\..\src\tiff\libtiff"\r
-                               PreprocessorDefinitions="WIN32;_LIB;NDEBUG"
+                               PreprocessorDefinitions="WIN32;_LIB;NDEBUG"\r
                                 ExceptionHandling="1"\r
                                 RuntimeLibrary="2"\r
                                 RuntimeTypeInfo="true"\r
@@ -620,7 +620,7 @@
                         />\r
                         <Tool\r
                                 Name="VCResourceCompilerTool"\r
-                               PreprocessorDefinitions="NDEBUG"
+                               PreprocessorDefinitions="NDEBUG"\r
                                 Culture="1033"\r
                                 AdditionalIncludeDirectories="..\..\src\zlib;..\..\src\jpeg;..\..\src\tiff\libtiff"\r
                         />\r
diff --git a/build/msw/wx_vc9_wxzlib.vcproj b/build/msw/wx_vc9_wxzlib.vcproj

index 0f83e3252f28c7dea157318d53b9f4847dc1758b..7627d469274e3fd4a34b6c1b2a3b69be4ed5a89d 100644 (file)
--- a/build/msw/wx_vc9_wxzlib.vcproj
+++ b/build/msw/wx_vc9_wxzlib.vcproj
@@ -42,8 +42,8 @@
                                 Name="VCWebServiceProxyGeneratorTool"\r
                         />\r
                         <Tool\r
-                               Name="VCIDLTool"\r
-                               PreprocessorDefinitions="WIN32;_LIB;_DEBUG;NDEBUG"
+                               Name="VCMIDLTool"\r
+                               PreprocessorDefinitions="WIN32;_LIB;_DEBUG;NDEBUG"\r
                                 AdditionalIncludeDirectories=""\r
                         />\r
                         <Tool\r
@@ -51,7 +51,7 @@
                                 AdditionalOptions="/MP"\r
                                 Optimization="0"\r
                                 AdditionalIncludeDirectories=""\r
-                               PreprocessorDefinitions="WIN32;_LIB;_DEBUG;NDEBUG"
+                               PreprocessorDefinitions="WIN32;_LIB;_DEBUG;NDEBUG"\r
                                 ExceptionHandling="1"\r
                                 BasicRuntimeChecks="3"\r
                                 RuntimeLibrary="3"\r
@@ -68,7 +68,7 @@
                         />\r
                         <Tool\r
                                 Name="VCResourceCompilerTool"\r
-                               PreprocessorDefinitions="_DEBUG;NDEBUG"
+                               PreprocessorDefinitions="_DEBUG;NDEBUG"\r
                                 Culture="1033"\r
                                 AdditionalIncludeDirectories=""\r
                         />\r
@@ -122,8 +122,8 @@
                                 Name="VCWebServiceProxyGeneratorTool"\r
                         />\r
                         <Tool\r
-                               Name="VCIDLTool"\r
-                               PreprocessorDefinitions="WIN32;_LIB;NDEBUG"
+                               Name="VCMIDLTool"\r
+                               PreprocessorDefinitions="WIN32;_LIB;NDEBUG"\r
                                 AdditionalIncludeDirectories=""\r
                         />\r
                         <Tool\r
@@ -131,7 +131,7 @@
                                 AdditionalOptions="/MP"\r
                                 Optimization="2"\r
                                 AdditionalIncludeDirectories=""\r
-                               PreprocessorDefinitions="WIN32;_LIB;NDEBUG"
+                               PreprocessorDefinitions="WIN32;_LIB;NDEBUG"\r
                                 ExceptionHandling="1"\r
                                 RuntimeLibrary="2"\r
                                 RuntimeTypeInfo="true"\r
@@ -146,7 +146,7 @@
                         />\r
                         <Tool\r
                                 Name="VCResourceCompilerTool"\r
-                               PreprocessorDefinitions="NDEBUG"
+                               PreprocessorDefinitions="NDEBUG"\r
                                 Culture="1033"\r
                                 AdditionalIncludeDirectories=""\r
                         />\r
@@ -200,8 +200,8 @@
                                 Name="VCWebServiceProxyGeneratorTool"\r
                         />\r
                         <Tool\r
-                               Name="VCIDLTool"\r
-                               PreprocessorDefinitions="WIN32;_LIB;_DEBUG;NDEBUG"
+                               Name="VCMIDLTool"\r
+                               PreprocessorDefinitions="WIN32;_LIB;_DEBUG;NDEBUG"\r
                                 AdditionalIncludeDirectories=""\r
                         />\r
                         <Tool\r
@@ -209,7 +209,7 @@
                                 AdditionalOptions="/MP"\r
                                 Optimization="0"\r
                                 AdditionalIncludeDirectories=""\r
-                               PreprocessorDefinitions="WIN32;_LIB;_DEBUG;NDEBUG"
+                               PreprocessorDefinitions="WIN32;_LIB;_DEBUG;NDEBUG"\r
                                 ExceptionHandling="1"\r
                                 BasicRuntimeChecks="3"\r
                                 RuntimeLibrary="3"\r
@@ -226,7 +226,7 @@
                         />\r
                         <Tool\r
                                 Name="VCResourceCompilerTool"\r
-                               PreprocessorDefinitions="_DEBUG;NDEBUG"
+                               PreprocessorDefinitions="_DEBUG;NDEBUG"\r
                                 Culture="1033"\r
                                 AdditionalIncludeDirectories=""\r
                         />\r
@@ -280,8 +280,8 @@
                                 Name="VCWebServiceProxyGeneratorTool"\r
                         />\r
                         <Tool\r
-                               Name="VCIDLTool"\r
-                               PreprocessorDefinitions="WIN32;_LIB;NDEBUG"
+                               Name="VCMIDLTool"\r
+                               PreprocessorDefinitions="WIN32;_LIB;NDEBUG"\r
                                 AdditionalIncludeDirectories=""\r
                         />\r
                         <Tool\r
@@ -289,7 +289,7 @@
                                 AdditionalOptions="/MP"\r
                                 Optimization="2"\r
                                 AdditionalIncludeDirectories=""\r
-                               PreprocessorDefinitions="WIN32;_LIB;NDEBUG"
+                               PreprocessorDefinitions="WIN32;_LIB;NDEBUG"\r
                                 ExceptionHandling="1"\r
                                 RuntimeLibrary="2"\r
                                 RuntimeTypeInfo="true"\r
@@ -304,7 +304,7 @@
                         />\r
                         <Tool\r
                                 Name="VCResourceCompilerTool"\r
-                               PreprocessorDefinitions="NDEBUG"
+                               PreprocessorDefinitions="NDEBUG"\r
                                 Culture="1033"\r
                                 AdditionalIncludeDirectories=""\r
                         />\r
@@ -358,8 +358,8 @@
                                 Name="VCWebServiceProxyGeneratorTool"\r
                         />\r
                         <Tool\r
-                               Name="VCIDLTool"\r
-                               PreprocessorDefinitions="WIN32;_LIB;_DEBUG;NDEBUG"
+                               Name="VCMIDLTool"\r
+                               PreprocessorDefinitions="WIN32;_LIB;_DEBUG;NDEBUG"\r
                                 AdditionalIncludeDirectories=""\r
                         />\r
                         <Tool\r
@@ -367,7 +367,7 @@
                                 AdditionalOptions="/MP"\r
                                 Optimization="0"\r
                                 AdditionalIncludeDirectories=""\r
-                               PreprocessorDefinitions="WIN32;_LIB;_DEBUG;NDEBUG"
+                               PreprocessorDefinitions="WIN32;_LIB;_DEBUG;NDEBUG"\r
                                 ExceptionHandling="1"\r
                                 BasicRuntimeChecks="3"\r
                                 RuntimeLibrary="3"\r
@@ -384,7 +384,7 @@
                         />\r
                         <Tool\r
                                 Name="VCResourceCompilerTool"\r
-                               PreprocessorDefinitions="_DEBUG;NDEBUG"
+                               PreprocessorDefinitions="_DEBUG;NDEBUG"\r
                                 Culture="1033"\r
                                 AdditionalIncludeDirectories=""\r
                         />\r
@@ -438,8 +438,8 @@
                                 Name="VCWebServiceProxyGeneratorTool"\r
                         />\r
                         <Tool\r
-                               Name="VCIDLTool"\r
-                               PreprocessorDefinitions="WIN32;_LIB;NDEBUG"
+                               Name="VCMIDLTool"\r
+                               PreprocessorDefinitions="WIN32;_LIB;NDEBUG"\r
                                 AdditionalIncludeDirectories=""\r
                         />\r
                         <Tool\r
@@ -447,7 +447,7 @@
                                 AdditionalOptions="/MP"\r
                                 Optimization="2"\r
                                 AdditionalIncludeDirectories=""\r
-                               PreprocessorDefinitions="WIN32;_LIB;NDEBUG"
+                               PreprocessorDefinitions="WIN32;_LIB;NDEBUG"\r
                                 ExceptionHandling="1"\r
                                 RuntimeLibrary="2"\r
                                 RuntimeTypeInfo="true"\r
@@ -462,7 +462,7 @@
                         />\r
                         <Tool\r
                                 Name="VCResourceCompilerTool"\r
-                               PreprocessorDefinitions="NDEBUG"
+                               PreprocessorDefinitions="NDEBUG"\r
                                 Culture="1033"\r
                                 AdditionalIncludeDirectories=""\r
                         />\r
@@ -516,8 +516,8 @@
                                 Name="VCWebServiceProxyGeneratorTool"\r
                         />\r
                         <Tool\r
-                               Name="VCIDLTool"\r
-                               PreprocessorDefinitions="WIN32;_LIB;_DEBUG;NDEBUG"
+                               Name="VCMIDLTool"\r
+                               PreprocessorDefinitions="WIN32;_LIB;_DEBUG;NDEBUG"\r
                                 AdditionalIncludeDirectories=""\r
                         />\r
                         <Tool\r
@@ -525,7 +525,7 @@
                                 AdditionalOptions="/MP"\r
                                 Optimization="0"\r
                                 AdditionalIncludeDirectories=""\r
-                               PreprocessorDefinitions="WIN32;_LIB;_DEBUG;NDEBUG"
+                               PreprocessorDefinitions="WIN32;_LIB;_DEBUG;NDEBUG"\r
                                 ExceptionHandling="1"\r
                                 BasicRuntimeChecks="3"\r
                                 RuntimeLibrary="3"\r
@@ -542,7 +542,7 @@
                         />\r
                         <Tool\r
                                 Name="VCResourceCompilerTool"\r
-                               PreprocessorDefinitions="_DEBUG;NDEBUG"
+                               PreprocessorDefinitions="_DEBUG;NDEBUG"\r
                                 Culture="1033"\r
                                 AdditionalIncludeDirectories=""\r
                         />\r
@@ -596,8 +596,8 @@
                                 Name="VCWebServiceProxyGeneratorTool"\r
                         />\r
                         <Tool\r
-                               Name="VCIDLTool"\r
-                               PreprocessorDefinitions="WIN32;_LIB;NDEBUG"
+                               Name="VCMIDLTool"\r
+                               PreprocessorDefinitions="WIN32;_LIB;NDEBUG"\r
                                 AdditionalIncludeDirectories=""\r
                         />\r
                         <Tool\r
@@ -605,7 +605,7 @@
                                 AdditionalOptions="/MP"\r
                                 Optimization="2"\r
                                 AdditionalIncludeDirectories=""\r
-                               PreprocessorDefinitions="WIN32;_LIB;NDEBUG"
+                               PreprocessorDefinitions="WIN32;_LIB;NDEBUG"\r
                                 ExceptionHandling="1"\r
                                 RuntimeLibrary="2"\r
                                 RuntimeTypeInfo="true"\r
@@ -620,7 +620,7 @@
                         />\r
                         <Tool\r
                                 Name="VCResourceCompilerTool"\r
-                               PreprocessorDefinitions="NDEBUG"
+                               PreprocessorDefinitions="NDEBUG"\r
                                 Culture="1033"\r
                                 AdditionalIncludeDirectories=""\r
                         />\r
diff --git a/build/msw/wx_vc9_xml.vcproj b/build/msw/wx_vc9_xml.vcproj

index 6feda75c3e5fca4fefd2e9731d79bf2e71ab19d9..33836035bde044dead1eb2cc1ba51e1be9e5ca4a 100644 (file)
--- a/build/msw/wx_vc9_xml.vcproj
+++ b/build/msw/wx_vc9_xml.vcproj
@@ -43,7 +43,7 @@
                                 Name="VCWebServiceProxyGeneratorTool"\r
                         />\r
                         <Tool\r
-                               Name="VCIDLTool"\r
+                               Name="VCMIDLTool"\r
                                 PreprocessorDefinitions="WIN32;_LIB;_DEBUG;__WXMSW__;_UNICODE;WXBUILDING;wxUSE_GUI=0"\r
                                 AdditionalIncludeDirectories="..\..\lib\vc_lib\mswud;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib"\r
                         />\r
@@ -127,7 +127,7 @@
                                 Name="VCWebServiceProxyGeneratorTool"\r
                         />\r
                         <Tool\r
-                               Name="VCIDLTool"\r
+                               Name="VCMIDLTool"\r
                                 PreprocessorDefinitions="WIN32;_LIB;__WXMSW__;_UNICODE;WXBUILDING;wxUSE_GUI=0"\r
                                 AdditionalIncludeDirectories="..\..\lib\vc_lib\mswu;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib"\r
                         />\r
@@ -209,7 +209,7 @@
                                 Name="VCWebServiceProxyGeneratorTool"\r
                         />\r
                         <Tool\r
-                               Name="VCIDLTool"\r
+                               Name="VCMIDLTool"\r
                                 PreprocessorDefinitions="WIN32;_LIB;_DEBUG;__WXMSW__;__WXUNIVERSAL__;_UNICODE;WXBUILDING;wxUSE_GUI=0"\r
                                 AdditionalIncludeDirectories="..\..\lib\vc_lib\mswunivud;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib"\r
                         />\r
@@ -293,7 +293,7 @@
                                 Name="VCWebServiceProxyGeneratorTool"\r
                         />\r
                         <Tool\r
-                               Name="VCIDLTool"\r
+                               Name="VCMIDLTool"\r
                                 PreprocessorDefinitions="WIN32;_LIB;__WXMSW__;__WXUNIVERSAL__;_UNICODE;WXBUILDING;wxUSE_GUI=0"\r
                                 AdditionalIncludeDirectories="..\..\lib\vc_lib\mswunivu;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib"\r
                         />\r
@@ -375,7 +375,7 @@
                                 Name="VCWebServiceProxyGeneratorTool"\r
                         />\r
                         <Tool\r
-                               Name="VCIDLTool"\r
+                               Name="VCMIDLTool"\r
                                 PreprocessorDefinitions="WIN32;_USRDLL;DLL_EXPORTS;_DEBUG;__WXMSW__;_UNICODE;WXBUILDING;wxUSE_GUI=0;WXUSINGDLL;WXMAKINGDLL_XML"\r
                                 AdditionalIncludeDirectories="..\..\lib\vc_dll\mswud;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib"\r
                         />\r
@@ -468,7 +468,7 @@
                                 Name="VCWebServiceProxyGeneratorTool"\r
                         />\r
                         <Tool\r
-                               Name="VCIDLTool"\r
+                               Name="VCMIDLTool"\r
                                 PreprocessorDefinitions="WIN32;_USRDLL;DLL_EXPORTS;__WXMSW__;_UNICODE;WXBUILDING;wxUSE_GUI=0;WXUSINGDLL;WXMAKINGDLL_XML"\r
                                 AdditionalIncludeDirectories="..\..\lib\vc_dll\mswu;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib"\r
                         />\r
@@ -507,7 +507,7 @@
                                 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 ..\..\lib\vc_dll\wxbase29u.lib"\r
                                 OutputFile="..\..\lib\vc_dll\wxbase291u_xml_vc_custom.dll"\r
-                               LinkIncremental="2"\r
+                               LinkIncremental="1"\r
                                 ImportLibrary="..\..\lib\vc_dll\wxbase29u_xml.lib"\r
                                 SuppressStartupBanner="true"\r
                                 AdditionalLibraryDirectories="..\..\lib\vc_dll"\r
@@ -515,6 +515,8 @@
                                 GenerateDebugInformation="true"\r
                                 ProgramDatabaseFile="..\..\lib\vc_dll\wxbase291u_xml_vc_custom.pdb"\r
                                 TargetMachine="1"\r
+                               OptimizeReferences="2"\r
+                               EnableCOMDATFolding="2"\r
                         />\r
                         <Tool\r
                                 Name="VCALinkTool"\r
@@ -559,7 +561,7 @@
                                 Name="VCWebServiceProxyGeneratorTool"\r
                         />\r
                         <Tool\r
-                               Name="VCIDLTool"\r
+                               Name="VCMIDLTool"\r
                                 PreprocessorDefinitions="WIN32;_USRDLL;DLL_EXPORTS;_DEBUG;__WXMSW__;__WXUNIVERSAL__;_UNICODE;WXBUILDING;wxUSE_GUI=0;WXUSINGDLL;WXMAKINGDLL_XML"\r
                                 AdditionalIncludeDirectories="..\..\lib\vc_dll\mswunivud;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib"\r
                         />\r
@@ -652,7 +654,7 @@
                                 Name="VCWebServiceProxyGeneratorTool"\r
                         />\r
                         <Tool\r
-                               Name="VCIDLTool"\r
+                               Name="VCMIDLTool"\r
                                 PreprocessorDefinitions="WIN32;_USRDLL;DLL_EXPORTS;__WXMSW__;__WXUNIVERSAL__;_UNICODE;WXBUILDING;wxUSE_GUI=0;WXUSINGDLL;WXMAKINGDLL_XML"\r
                                 AdditionalIncludeDirectories="..\..\lib\vc_dll\mswunivu;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib"\r
                         />\r
@@ -691,7 +693,7 @@
                                 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 ..\..\lib\vc_dll\wxbase29u.lib"\r
                                 OutputFile="..\..\lib\vc_dll\wxbase291u_xml_vc_custom.dll"\r
-                               LinkIncremental="2"\r
+                               LinkIncremental="1"\r
                                 ImportLibrary="..\..\lib\vc_dll\wxbase29u_xml.lib"\r
                                 SuppressStartupBanner="true"\r
                                 AdditionalLibraryDirectories="..\..\lib\vc_dll"\r
@@ -699,6 +701,8 @@
                                 GenerateDebugInformation="true"\r
                                 ProgramDatabaseFile="..\..\lib\vc_dll\wxbase291u_xml_vc_custom.pdb"\r
                                 TargetMachine="1"\r
+                               OptimizeReferences="2"\r
+                               EnableCOMDATFolding="2"\r
                         />\r
                         <Tool\r
                                 Name="VCALinkTool"\r
diff --git a/build/msw/wx_vc9_xrc.vcproj b/build/msw/wx_vc9_xrc.vcproj

index 40c6ce5457e4ad03725bf639ff63af023bb9ac9b..ffb1243fe0d3d62cb814747dfbcff4ce191cdaab 100644 (file)
--- a/build/msw/wx_vc9_xrc.vcproj
+++ b/build/msw/wx_vc9_xrc.vcproj
@@ -43,7 +43,7 @@
                                 Name="VCWebServiceProxyGeneratorTool"\r
                         />\r
                         <Tool\r
-                               Name="VCIDLTool"\r
+                               Name="VCMIDLTool"\r
                                 PreprocessorDefinitions="WIN32;_LIB;_DEBUG;__WXMSW__;_UNICODE;WXBUILDING"\r
                                 AdditionalIncludeDirectories="..\..\lib\vc_lib\mswud;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib"\r
                         />\r
@@ -127,7 +127,7 @@
                                 Name="VCWebServiceProxyGeneratorTool"\r
                         />\r
                         <Tool\r
-                               Name="VCIDLTool"\r
+                               Name="VCMIDLTool"\r
                                 PreprocessorDefinitions="WIN32;_LIB;__WXMSW__;_UNICODE;WXBUILDING"\r
                                 AdditionalIncludeDirectories="..\..\lib\vc_lib\mswu;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib"\r
                         />\r
@@ -209,7 +209,7 @@
                                 Name="VCWebServiceProxyGeneratorTool"\r
                         />\r
                         <Tool\r
-                               Name="VCIDLTool"\r
+                               Name="VCMIDLTool"\r
                                 PreprocessorDefinitions="WIN32;_LIB;_DEBUG;__WXMSW__;__WXUNIVERSAL__;_UNICODE;WXBUILDING"\r
                                 AdditionalIncludeDirectories="..\..\lib\vc_lib\mswunivud;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib"\r
                         />\r
@@ -293,7 +293,7 @@
                                 Name="VCWebServiceProxyGeneratorTool"\r
                         />\r
                         <Tool\r
-                               Name="VCIDLTool"\r
+                               Name="VCMIDLTool"\r
                                 PreprocessorDefinitions="WIN32;_LIB;__WXMSW__;__WXUNIVERSAL__;_UNICODE;WXBUILDING"\r
                                 AdditionalIncludeDirectories="..\..\lib\vc_lib\mswunivu;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib"\r
                         />\r
@@ -375,7 +375,7 @@
                                 Name="VCWebServiceProxyGeneratorTool"\r
                         />\r
                         <Tool\r
-                               Name="VCIDLTool"\r
+                               Name="VCMIDLTool"\r
                                 PreprocessorDefinitions="WIN32;_USRDLL;DLL_EXPORTS;_DEBUG;__WXMSW__;_UNICODE;WXBUILDING;WXUSINGDLL;WXMAKINGDLL_XRC"\r
                                 AdditionalIncludeDirectories="..\..\lib\vc_dll\mswud;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib"\r
                         />\r
@@ -468,7 +468,7 @@
                                 Name="VCWebServiceProxyGeneratorTool"\r
                         />\r
                         <Tool\r
-                               Name="VCIDLTool"\r
+                               Name="VCMIDLTool"\r
                                 PreprocessorDefinitions="WIN32;_USRDLL;DLL_EXPORTS;__WXMSW__;_UNICODE;WXBUILDING;WXUSINGDLL;WXMAKINGDLL_XRC"\r
                                 AdditionalIncludeDirectories="..\..\lib\vc_dll\mswu;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib"\r
                         />\r
@@ -507,7 +507,7 @@
                                 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_html.lib ..\..\lib\vc_dll\wxmsw29u_adv.lib ..\..\lib\vc_dll\wxmsw29u_core.lib ..\..\lib\vc_dll\wxbase29u_xml.lib ..\..\lib\vc_dll\wxbase29u.lib"\r
                                 OutputFile="..\..\lib\vc_dll\wxmsw291u_xrc_vc_custom.dll"\r
-                               LinkIncremental="2"\r
+                               LinkIncremental="1"\r
                                 ImportLibrary="..\..\lib\vc_dll\wxmsw29u_xrc.lib"\r
                                 SuppressStartupBanner="true"\r
                                 AdditionalLibraryDirectories="..\..\lib\vc_dll"\r
@@ -515,6 +515,8 @@
                                 GenerateDebugInformation="true"\r
                                 ProgramDatabaseFile="..\..\lib\vc_dll\wxmsw291u_xrc_vc_custom.pdb"\r
                                 TargetMachine="1"\r
+                               OptimizeReferences="2"\r
+                               EnableCOMDATFolding="2"\r
                         />\r
                         <Tool\r
                                 Name="VCALinkTool"\r
@@ -559,7 +561,7 @@
                                 Name="VCWebServiceProxyGeneratorTool"\r
                         />\r
                         <Tool\r
-                               Name="VCIDLTool"\r
+                               Name="VCMIDLTool"\r
                                 PreprocessorDefinitions="WIN32;_USRDLL;DLL_EXPORTS;_DEBUG;__WXMSW__;__WXUNIVERSAL__;_UNICODE;WXBUILDING;WXUSINGDLL;WXMAKINGDLL_XRC"\r
                                 AdditionalIncludeDirectories="..\..\lib\vc_dll\mswunivud;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib"\r
                         />\r
@@ -652,7 +654,7 @@
                                 Name="VCWebServiceProxyGeneratorTool"\r
                         />\r
                         <Tool\r
-                               Name="VCIDLTool"\r
+                               Name="VCMIDLTool"\r
                                 PreprocessorDefinitions="WIN32;_USRDLL;DLL_EXPORTS;__WXMSW__;__WXUNIVERSAL__;_UNICODE;WXBUILDING;WXUSINGDLL;WXMAKINGDLL_XRC"\r
                                 AdditionalIncludeDirectories="..\..\lib\vc_dll\mswunivu;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib"\r
                         />\r
@@ -691,7 +693,7 @@
                                 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_html.lib ..\..\lib\vc_dll\wxmswuniv29u_adv.lib ..\..\lib\vc_dll\wxmswuniv29u_core.lib ..\..\lib\vc_dll\wxbase29u_xml.lib ..\..\lib\vc_dll\wxbase29u.lib"\r
                                 OutputFile="..\..\lib\vc_dll\wxmswuniv291u_xrc_vc_custom.dll"\r
-                               LinkIncremental="2"\r
+                               LinkIncremental="1"\r
                                 ImportLibrary="..\..\lib\vc_dll\wxmswuniv29u_xrc.lib"\r
                                 SuppressStartupBanner="true"\r
                                 AdditionalLibraryDirectories="..\..\lib\vc_dll"\r
@@ -699,6 +701,8 @@
                                 GenerateDebugInformation="true"\r
                                 ProgramDatabaseFile="..\..\lib\vc_dll\wxmswuniv291u_xrc_vc_custom.pdb"\r
                                 TargetMachine="1"\r
+                               OptimizeReferences="2"\r
+                               EnableCOMDATFolding="2"\r
                         />\r
                         <Tool\r
                                 Name="VCALinkTool"\r
diff --git a/build/msw/wx_wxexpat.dsp b/build/msw/wx_wxexpat.dsp

index 26ffef999a5877687f41746a95e472239d71305d..efaacf773ffa1df420b1d47e2de5d67448314c3a 100644 (file)
--- a/build/msw/wx_wxexpat.dsp
+++ b/build/msw/wx_wxexpat.dsp
@@ -46,8 +46,8 @@ RSC=rc.exe
  # PROP Output_Dir "..\..\lib\vc_dll"\r
  # PROP Intermediate_Dir "vc_mswunivudll\wxexpat"\r
  # PROP Target_Dir ""\r
-# ADD BASE CPP /nologo /FD /MD /W1 /O2 /GR /EHsc /Zi /Fd..\..\lib\vc_dll\wxexpat.pdb /I "..\..\lib\vc_dll" /D "WIN32" /D "_LIB" /D "NDEBUG" /D "COMPILED_FROM_DSP" /c
-# ADD CPP /nologo /FD /MD /W1 /O2 /GR /EHsc /Zi /Fd..\..\lib\vc_dll\wxexpat.pdb /I "..\..\lib\vc_dll" /D "WIN32" /D "_LIB" /D "NDEBUG" /D "COMPILED_FROM_DSP" /c
+# ADD BASE CPP /nologo /FD /MD /W1 /O2 /GR /EHsc /Zi /Fd..\..\lib\vc_dll\wxexpat.pdb /opt:ref /opt:icf /I "..\..\lib\vc_dll" /D "WIN32" /D "_LIB" /D "NDEBUG" /D "COMPILED_FROM_DSP" /c\r
+# ADD CPP /nologo /FD /MD /W1 /O2 /GR /EHsc /Zi /Fd..\..\lib\vc_dll\wxexpat.pdb /opt:ref /opt:icf /I "..\..\lib\vc_dll" /D "WIN32" /D "_LIB" /D "NDEBUG" /D "COMPILED_FROM_DSP" /c\r
  # ADD BASE RSC /l 0x409\r
  # ADD RSC /l 0x409\r
  BSC32=bscmake.exe\r
@@ -69,8 +69,8 @@ LIB32=link.exe -lib
  # PROP Output_Dir "..\..\lib\vc_dll"\r
  # PROP Intermediate_Dir "vc_mswunivuddll\wxexpat"\r
  # PROP Target_Dir ""\r
-# ADD BASE CPP /nologo /FD /MDd /W1 /Od /Gm /GR /EHsc /Zi /Fd..\..\lib\vc_dll\wxexpatd.pdb /I "..\..\lib\vc_dll" /D "WIN32" /D "_LIB" /D "_DEBUG" /D "NDEBUG" /D "COMPILED_FROM_DSP" /c
-# ADD CPP /nologo /FD /MDd /W1 /Od /Gm /GR /EHsc /Zi /Fd..\..\lib\vc_dll\wxexpatd.pdb /I "..\..\lib\vc_dll" /D "WIN32" /D "_LIB" /D "_DEBUG" /D "NDEBUG" /D "COMPILED_FROM_DSP" /c
+# ADD BASE CPP /nologo /FD /MDd /W1 /Od /Gm /GR /EHsc /Zi /Fd..\..\lib\vc_dll\wxexpatd.pdb /I "..\..\lib\vc_dll" /D "WIN32" /D "_LIB" /D "_DEBUG" /D "NDEBUG" /D "COMPILED_FROM_DSP" /c\r
+# ADD CPP /nologo /FD /MDd /W1 /Od /Gm /GR /EHsc /Zi /Fd..\..\lib\vc_dll\wxexpatd.pdb /I "..\..\lib\vc_dll" /D "WIN32" /D "_LIB" /D "_DEBUG" /D "NDEBUG" /D "COMPILED_FROM_DSP" /c\r
  # ADD BASE RSC /l 0x409\r
  # ADD RSC /l 0x409\r
  BSC32=bscmake.exe\r
@@ -92,8 +92,8 @@ LIB32=link.exe -lib
  # PROP Output_Dir "..\..\lib\vc_dll"\r
  # PROP Intermediate_Dir "vc_mswudll\wxexpat"\r
  # PROP Target_Dir ""\r
-# ADD BASE CPP /nologo /FD /MD /W1 /O2 /GR /EHsc /Zi /Fd..\..\lib\vc_dll\wxexpat.pdb /I "..\..\lib\vc_dll" /D "WIN32" /D "_LIB" /D "NDEBUG" /D "COMPILED_FROM_DSP" /c
-# ADD CPP /nologo /FD /MD /W1 /O2 /GR /EHsc /Zi /Fd..\..\lib\vc_dll\wxexpat.pdb /I "..\..\lib\vc_dll" /D "WIN32" /D "_LIB" /D "NDEBUG" /D "COMPILED_FROM_DSP" /c
+# ADD BASE CPP /nologo /FD /MD /W1 /O2 /GR /EHsc /Zi /Fd..\..\lib\vc_dll\wxexpat.pdb /opt:ref /opt:icf /I "..\..\lib\vc_dll" /D "WIN32" /D "_LIB" /D "NDEBUG" /D "COMPILED_FROM_DSP" /c\r
+# ADD CPP /nologo /FD /MD /W1 /O2 /GR /EHsc /Zi /Fd..\..\lib\vc_dll\wxexpat.pdb /opt:ref /opt:icf /I "..\..\lib\vc_dll" /D "WIN32" /D "_LIB" /D "NDEBUG" /D "COMPILED_FROM_DSP" /c\r
  # ADD BASE RSC /l 0x409\r
  # ADD RSC /l 0x409\r
  BSC32=bscmake.exe\r
@@ -115,8 +115,8 @@ LIB32=link.exe -lib
  # PROP Output_Dir "..\..\lib\vc_dll"\r
  # PROP Intermediate_Dir "vc_mswuddll\wxexpat"\r
  # PROP Target_Dir ""\r
-# ADD BASE CPP /nologo /FD /MDd /W1 /Od /Gm /GR /EHsc /Zi /Fd..\..\lib\vc_dll\wxexpatd.pdb /I "..\..\lib\vc_dll" /D "WIN32" /D "_LIB" /D "_DEBUG" /D "NDEBUG" /D "COMPILED_FROM_DSP" /c
-# ADD CPP /nologo /FD /MDd /W1 /Od /Gm /GR /EHsc /Zi /Fd..\..\lib\vc_dll\wxexpatd.pdb /I "..\..\lib\vc_dll" /D "WIN32" /D "_LIB" /D "_DEBUG" /D "NDEBUG" /D "COMPILED_FROM_DSP" /c
+# ADD BASE CPP /nologo /FD /MDd /W1 /Od /Gm /GR /EHsc /Zi /Fd..\..\lib\vc_dll\wxexpatd.pdb /I "..\..\lib\vc_dll" /D "WIN32" /D "_LIB" /D "_DEBUG" /D "NDEBUG" /D "COMPILED_FROM_DSP" /c\r
+# ADD CPP /nologo /FD /MDd /W1 /Od /Gm /GR /EHsc /Zi /Fd..\..\lib\vc_dll\wxexpatd.pdb /I "..\..\lib\vc_dll" /D "WIN32" /D "_LIB" /D "_DEBUG" /D "NDEBUG" /D "COMPILED_FROM_DSP" /c\r
  # ADD BASE RSC /l 0x409\r
  # ADD RSC /l 0x409\r
  BSC32=bscmake.exe\r
@@ -138,8 +138,8 @@ LIB32=link.exe -lib
  # PROP Output_Dir "..\..\lib\vc_lib"\r
  # PROP Intermediate_Dir "vc_mswunivu\wxexpat"\r
  # PROP Target_Dir ""\r
-# ADD BASE CPP /nologo /FD /MD /W1 /O2 /GR /EHsc /Zi /Fd..\..\lib\vc_lib\wxexpat.pdb /I "..\..\lib\vc_lib" /D "WIN32" /D "_LIB" /D "NDEBUG" /D "COMPILED_FROM_DSP" /c
-# ADD CPP /nologo /FD /MD /W1 /O2 /GR /EHsc /Zi /Fd..\..\lib\vc_lib\wxexpat.pdb /I "..\..\lib\vc_lib" /D "WIN32" /D "_LIB" /D "NDEBUG" /D "COMPILED_FROM_DSP" /c
+# ADD BASE CPP /nologo /FD /MD /W1 /O2 /GR /EHsc /Zi /Fd..\..\lib\vc_lib\wxexpat.pdb /opt:ref /opt:icf /I "..\..\lib\vc_lib" /D "WIN32" /D "_LIB" /D "NDEBUG" /D "COMPILED_FROM_DSP" /c\r
+# ADD CPP /nologo /FD /MD /W1 /O2 /GR /EHsc /Zi /Fd..\..\lib\vc_lib\wxexpat.pdb /opt:ref /opt:icf /I "..\..\lib\vc_lib" /D "WIN32" /D "_LIB" /D "NDEBUG" /D "COMPILED_FROM_DSP" /c\r
  # ADD BASE RSC /l 0x409\r
  # ADD RSC /l 0x409\r
  BSC32=bscmake.exe\r
@@ -161,8 +161,8 @@ LIB32=link.exe -lib
  # PROP Output_Dir "..\..\lib\vc_lib"\r
  # PROP Intermediate_Dir "vc_mswunivud\wxexpat"\r
  # PROP Target_Dir ""\r
-# ADD BASE CPP /nologo /FD /MDd /W1 /Od /Gm /GR /EHsc /Zi /Fd..\..\lib\vc_lib\wxexpatd.pdb /I "..\..\lib\vc_lib" /D "WIN32" /D "_LIB" /D "_DEBUG" /D "NDEBUG" /D "COMPILED_FROM_DSP" /c
-# ADD CPP /nologo /FD /MDd /W1 /Od /Gm /GR /EHsc /Zi /Fd..\..\lib\vc_lib\wxexpatd.pdb /I "..\..\lib\vc_lib" /D "WIN32" /D "_LIB" /D "_DEBUG" /D "NDEBUG" /D "COMPILED_FROM_DSP" /c
+# ADD BASE CPP /nologo /FD /MDd /W1 /Od /Gm /GR /EHsc /Zi /Fd..\..\lib\vc_lib\wxexpatd.pdb /I "..\..\lib\vc_lib" /D "WIN32" /D "_LIB" /D "_DEBUG" /D "NDEBUG" /D "COMPILED_FROM_DSP" /c\r
+# ADD CPP /nologo /FD /MDd /W1 /Od /Gm /GR /EHsc /Zi /Fd..\..\lib\vc_lib\wxexpatd.pdb /I "..\..\lib\vc_lib" /D "WIN32" /D "_LIB" /D "_DEBUG" /D "NDEBUG" /D "COMPILED_FROM_DSP" /c\r
  # ADD BASE RSC /l 0x409\r
  # ADD RSC /l 0x409\r
  BSC32=bscmake.exe\r
@@ -184,8 +184,8 @@ LIB32=link.exe -lib
  # PROP Output_Dir "..\..\lib\vc_lib"\r
  # PROP Intermediate_Dir "vc_mswu\wxexpat"\r
  # PROP Target_Dir ""\r
-# ADD BASE CPP /nologo /FD /MD /W1 /O2 /GR /EHsc /Zi /Fd..\..\lib\vc_lib\wxexpat.pdb /I "..\..\lib\vc_lib" /D "WIN32" /D "_LIB" /D "NDEBUG" /D "COMPILED_FROM_DSP" /c
-# ADD CPP /nologo /FD /MD /W1 /O2 /GR /EHsc /Zi /Fd..\..\lib\vc_lib\wxexpat.pdb /I "..\..\lib\vc_lib" /D "WIN32" /D "_LIB" /D "NDEBUG" /D "COMPILED_FROM_DSP" /c
+# ADD BASE CPP /nologo /FD /MD /W1 /O2 /GR /EHsc /Zi /Fd..\..\lib\vc_lib\wxexpat.pdb /opt:ref /opt:icf /I "..\..\lib\vc_lib" /D "WIN32" /D "_LIB" /D "NDEBUG" /D "COMPILED_FROM_DSP" /c\r
+# ADD CPP /nologo /FD /MD /W1 /O2 /GR /EHsc /Zi /Fd..\..\lib\vc_lib\wxexpat.pdb /opt:ref /opt:icf /I "..\..\lib\vc_lib" /D "WIN32" /D "_LIB" /D "NDEBUG" /D "COMPILED_FROM_DSP" /c\r
  # ADD BASE RSC /l 0x409\r
  # ADD RSC /l 0x409\r
  BSC32=bscmake.exe\r
@@ -207,8 +207,8 @@ LIB32=link.exe -lib
  # PROP Output_Dir "..\..\lib\vc_lib"\r
  # PROP Intermediate_Dir "vc_mswud\wxexpat"\r
  # PROP Target_Dir ""\r
-# ADD BASE CPP /nologo /FD /MDd /W1 /Od /Gm /GR /EHsc /Zi /Fd..\..\lib\vc_lib\wxexpatd.pdb /I "..\..\lib\vc_lib" /D "WIN32" /D "_LIB" /D "_DEBUG" /D "NDEBUG" /D "COMPILED_FROM_DSP" /c
-# ADD CPP /nologo /FD /MDd /W1 /Od /Gm /GR /EHsc /Zi /Fd..\..\lib\vc_lib\wxexpatd.pdb /I "..\..\lib\vc_lib" /D "WIN32" /D "_LIB" /D "_DEBUG" /D "NDEBUG" /D "COMPILED_FROM_DSP" /c
+# ADD BASE CPP /nologo /FD /MDd /W1 /Od /Gm /GR /EHsc /Zi /Fd..\..\lib\vc_lib\wxexpatd.pdb /I "..\..\lib\vc_lib" /D "WIN32" /D "_LIB" /D "_DEBUG" /D "NDEBUG" /D "COMPILED_FROM_DSP" /c\r
+# ADD CPP /nologo /FD /MDd /W1 /Od /Gm /GR /EHsc /Zi /Fd..\..\lib\vc_lib\wxexpatd.pdb /I "..\..\lib\vc_lib" /D "WIN32" /D "_LIB" /D "_DEBUG" /D "NDEBUG" /D "COMPILED_FROM_DSP" /c\r
  # ADD BASE RSC /l 0x409\r
  # ADD RSC /l 0x409\r
  BSC32=bscmake.exe\r
diff --git a/build/msw/wx_wxjpeg.dsp b/build/msw/wx_wxjpeg.dsp

index fe3492979c2769be00bfd3ef1ce12b22123dd099..a029c3c47d4b30d2b0650537f5009ef42379d402 100644 (file)
--- a/build/msw/wx_wxjpeg.dsp
+++ b/build/msw/wx_wxjpeg.dsp
@@ -46,8 +46,8 @@ RSC=rc.exe
  # PROP Output_Dir "..\..\lib\vc_dll"\r
  # PROP Intermediate_Dir "vc_mswunivudll\wxjpeg"\r
  # PROP Target_Dir ""\r
-# ADD BASE CPP /nologo /FD /MD /W1 /O2 /GR /EHsc /Zi /Fd..\..\lib\vc_dll\wxjpeg.pdb /I "..\..\lib\vc_dll\mswunivu" /D "WIN32" /D "_LIB" /D "NDEBUG" /c
-# ADD CPP /nologo /FD /MD /W1 /O2 /GR /EHsc /Zi /Fd..\..\lib\vc_dll\wxjpeg.pdb /I "..\..\lib\vc_dll\mswunivu" /D "WIN32" /D "_LIB" /D "NDEBUG" /c
+# ADD BASE CPP /nologo /FD /MD /W1 /O2 /GR /EHsc /Zi /Fd..\..\lib\vc_dll\wxjpeg.pdb /opt:ref /opt:icf /I "..\..\lib\vc_dll\mswunivu" /D "WIN32" /D "_LIB" /D "NDEBUG" /c\r
+# ADD CPP /nologo /FD /MD /W1 /O2 /GR /EHsc /Zi /Fd..\..\lib\vc_dll\wxjpeg.pdb /opt:ref /opt:icf /I "..\..\lib\vc_dll\mswunivu" /D "WIN32" /D "_LIB" /D "NDEBUG" /c\r
  # ADD BASE RSC /l 0x409\r
  # ADD RSC /l 0x409\r
  BSC32=bscmake.exe\r
@@ -69,8 +69,8 @@ LIB32=link.exe -lib
  # PROP Output_Dir "..\..\lib\vc_dll"\r
  # PROP Intermediate_Dir "vc_mswunivuddll\wxjpeg"\r
  # PROP Target_Dir ""\r
-# ADD BASE CPP /nologo /FD /MDd /W1 /Od /Gm /GR /EHsc /Zi /Fd..\..\lib\vc_dll\wxjpegd.pdb /I "..\..\lib\vc_dll\mswunivud" /D "WIN32" /D "_LIB" /D "_DEBUG" /D "NDEBUG" /c
-# ADD CPP /nologo /FD /MDd /W1 /Od /Gm /GR /EHsc /Zi /Fd..\..\lib\vc_dll\wxjpegd.pdb /I "..\..\lib\vc_dll\mswunivud" /D "WIN32" /D "_LIB" /D "_DEBUG" /D "NDEBUG" /c
+# ADD BASE CPP /nologo /FD /MDd /W1 /Od /Gm /GR /EHsc /Zi /Fd..\..\lib\vc_dll\wxjpegd.pdb /I "..\..\lib\vc_dll\mswunivud" /D "WIN32" /D "_LIB" /D "_DEBUG" /D "NDEBUG" /c\r
+# ADD CPP /nologo /FD /MDd /W1 /Od /Gm /GR /EHsc /Zi /Fd..\..\lib\vc_dll\wxjpegd.pdb /I "..\..\lib\vc_dll\mswunivud" /D "WIN32" /D "_LIB" /D "_DEBUG" /D "NDEBUG" /c\r
  # ADD BASE RSC /l 0x409\r
  # ADD RSC /l 0x409\r
  BSC32=bscmake.exe\r
@@ -92,8 +92,8 @@ LIB32=link.exe -lib
  # PROP Output_Dir "..\..\lib\vc_dll"\r
  # PROP Intermediate_Dir "vc_mswudll\wxjpeg"\r
  # PROP Target_Dir ""\r
-# ADD BASE CPP /nologo /FD /MD /W1 /O2 /GR /EHsc /Zi /Fd..\..\lib\vc_dll\wxjpeg.pdb /I "..\..\lib\vc_dll\mswu" /D "WIN32" /D "_LIB" /D "NDEBUG" /c
-# ADD CPP /nologo /FD /MD /W1 /O2 /GR /EHsc /Zi /Fd..\..\lib\vc_dll\wxjpeg.pdb /I "..\..\lib\vc_dll\mswu" /D "WIN32" /D "_LIB" /D "NDEBUG" /c
+# ADD BASE CPP /nologo /FD /MD /W1 /O2 /GR /EHsc /Zi /Fd..\..\lib\vc_dll\wxjpeg.pdb /opt:ref /opt:icf /I "..\..\lib\vc_dll\mswu" /D "WIN32" /D "_LIB" /D "NDEBUG" /c\r
+# ADD CPP /nologo /FD /MD /W1 /O2 /GR /EHsc /Zi /Fd..\..\lib\vc_dll\wxjpeg.pdb /opt:ref /opt:icf /I "..\..\lib\vc_dll\mswu" /D "WIN32" /D "_LIB" /D "NDEBUG" /c\r
  # ADD BASE RSC /l 0x409\r
  # ADD RSC /l 0x409\r
  BSC32=bscmake.exe\r
@@ -115,8 +115,8 @@ LIB32=link.exe -lib
  # PROP Output_Dir "..\..\lib\vc_dll"\r
  # PROP Intermediate_Dir "vc_mswuddll\wxjpeg"\r
  # PROP Target_Dir ""\r
-# ADD BASE CPP /nologo /FD /MDd /W1 /Od /Gm /GR /EHsc /Zi /Fd..\..\lib\vc_dll\wxjpegd.pdb /I "..\..\lib\vc_dll\mswud" /D "WIN32" /D "_LIB" /D "_DEBUG" /D "NDEBUG" /c
-# ADD CPP /nologo /FD /MDd /W1 /Od /Gm /GR /EHsc /Zi /Fd..\..\lib\vc_dll\wxjpegd.pdb /I "..\..\lib\vc_dll\mswud" /D "WIN32" /D "_LIB" /D "_DEBUG" /D "NDEBUG" /c
+# ADD BASE CPP /nologo /FD /MDd /W1 /Od /Gm /GR /EHsc /Zi /Fd..\..\lib\vc_dll\wxjpegd.pdb /I "..\..\lib\vc_dll\mswud" /D "WIN32" /D "_LIB" /D "_DEBUG" /D "NDEBUG" /c\r
+# ADD CPP /nologo /FD /MDd /W1 /Od /Gm /GR /EHsc /Zi /Fd..\..\lib\vc_dll\wxjpegd.pdb /I "..\..\lib\vc_dll\mswud" /D "WIN32" /D "_LIB" /D "_DEBUG" /D "NDEBUG" /c\r
  # ADD BASE RSC /l 0x409\r
  # ADD RSC /l 0x409\r
  BSC32=bscmake.exe\r
@@ -138,8 +138,8 @@ LIB32=link.exe -lib
  # PROP Output_Dir "..\..\lib\vc_lib"\r
  # PROP Intermediate_Dir "vc_mswunivu\wxjpeg"\r
  # PROP Target_Dir ""\r
-# ADD BASE CPP /nologo /FD /MD /W1 /O2 /GR /EHsc /Zi /Fd..\..\lib\vc_lib\wxjpeg.pdb /I "..\..\lib\vc_lib\mswunivu" /D "WIN32" /D "_LIB" /D "NDEBUG" /c
-# ADD CPP /nologo /FD /MD /W1 /O2 /GR /EHsc /Zi /Fd..\..\lib\vc_lib\wxjpeg.pdb /I "..\..\lib\vc_lib\mswunivu" /D "WIN32" /D "_LIB" /D "NDEBUG" /c
+# ADD BASE CPP /nologo /FD /MD /W1 /O2 /GR /EHsc /Zi /Fd..\..\lib\vc_lib\wxjpeg.pdb /opt:ref /opt:icf /I "..\..\lib\vc_lib\mswunivu" /D "WIN32" /D "_LIB" /D "NDEBUG" /c\r
+# ADD CPP /nologo /FD /MD /W1 /O2 /GR /EHsc /Zi /Fd..\..\lib\vc_lib\wxjpeg.pdb /opt:ref /opt:icf /I "..\..\lib\vc_lib\mswunivu" /D "WIN32" /D "_LIB" /D "NDEBUG" /c\r
  # ADD BASE RSC /l 0x409\r
  # ADD RSC /l 0x409\r
  BSC32=bscmake.exe\r
@@ -161,8 +161,8 @@ LIB32=link.exe -lib
  # PROP Output_Dir "..\..\lib\vc_lib"\r
  # PROP Intermediate_Dir "vc_mswunivud\wxjpeg"\r
  # PROP Target_Dir ""\r
-# ADD BASE CPP /nologo /FD /MDd /W1 /Od /Gm /GR /EHsc /Zi /Fd..\..\lib\vc_lib\wxjpegd.pdb /I "..\..\lib\vc_lib\mswunivud" /D "WIN32" /D "_LIB" /D "_DEBUG" /D "NDEBUG" /c
-# ADD CPP /nologo /FD /MDd /W1 /Od /Gm /GR /EHsc /Zi /Fd..\..\lib\vc_lib\wxjpegd.pdb /I "..\..\lib\vc_lib\mswunivud" /D "WIN32" /D "_LIB" /D "_DEBUG" /D "NDEBUG" /c
+# ADD BASE CPP /nologo /FD /MDd /W1 /Od /Gm /GR /EHsc /Zi /Fd..\..\lib\vc_lib\wxjpegd.pdb /I "..\..\lib\vc_lib\mswunivud" /D "WIN32" /D "_LIB" /D "_DEBUG" /D "NDEBUG" /c\r
+# ADD CPP /nologo /FD /MDd /W1 /Od /Gm /GR /EHsc /Zi /Fd..\..\lib\vc_lib\wxjpegd.pdb /I "..\..\lib\vc_lib\mswunivud" /D "WIN32" /D "_LIB" /D "_DEBUG" /D "NDEBUG" /c\r
  # ADD BASE RSC /l 0x409\r
  # ADD RSC /l 0x409\r
  BSC32=bscmake.exe\r
@@ -184,8 +184,8 @@ LIB32=link.exe -lib
  # PROP Output_Dir "..\..\lib\vc_lib"\r
  # PROP Intermediate_Dir "vc_mswu\wxjpeg"\r
  # PROP Target_Dir ""\r
-# ADD BASE CPP /nologo /FD /MD /W1 /O2 /GR /EHsc /Zi /Fd..\..\lib\vc_lib\wxjpeg.pdb /I "..\..\lib\vc_lib\mswu" /D "WIN32" /D "_LIB" /D "NDEBUG" /c
-# ADD CPP /nologo /FD /MD /W1 /O2 /GR /EHsc /Zi /Fd..\..\lib\vc_lib\wxjpeg.pdb /I "..\..\lib\vc_lib\mswu" /D "WIN32" /D "_LIB" /D "NDEBUG" /c
+# ADD BASE CPP /nologo /FD /MD /W1 /O2 /GR /EHsc /Zi /Fd..\..\lib\vc_lib\wxjpeg.pdb /opt:ref /opt:icf /I "..\..\lib\vc_lib\mswu" /D "WIN32" /D "_LIB" /D "NDEBUG" /c\r
+# ADD CPP /nologo /FD /MD /W1 /O2 /GR /EHsc /Zi /Fd..\..\lib\vc_lib\wxjpeg.pdb /opt:ref /opt:icf /I "..\..\lib\vc_lib\mswu" /D "WIN32" /D "_LIB" /D "NDEBUG" /c\r
  # ADD BASE RSC /l 0x409\r
  # ADD RSC /l 0x409\r
  BSC32=bscmake.exe\r
@@ -207,8 +207,8 @@ LIB32=link.exe -lib
  # PROP Output_Dir "..\..\lib\vc_lib"\r
  # PROP Intermediate_Dir "vc_mswud\wxjpeg"\r
  # PROP Target_Dir ""\r
-# ADD BASE CPP /nologo /FD /MDd /W1 /Od /Gm /GR /EHsc /Zi /Fd..\..\lib\vc_lib\wxjpegd.pdb /I "..\..\lib\vc_lib\mswud" /D "WIN32" /D "_LIB" /D "_DEBUG" /D "NDEBUG" /c
-# ADD CPP /nologo /FD /MDd /W1 /Od /Gm /GR /EHsc /Zi /Fd..\..\lib\vc_lib\wxjpegd.pdb /I "..\..\lib\vc_lib\mswud" /D "WIN32" /D "_LIB" /D "_DEBUG" /D "NDEBUG" /c
+# ADD BASE CPP /nologo /FD /MDd /W1 /Od /Gm /GR /EHsc /Zi /Fd..\..\lib\vc_lib\wxjpegd.pdb /I "..\..\lib\vc_lib\mswud" /D "WIN32" /D "_LIB" /D "_DEBUG" /D "NDEBUG" /c\r
+# ADD CPP /nologo /FD /MDd /W1 /Od /Gm /GR /EHsc /Zi /Fd..\..\lib\vc_lib\wxjpegd.pdb /I "..\..\lib\vc_lib\mswud" /D "WIN32" /D "_LIB" /D "_DEBUG" /D "NDEBUG" /c\r
  # ADD BASE RSC /l 0x409\r
  # ADD RSC /l 0x409\r
  BSC32=bscmake.exe\r
diff --git a/build/msw/wx_wxpng.dsp b/build/msw/wx_wxpng.dsp

index 4b0e1922419cda48c4945c473fd8dd602c8bd7f4..8144b73422b952cd6944e2329e4ea6691fb33651 100644 (file)
--- a/build/msw/wx_wxpng.dsp
+++ b/build/msw/wx_wxpng.dsp
@@ -46,8 +46,8 @@ RSC=rc.exe
  # PROP Output_Dir "..\..\lib\vc_dll"\r
  # PROP Intermediate_Dir "vc_mswunivudll\wxpng"\r
  # PROP Target_Dir ""\r
-# ADD BASE CPP /nologo /FD /MD /W1 /O2 /GR /EHsc /Zi /Fd..\..\lib\vc_dll\wxpng.pdb /I "..\..\src\zlib" /D "WIN32" /D "_LIB" /D "NDEBUG" /c
-# ADD CPP /nologo /FD /MD /W1 /O2 /GR /EHsc /Zi /Fd..\..\lib\vc_dll\wxpng.pdb /I "..\..\src\zlib" /D "WIN32" /D "_LIB" /D "NDEBUG" /c
+# ADD BASE CPP /nologo /FD /MD /W1 /O2 /GR /EHsc /Zi /Fd..\..\lib\vc_dll\wxpng.pdb /opt:ref /opt:icf /I "..\..\src\zlib" /D "WIN32" /D "_LIB" /D "NDEBUG" /c\r
+# ADD CPP /nologo /FD /MD /W1 /O2 /GR /EHsc /Zi /Fd..\..\lib\vc_dll\wxpng.pdb /opt:ref /opt:icf /I "..\..\src\zlib" /D "WIN32" /D "_LIB" /D "NDEBUG" /c\r
  # ADD BASE RSC /l 0x409\r
  # ADD RSC /l 0x409\r
  BSC32=bscmake.exe\r
@@ -69,8 +69,8 @@ LIB32=link.exe -lib
  # PROP Output_Dir "..\..\lib\vc_dll"\r
  # PROP Intermediate_Dir "vc_mswunivuddll\wxpng"\r
  # PROP Target_Dir ""\r
-# ADD BASE CPP /nologo /FD /MDd /W1 /Od /Gm /GR /EHsc /Zi /Fd..\..\lib\vc_dll\wxpngd.pdb /I "..\..\src\zlib" /D "WIN32" /D "_LIB" /D "_DEBUG" /D "NDEBUG" /c
-# ADD CPP /nologo /FD /MDd /W1 /Od /Gm /GR /EHsc /Zi /Fd..\..\lib\vc_dll\wxpngd.pdb /I "..\..\src\zlib" /D "WIN32" /D "_LIB" /D "_DEBUG" /D "NDEBUG" /c
+# ADD BASE CPP /nologo /FD /MDd /W1 /Od /Gm /GR /EHsc /Zi /Fd..\..\lib\vc_dll\wxpngd.pdb /I "..\..\src\zlib" /D "WIN32" /D "_LIB" /D "_DEBUG" /D "NDEBUG" /c\r
+# ADD CPP /nologo /FD /MDd /W1 /Od /Gm /GR /EHsc /Zi /Fd..\..\lib\vc_dll\wxpngd.pdb /I "..\..\src\zlib" /D "WIN32" /D "_LIB" /D "_DEBUG" /D "NDEBUG" /c\r
  # ADD BASE RSC /l 0x409\r
  # ADD RSC /l 0x409\r
  BSC32=bscmake.exe\r
@@ -92,8 +92,8 @@ LIB32=link.exe -lib
  # PROP Output_Dir "..\..\lib\vc_dll"\r
  # PROP Intermediate_Dir "vc_mswudll\wxpng"\r
  # PROP Target_Dir ""\r
-# ADD BASE CPP /nologo /FD /MD /W1 /O2 /GR /EHsc /Zi /Fd..\..\lib\vc_dll\wxpng.pdb /I "..\..\src\zlib" /D "WIN32" /D "_LIB" /D "NDEBUG" /c
-# ADD CPP /nologo /FD /MD /W1 /O2 /GR /EHsc /Zi /Fd..\..\lib\vc_dll\wxpng.pdb /I "..\..\src\zlib" /D "WIN32" /D "_LIB" /D "NDEBUG" /c
+# ADD BASE CPP /nologo /FD /MD /W1 /O2 /GR /EHsc /Zi /Fd..\..\lib\vc_dll\wxpng.pdb /opt:ref /opt:icf /I "..\..\src\zlib" /D "WIN32" /D "_LIB" /D "NDEBUG" /c\r
+# ADD CPP /nologo /FD /MD /W1 /O2 /GR /EHsc /Zi /Fd..\..\lib\vc_dll\wxpng.pdb /opt:ref /opt:icf /I "..\..\src\zlib" /D "WIN32" /D "_LIB" /D "NDEBUG" /c\r
  # ADD BASE RSC /l 0x409\r
  # ADD RSC /l 0x409\r
  BSC32=bscmake.exe\r
@@ -115,8 +115,8 @@ LIB32=link.exe -lib
  # PROP Output_Dir "..\..\lib\vc_dll"\r
  # PROP Intermediate_Dir "vc_mswuddll\wxpng"\r
  # PROP Target_Dir ""\r
-# ADD BASE CPP /nologo /FD /MDd /W1 /Od /Gm /GR /EHsc /Zi /Fd..\..\lib\vc_dll\wxpngd.pdb /I "..\..\src\zlib" /D "WIN32" /D "_LIB" /D "_DEBUG" /D "NDEBUG" /c
-# ADD CPP /nologo /FD /MDd /W1 /Od /Gm /GR /EHsc /Zi /Fd..\..\lib\vc_dll\wxpngd.pdb /I "..\..\src\zlib" /D "WIN32" /D "_LIB" /D "_DEBUG" /D "NDEBUG" /c
+# ADD BASE CPP /nologo /FD /MDd /W1 /Od /Gm /GR /EHsc /Zi /Fd..\..\lib\vc_dll\wxpngd.pdb /I "..\..\src\zlib" /D "WIN32" /D "_LIB" /D "_DEBUG" /D "NDEBUG" /c\r
+# ADD CPP /nologo /FD /MDd /W1 /Od /Gm /GR /EHsc /Zi /Fd..\..\lib\vc_dll\wxpngd.pdb /I "..\..\src\zlib" /D "WIN32" /D "_LIB" /D "_DEBUG" /D "NDEBUG" /c\r
  # ADD BASE RSC /l 0x409\r
  # ADD RSC /l 0x409\r
  BSC32=bscmake.exe\r
@@ -138,8 +138,8 @@ LIB32=link.exe -lib
  # PROP Output_Dir "..\..\lib\vc_lib"\r
  # PROP Intermediate_Dir "vc_mswunivu\wxpng"\r
  # PROP Target_Dir ""\r
-# ADD BASE CPP /nologo /FD /MD /W1 /O2 /GR /EHsc /Zi /Fd..\..\lib\vc_lib\wxpng.pdb /I "..\..\src\zlib" /D "WIN32" /D "_LIB" /D "NDEBUG" /c
-# ADD CPP /nologo /FD /MD /W1 /O2 /GR /EHsc /Zi /Fd..\..\lib\vc_lib\wxpng.pdb /I "..\..\src\zlib" /D "WIN32" /D "_LIB" /D "NDEBUG" /c
+# ADD BASE CPP /nologo /FD /MD /W1 /O2 /GR /EHsc /Zi /Fd..\..\lib\vc_lib\wxpng.pdb /opt:ref /opt:icf /I "..\..\src\zlib" /D "WIN32" /D "_LIB" /D "NDEBUG" /c\r
+# ADD CPP /nologo /FD /MD /W1 /O2 /GR /EHsc /Zi /Fd..\..\lib\vc_lib\wxpng.pdb /opt:ref /opt:icf /I "..\..\src\zlib" /D "WIN32" /D "_LIB" /D "NDEBUG" /c\r
  # ADD BASE RSC /l 0x409\r
  # ADD RSC /l 0x409\r
  BSC32=bscmake.exe\r
@@ -161,8 +161,8 @@ LIB32=link.exe -lib
  # PROP Output_Dir "..\..\lib\vc_lib"\r
  # PROP Intermediate_Dir "vc_mswunivud\wxpng"\r
  # PROP Target_Dir ""\r
-# ADD BASE CPP /nologo /FD /MDd /W1 /Od /Gm /GR /EHsc /Zi /Fd..\..\lib\vc_lib\wxpngd.pdb /I "..\..\src\zlib" /D "WIN32" /D "_LIB" /D "_DEBUG" /D "NDEBUG" /c
-# ADD CPP /nologo /FD /MDd /W1 /Od /Gm /GR /EHsc /Zi /Fd..\..\lib\vc_lib\wxpngd.pdb /I "..\..\src\zlib" /D "WIN32" /D "_LIB" /D "_DEBUG" /D "NDEBUG" /c
+# ADD BASE CPP /nologo /FD /MDd /W1 /Od /Gm /GR /EHsc /Zi /Fd..\..\lib\vc_lib\wxpngd.pdb /I "..\..\src\zlib" /D "WIN32" /D "_LIB" /D "_DEBUG" /D "NDEBUG" /c\r
+# ADD CPP /nologo /FD /MDd /W1 /Od /Gm /GR /EHsc /Zi /Fd..\..\lib\vc_lib\wxpngd.pdb /I "..\..\src\zlib" /D "WIN32" /D "_LIB" /D "_DEBUG" /D "NDEBUG" /c\r
  # ADD BASE RSC /l 0x409\r
  # ADD RSC /l 0x409\r
  BSC32=bscmake.exe\r
@@ -184,8 +184,8 @@ LIB32=link.exe -lib
  # PROP Output_Dir "..\..\lib\vc_lib"\r
  # PROP Intermediate_Dir "vc_mswu\wxpng"\r
  # PROP Target_Dir ""\r
-# ADD BASE CPP /nologo /FD /MD /W1 /O2 /GR /EHsc /Zi /Fd..\..\lib\vc_lib\wxpng.pdb /I "..\..\src\zlib" /D "WIN32" /D "_LIB" /D "NDEBUG" /c
-# ADD CPP /nologo /FD /MD /W1 /O2 /GR /EHsc /Zi /Fd..\..\lib\vc_lib\wxpng.pdb /I "..\..\src\zlib" /D "WIN32" /D "_LIB" /D "NDEBUG" /c
+# ADD BASE CPP /nologo /FD /MD /W1 /O2 /GR /EHsc /Zi /Fd..\..\lib\vc_lib\wxpng.pdb /opt:ref /opt:icf /I "..\..\src\zlib" /D "WIN32" /D "_LIB" /D "NDEBUG" /c\r
+# ADD CPP /nologo /FD /MD /W1 /O2 /GR /EHsc /Zi /Fd..\..\lib\vc_lib\wxpng.pdb /opt:ref /opt:icf /I "..\..\src\zlib" /D "WIN32" /D "_LIB" /D "NDEBUG" /c\r
  # ADD BASE RSC /l 0x409\r
  # ADD RSC /l 0x409\r
  BSC32=bscmake.exe\r
@@ -207,8 +207,8 @@ LIB32=link.exe -lib
  # PROP Output_Dir "..\..\lib\vc_lib"\r
  # PROP Intermediate_Dir "vc_mswud\wxpng"\r
  # PROP Target_Dir ""\r
-# ADD BASE CPP /nologo /FD /MDd /W1 /Od /Gm /GR /EHsc /Zi /Fd..\..\lib\vc_lib\wxpngd.pdb /I "..\..\src\zlib" /D "WIN32" /D "_LIB" /D "_DEBUG" /D "NDEBUG" /c
-# ADD CPP /nologo /FD /MDd /W1 /Od /Gm /GR /EHsc /Zi /Fd..\..\lib\vc_lib\wxpngd.pdb /I "..\..\src\zlib" /D "WIN32" /D "_LIB" /D "_DEBUG" /D "NDEBUG" /c
+# ADD BASE CPP /nologo /FD /MDd /W1 /Od /Gm /GR /EHsc /Zi /Fd..\..\lib\vc_lib\wxpngd.pdb /I "..\..\src\zlib" /D "WIN32" /D "_LIB" /D "_DEBUG" /D "NDEBUG" /c\r
+# ADD CPP /nologo /FD /MDd /W1 /Od /Gm /GR /EHsc /Zi /Fd..\..\lib\vc_lib\wxpngd.pdb /I "..\..\src\zlib" /D "WIN32" /D "_LIB" /D "_DEBUG" /D "NDEBUG" /c\r
  # ADD BASE RSC /l 0x409\r
  # ADD RSC /l 0x409\r
  BSC32=bscmake.exe\r
diff --git a/build/msw/wx_wxregex.dsp b/build/msw/wx_wxregex.dsp

index 163e482a4dcb14169f118bc68f42de363cf85048..de358d9c8a414a50b92fff940f3271f515776278 100644 (file)
--- a/build/msw/wx_wxregex.dsp
+++ b/build/msw/wx_wxregex.dsp
@@ -46,8 +46,8 @@ RSC=rc.exe
  # PROP Output_Dir "..\..\lib\vc_dll"\r
  # PROP Intermediate_Dir "vc_mswunivudll\wxregex"\r
  # PROP Target_Dir ""\r
-# ADD BASE CPP /nologo /FD /MD /W1 /O2 /GR /EHsc /I "..\..\include" /I "..\..\lib\vc_dll\mswunivu" /Zi /Fd..\..\lib\vc_dll\wxregexu.pdb /D "WIN32" /D "_LIB" /D "NDEBUG" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /c
-# ADD CPP /nologo /FD /MD /W1 /O2 /GR /EHsc /I "..\..\include" /I "..\..\lib\vc_dll\mswunivu" /Zi /Fd..\..\lib\vc_dll\wxregexu.pdb /D "WIN32" /D "_LIB" /D "NDEBUG" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /c
+# ADD BASE CPP /nologo /FD /MD /W1 /O2 /GR /EHsc /I "..\..\include" /I "..\..\lib\vc_dll\mswunivu" /Zi /Fd..\..\lib\vc_dll\wxregexu.pdb /opt:ref /opt:icf /D "WIN32" /D "_LIB" /D "NDEBUG" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /c\r
+# ADD CPP /nologo /FD /MD /W1 /O2 /GR /EHsc /I "..\..\include" /I "..\..\lib\vc_dll\mswunivu" /Zi /Fd..\..\lib\vc_dll\wxregexu.pdb /opt:ref /opt:icf /D "WIN32" /D "_LIB" /D "NDEBUG" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /c\r
  # ADD BASE RSC /l 0x409\r
  # ADD RSC /l 0x409\r
  BSC32=bscmake.exe\r
@@ -69,8 +69,8 @@ LIB32=link.exe -lib
  # PROP Output_Dir "..\..\lib\vc_dll"\r
  # PROP Intermediate_Dir "vc_mswunivuddll\wxregex"\r
  # PROP Target_Dir ""\r
-# ADD BASE CPP /nologo /FD /MDd /W1 /Od /Gm /GR /EHsc /I "..\..\include" /I "..\..\lib\vc_dll\mswunivud" /Zi /Fd..\..\lib\vc_dll\wxregexud.pdb /D "WIN32" /D "_LIB" /D "_DEBUG" /D "NDEBUG" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /c
-# ADD CPP /nologo /FD /MDd /W1 /Od /Gm /GR /EHsc /I "..\..\include" /I "..\..\lib\vc_dll\mswunivud" /Zi /Fd..\..\lib\vc_dll\wxregexud.pdb /D "WIN32" /D "_LIB" /D "_DEBUG" /D "NDEBUG" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /c
+# ADD BASE CPP /nologo /FD /MDd /W1 /Od /Gm /GR /EHsc /I "..\..\include" /I "..\..\lib\vc_dll\mswunivud" /Zi /Fd..\..\lib\vc_dll\wxregexud.pdb /D "WIN32" /D "_LIB" /D "_DEBUG" /D "NDEBUG" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /c\r
+# ADD CPP /nologo /FD /MDd /W1 /Od /Gm /GR /EHsc /I "..\..\include" /I "..\..\lib\vc_dll\mswunivud" /Zi /Fd..\..\lib\vc_dll\wxregexud.pdb /D "WIN32" /D "_LIB" /D "_DEBUG" /D "NDEBUG" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /c\r
  # ADD BASE RSC /l 0x409\r
  # ADD RSC /l 0x409\r
  BSC32=bscmake.exe\r
@@ -92,8 +92,8 @@ LIB32=link.exe -lib
  # PROP Output_Dir "..\..\lib\vc_dll"\r
  # PROP Intermediate_Dir "vc_mswudll\wxregex"\r
  # PROP Target_Dir ""\r
-# ADD BASE CPP /nologo /FD /MD /W1 /O2 /GR /EHsc /I "..\..\include" /I "..\..\lib\vc_dll\mswu" /Zi /Fd..\..\lib\vc_dll\wxregexu.pdb /D "WIN32" /D "_LIB" /D "NDEBUG" /D "__WXMSW__" /D "_UNICODE" /c
-# ADD CPP /nologo /FD /MD /W1 /O2 /GR /EHsc /I "..\..\include" /I "..\..\lib\vc_dll\mswu" /Zi /Fd..\..\lib\vc_dll\wxregexu.pdb /D "WIN32" /D "_LIB" /D "NDEBUG" /D "__WXMSW__" /D "_UNICODE" /c
+# ADD BASE CPP /nologo /FD /MD /W1 /O2 /GR /EHsc /I "..\..\include" /I "..\..\lib\vc_dll\mswu" /Zi /Fd..\..\lib\vc_dll\wxregexu.pdb /opt:ref /opt:icf /D "WIN32" /D "_LIB" /D "NDEBUG" /D "__WXMSW__" /D "_UNICODE" /c\r
+# ADD CPP /nologo /FD /MD /W1 /O2 /GR /EHsc /I "..\..\include" /I "..\..\lib\vc_dll\mswu" /Zi /Fd..\..\lib\vc_dll\wxregexu.pdb /opt:ref /opt:icf /D "WIN32" /D "_LIB" /D "NDEBUG" /D "__WXMSW__" /D "_UNICODE" /c\r
  # ADD BASE RSC /l 0x409\r
  # ADD RSC /l 0x409\r
  BSC32=bscmake.exe\r
@@ -115,8 +115,8 @@ LIB32=link.exe -lib
  # PROP Output_Dir "..\..\lib\vc_dll"\r
  # PROP Intermediate_Dir "vc_mswuddll\wxregex"\r
  # PROP Target_Dir ""\r
-# ADD BASE CPP /nologo /FD /MDd /W1 /Od /Gm /GR /EHsc /I "..\..\include" /I "..\..\lib\vc_dll\mswud" /Zi /Fd..\..\lib\vc_dll\wxregexud.pdb /D "WIN32" /D "_LIB" /D "_DEBUG" /D "NDEBUG" /D "__WXMSW__" /D "_UNICODE" /c
-# ADD CPP /nologo /FD /MDd /W1 /Od /Gm /GR /EHsc /I "..\..\include" /I "..\..\lib\vc_dll\mswud" /Zi /Fd..\..\lib\vc_dll\wxregexud.pdb /D "WIN32" /D "_LIB" /D "_DEBUG" /D "NDEBUG" /D "__WXMSW__" /D "_UNICODE" /c
+# ADD BASE CPP /nologo /FD /MDd /W1 /Od /Gm /GR /EHsc /I "..\..\include" /I "..\..\lib\vc_dll\mswud" /Zi /Fd..\..\lib\vc_dll\wxregexud.pdb /D "WIN32" /D "_LIB" /D "_DEBUG" /D "NDEBUG" /D "__WXMSW__" /D "_UNICODE" /c\r
+# ADD CPP /nologo /FD /MDd /W1 /Od /Gm /GR /EHsc /I "..\..\include" /I "..\..\lib\vc_dll\mswud" /Zi /Fd..\..\lib\vc_dll\wxregexud.pdb /D "WIN32" /D "_LIB" /D "_DEBUG" /D "NDEBUG" /D "__WXMSW__" /D "_UNICODE" /c\r
  # ADD BASE RSC /l 0x409\r
  # ADD RSC /l 0x409\r
  BSC32=bscmake.exe\r
@@ -138,8 +138,8 @@ LIB32=link.exe -lib
  # PROP Output_Dir "..\..\lib\vc_lib"\r
  # PROP Intermediate_Dir "vc_mswunivu\wxregex"\r
  # PROP Target_Dir ""\r
-# ADD BASE CPP /nologo /FD /MD /W1 /O2 /GR /EHsc /I "..\..\include" /I "..\..\lib\vc_lib\mswunivu" /Zi /Fd..\..\lib\vc_lib\wxregexu.pdb /D "WIN32" /D "_LIB" /D "NDEBUG" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /c
-# ADD CPP /nologo /FD /MD /W1 /O2 /GR /EHsc /I "..\..\include" /I "..\..\lib\vc_lib\mswunivu" /Zi /Fd..\..\lib\vc_lib\wxregexu.pdb /D "WIN32" /D "_LIB" /D "NDEBUG" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /c
+# ADD BASE CPP /nologo /FD /MD /W1 /O2 /GR /EHsc /I "..\..\include" /I "..\..\lib\vc_lib\mswunivu" /Zi /Fd..\..\lib\vc_lib\wxregexu.pdb /opt:ref /opt:icf /D "WIN32" /D "_LIB" /D "NDEBUG" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /c\r
+# ADD CPP /nologo /FD /MD /W1 /O2 /GR /EHsc /I "..\..\include" /I "..\..\lib\vc_lib\mswunivu" /Zi /Fd..\..\lib\vc_lib\wxregexu.pdb /opt:ref /opt:icf /D "WIN32" /D "_LIB" /D "NDEBUG" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /c\r
  # ADD BASE RSC /l 0x409\r
  # ADD RSC /l 0x409\r
  BSC32=bscmake.exe\r
@@ -161,8 +161,8 @@ LIB32=link.exe -lib
  # PROP Output_Dir "..\..\lib\vc_lib"\r
  # PROP Intermediate_Dir "vc_mswunivud\wxregex"\r
  # PROP Target_Dir ""\r
-# ADD BASE CPP /nologo /FD /MDd /W1 /Od /Gm /GR /EHsc /I "..\..\include" /I "..\..\lib\vc_lib\mswunivud" /Zi /Fd..\..\lib\vc_lib\wxregexud.pdb /D "WIN32" /D "_LIB" /D "_DEBUG" /D "NDEBUG" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /c
-# ADD CPP /nologo /FD /MDd /W1 /Od /Gm /GR /EHsc /I "..\..\include" /I "..\..\lib\vc_lib\mswunivud" /Zi /Fd..\..\lib\vc_lib\wxregexud.pdb /D "WIN32" /D "_LIB" /D "_DEBUG" /D "NDEBUG" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /c
+# ADD BASE CPP /nologo /FD /MDd /W1 /Od /Gm /GR /EHsc /I "..\..\include" /I "..\..\lib\vc_lib\mswunivud" /Zi /Fd..\..\lib\vc_lib\wxregexud.pdb /D "WIN32" /D "_LIB" /D "_DEBUG" /D "NDEBUG" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /c\r
+# ADD CPP /nologo /FD /MDd /W1 /Od /Gm /GR /EHsc /I "..\..\include" /I "..\..\lib\vc_lib\mswunivud" /Zi /Fd..\..\lib\vc_lib\wxregexud.pdb /D "WIN32" /D "_LIB" /D "_DEBUG" /D "NDEBUG" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /c\r
  # ADD BASE RSC /l 0x409\r
  # ADD RSC /l 0x409\r
  BSC32=bscmake.exe\r
@@ -184,8 +184,8 @@ LIB32=link.exe -lib
  # PROP Output_Dir "..\..\lib\vc_lib"\r
  # PROP Intermediate_Dir "vc_mswu\wxregex"\r
  # PROP Target_Dir ""\r
-# ADD BASE CPP /nologo /FD /MD /W1 /O2 /GR /EHsc /I "..\..\include" /I "..\..\lib\vc_lib\mswu" /Zi /Fd..\..\lib\vc_lib\wxregexu.pdb /D "WIN32" /D "_LIB" /D "NDEBUG" /D "__WXMSW__" /D "_UNICODE" /c
-# ADD CPP /nologo /FD /MD /W1 /O2 /GR /EHsc /I "..\..\include" /I "..\..\lib\vc_lib\mswu" /Zi /Fd..\..\lib\vc_lib\wxregexu.pdb /D "WIN32" /D "_LIB" /D "NDEBUG" /D "__WXMSW__" /D "_UNICODE" /c
+# ADD BASE CPP /nologo /FD /MD /W1 /O2 /GR /EHsc /I "..\..\include" /I "..\..\lib\vc_lib\mswu" /Zi /Fd..\..\lib\vc_lib\wxregexu.pdb /opt:ref /opt:icf /D "WIN32" /D "_LIB" /D "NDEBUG" /D "__WXMSW__" /D "_UNICODE" /c\r
+# ADD CPP /nologo /FD /MD /W1 /O2 /GR /EHsc /I "..\..\include" /I "..\..\lib\vc_lib\mswu" /Zi /Fd..\..\lib\vc_lib\wxregexu.pdb /opt:ref /opt:icf /D "WIN32" /D "_LIB" /D "NDEBUG" /D "__WXMSW__" /D "_UNICODE" /c\r
  # ADD BASE RSC /l 0x409\r
  # ADD RSC /l 0x409\r
  BSC32=bscmake.exe\r
@@ -207,8 +207,8 @@ LIB32=link.exe -lib
  # PROP Output_Dir "..\..\lib\vc_lib"\r
  # PROP Intermediate_Dir "vc_mswud\wxregex"\r
  # PROP Target_Dir ""\r
-# ADD BASE CPP /nologo /FD /MDd /W1 /Od /Gm /GR /EHsc /I "..\..\include" /I "..\..\lib\vc_lib\mswud" /Zi /Fd..\..\lib\vc_lib\wxregexud.pdb /D "WIN32" /D "_LIB" /D "_DEBUG" /D "NDEBUG" /D "__WXMSW__" /D "_UNICODE" /c
-# ADD CPP /nologo /FD /MDd /W1 /Od /Gm /GR /EHsc /I "..\..\include" /I "..\..\lib\vc_lib\mswud" /Zi /Fd..\..\lib\vc_lib\wxregexud.pdb /D "WIN32" /D "_LIB" /D "_DEBUG" /D "NDEBUG" /D "__WXMSW__" /D "_UNICODE" /c
+# ADD BASE CPP /nologo /FD /MDd /W1 /Od /Gm /GR /EHsc /I "..\..\include" /I "..\..\lib\vc_lib\mswud" /Zi /Fd..\..\lib\vc_lib\wxregexud.pdb /D "WIN32" /D "_LIB" /D "_DEBUG" /D "NDEBUG" /D "__WXMSW__" /D "_UNICODE" /c\r
+# ADD CPP /nologo /FD /MDd /W1 /Od /Gm /GR /EHsc /I "..\..\include" /I "..\..\lib\vc_lib\mswud" /Zi /Fd..\..\lib\vc_lib\wxregexud.pdb /D "WIN32" /D "_LIB" /D "_DEBUG" /D "NDEBUG" /D "__WXMSW__" /D "_UNICODE" /c\r
  # ADD BASE RSC /l 0x409\r
  # ADD RSC /l 0x409\r
  BSC32=bscmake.exe\r
diff --git a/build/msw/wx_wxscintilla.dsp b/build/msw/wx_wxscintilla.dsp

index 1d8bc15ffcf08a6663f47f4bd07c676e5b48e3b9..e51ff570dd566b3fe6eb3d2b73d6dad75aa8816f 100644 (file)
--- a/build/msw/wx_wxscintilla.dsp
+++ b/build/msw/wx_wxscintilla.dsp
@@ -46,8 +46,8 @@ RSC=rc.exe
  # PROP Output_Dir "..\..\lib\vc_dll"\r
  # PROP Intermediate_Dir "vc_mswunivudll\wxscintilla"\r
  # PROP Target_Dir ""\r
-# ADD BASE CPP /nologo /FD /MD /W1 /O2 /GR /EHsc /I "..\..\src\stc\scintilla\include" /I "..\..\src\stc\scintilla\src" /Zi /Fd..\..\lib\vc_dll\wxscintilla.pdb /D "WIN32" /D "_LIB" /D "NDEBUG" /D "__WX__" /D "SCI_LEXER" /D "LINK_LEXERS" /c
-# ADD CPP /nologo /FD /MD /W1 /O2 /GR /EHsc /I "..\..\src\stc\scintilla\include" /I "..\..\src\stc\scintilla\src" /Zi /Fd..\..\lib\vc_dll\wxscintilla.pdb /D "WIN32" /D "_LIB" /D "NDEBUG" /D "__WX__" /D "SCI_LEXER" /D "LINK_LEXERS" /c
+# ADD BASE CPP /nologo /FD /MD /W1 /O2 /GR /EHsc /I "..\..\src\stc\scintilla\include" /I "..\..\src\stc\scintilla\src" /Zi /Fd..\..\lib\vc_dll\wxscintilla.pdb /opt:ref /opt:icf /D "WIN32" /D "_LIB" /D "NDEBUG" /D "__WX__" /D "SCI_LEXER" /D "LINK_LEXERS" /c\r
+# ADD CPP /nologo /FD /MD /W1 /O2 /GR /EHsc /I "..\..\src\stc\scintilla\include" /I "..\..\src\stc\scintilla\src" /Zi /Fd..\..\lib\vc_dll\wxscintilla.pdb /opt:ref /opt:icf /D "WIN32" /D "_LIB" /D "NDEBUG" /D "__WX__" /D "SCI_LEXER" /D "LINK_LEXERS" /c\r
  # ADD BASE RSC /l 0x409\r
  # ADD RSC /l 0x409\r
  BSC32=bscmake.exe\r
@@ -69,8 +69,8 @@ LIB32=link.exe -lib
  # PROP Output_Dir "..\..\lib\vc_dll"\r
  # PROP Intermediate_Dir "vc_mswunivuddll\wxscintilla"\r
  # PROP Target_Dir ""\r
-# ADD BASE CPP /nologo /FD /MDd /W1 /Od /Gm /GR /EHsc /I "..\..\src\stc\scintilla\include" /I "..\..\src\stc\scintilla\src" /Zi /Fd..\..\lib\vc_dll\wxscintillad.pdb /D "WIN32" /D "_LIB" /D "_DEBUG" /D "NDEBUG" /D "__WX__" /D "SCI_LEXER" /D "LINK_LEXERS" /c
-# ADD CPP /nologo /FD /MDd /W1 /Od /Gm /GR /EHsc /I "..\..\src\stc\scintilla\include" /I "..\..\src\stc\scintilla\src" /Zi /Fd..\..\lib\vc_dll\wxscintillad.pdb /D "WIN32" /D "_LIB" /D "_DEBUG" /D "NDEBUG" /D "__WX__" /D "SCI_LEXER" /D "LINK_LEXERS" /c
+# ADD BASE CPP /nologo /FD /MDd /W1 /Od /Gm /GR /EHsc /I "..\..\src\stc\scintilla\include" /I "..\..\src\stc\scintilla\src" /Zi /Fd..\..\lib\vc_dll\wxscintillad.pdb /D "WIN32" /D "_LIB" /D "_DEBUG" /D "NDEBUG" /D "__WX__" /D "SCI_LEXER" /D "LINK_LEXERS" /c\r
+# ADD CPP /nologo /FD /MDd /W1 /Od /Gm /GR /EHsc /I "..\..\src\stc\scintilla\include" /I "..\..\src\stc\scintilla\src" /Zi /Fd..\..\lib\vc_dll\wxscintillad.pdb /D "WIN32" /D "_LIB" /D "_DEBUG" /D "NDEBUG" /D "__WX__" /D "SCI_LEXER" /D "LINK_LEXERS" /c\r
  # ADD BASE RSC /l 0x409\r
  # ADD RSC /l 0x409\r
  BSC32=bscmake.exe\r
@@ -92,8 +92,8 @@ LIB32=link.exe -lib
  # PROP Output_Dir "..\..\lib\vc_dll"\r
  # PROP Intermediate_Dir "vc_mswudll\wxscintilla"\r
  # PROP Target_Dir ""\r
-# ADD BASE CPP /nologo /FD /MD /W1 /O2 /GR /EHsc /I "..\..\src\stc\scintilla\include" /I "..\..\src\stc\scintilla\src" /Zi /Fd..\..\lib\vc_dll\wxscintilla.pdb /D "WIN32" /D "_LIB" /D "NDEBUG" /D "__WX__" /D "SCI_LEXER" /D "LINK_LEXERS" /c
-# ADD CPP /nologo /FD /MD /W1 /O2 /GR /EHsc /I "..\..\src\stc\scintilla\include" /I "..\..\src\stc\scintilla\src" /Zi /Fd..\..\lib\vc_dll\wxscintilla.pdb /D "WIN32" /D "_LIB" /D "NDEBUG" /D "__WX__" /D "SCI_LEXER" /D "LINK_LEXERS" /c
+# ADD BASE CPP /nologo /FD /MD /W1 /O2 /GR /EHsc /I "..\..\src\stc\scintilla\include" /I "..\..\src\stc\scintilla\src" /Zi /Fd..\..\lib\vc_dll\wxscintilla.pdb /opt:ref /opt:icf /D "WIN32" /D "_LIB" /D "NDEBUG" /D "__WX__" /D "SCI_LEXER" /D "LINK_LEXERS" /c\r
+# ADD CPP /nologo /FD /MD /W1 /O2 /GR /EHsc /I "..\..\src\stc\scintilla\include" /I "..\..\src\stc\scintilla\src" /Zi /Fd..\..\lib\vc_dll\wxscintilla.pdb /opt:ref /opt:icf /D "WIN32" /D "_LIB" /D "NDEBUG" /D "__WX__" /D "SCI_LEXER" /D "LINK_LEXERS" /c\r
  # ADD BASE RSC /l 0x409\r
  # ADD RSC /l 0x409\r
  BSC32=bscmake.exe\r
@@ -115,8 +115,8 @@ LIB32=link.exe -lib
  # PROP Output_Dir "..\..\lib\vc_dll"\r
  # PROP Intermediate_Dir "vc_mswuddll\wxscintilla"\r
  # PROP Target_Dir ""\r
-# ADD BASE CPP /nologo /FD /MDd /W1 /Od /Gm /GR /EHsc /I "..\..\src\stc\scintilla\include" /I "..\..\src\stc\scintilla\src" /Zi /Fd..\..\lib\vc_dll\wxscintillad.pdb /D "WIN32" /D "_LIB" /D "_DEBUG" /D "NDEBUG" /D "__WX__" /D "SCI_LEXER" /D "LINK_LEXERS" /c
-# ADD CPP /nologo /FD /MDd /W1 /Od /Gm /GR /EHsc /I "..\..\src\stc\scintilla\include" /I "..\..\src\stc\scintilla\src" /Zi /Fd..\..\lib\vc_dll\wxscintillad.pdb /D "WIN32" /D "_LIB" /D "_DEBUG" /D "NDEBUG" /D "__WX__" /D "SCI_LEXER" /D "LINK_LEXERS" /c
+# ADD BASE CPP /nologo /FD /MDd /W1 /Od /Gm /GR /EHsc /I "..\..\src\stc\scintilla\include" /I "..\..\src\stc\scintilla\src" /Zi /Fd..\..\lib\vc_dll\wxscintillad.pdb /D "WIN32" /D "_LIB" /D "_DEBUG" /D "NDEBUG" /D "__WX__" /D "SCI_LEXER" /D "LINK_LEXERS" /c\r
+# ADD CPP /nologo /FD /MDd /W1 /Od /Gm /GR /EHsc /I "..\..\src\stc\scintilla\include" /I "..\..\src\stc\scintilla\src" /Zi /Fd..\..\lib\vc_dll\wxscintillad.pdb /D "WIN32" /D "_LIB" /D "_DEBUG" /D "NDEBUG" /D "__WX__" /D "SCI_LEXER" /D "LINK_LEXERS" /c\r
  # ADD BASE RSC /l 0x409\r
  # ADD RSC /l 0x409\r
  BSC32=bscmake.exe\r
@@ -138,8 +138,8 @@ LIB32=link.exe -lib
  # PROP Output_Dir "..\..\lib\vc_lib"\r
  # PROP Intermediate_Dir "vc_mswunivu\wxscintilla"\r
  # PROP Target_Dir ""\r
-# ADD BASE CPP /nologo /FD /MD /W1 /O2 /GR /EHsc /I "..\..\src\stc\scintilla\include" /I "..\..\src\stc\scintilla\src" /Zi /Fd..\..\lib\vc_lib\wxscintilla.pdb /D "WIN32" /D "_LIB" /D "NDEBUG" /D "__WX__" /D "SCI_LEXER" /D "LINK_LEXERS" /c
-# ADD CPP /nologo /FD /MD /W1 /O2 /GR /EHsc /I "..\..\src\stc\scintilla\include" /I "..\..\src\stc\scintilla\src" /Zi /Fd..\..\lib\vc_lib\wxscintilla.pdb /D "WIN32" /D "_LIB" /D "NDEBUG" /D "__WX__" /D "SCI_LEXER" /D "LINK_LEXERS" /c
+# ADD BASE CPP /nologo /FD /MD /W1 /O2 /GR /EHsc /I "..\..\src\stc\scintilla\include" /I "..\..\src\stc\scintilla\src" /Zi /Fd..\..\lib\vc_lib\wxscintilla.pdb /opt:ref /opt:icf /D "WIN32" /D "_LIB" /D "NDEBUG" /D "__WX__" /D "SCI_LEXER" /D "LINK_LEXERS" /c\r
+# ADD CPP /nologo /FD /MD /W1 /O2 /GR /EHsc /I "..\..\src\stc\scintilla\include" /I "..\..\src\stc\scintilla\src" /Zi /Fd..\..\lib\vc_lib\wxscintilla.pdb /opt:ref /opt:icf /D "WIN32" /D "_LIB" /D "NDEBUG" /D "__WX__" /D "SCI_LEXER" /D "LINK_LEXERS" /c\r
  # ADD BASE RSC /l 0x409\r
  # ADD RSC /l 0x409\r
  BSC32=bscmake.exe\r
@@ -161,8 +161,8 @@ LIB32=link.exe -lib
  # PROP Output_Dir "..\..\lib\vc_lib"\r
  # PROP Intermediate_Dir "vc_mswunivud\wxscintilla"\r
  # PROP Target_Dir ""\r
-# ADD BASE CPP /nologo /FD /MDd /W1 /Od /Gm /GR /EHsc /I "..\..\src\stc\scintilla\include" /I "..\..\src\stc\scintilla\src" /Zi /Fd..\..\lib\vc_lib\wxscintillad.pdb /D "WIN32" /D "_LIB" /D "_DEBUG" /D "NDEBUG" /D "__WX__" /D "SCI_LEXER" /D "LINK_LEXERS" /c
-# ADD CPP /nologo /FD /MDd /W1 /Od /Gm /GR /EHsc /I "..\..\src\stc\scintilla\include" /I "..\..\src\stc\scintilla\src" /Zi /Fd..\..\lib\vc_lib\wxscintillad.pdb /D "WIN32" /D "_LIB" /D "_DEBUG" /D "NDEBUG" /D "__WX__" /D "SCI_LEXER" /D "LINK_LEXERS" /c
+# ADD BASE CPP /nologo /FD /MDd /W1 /Od /Gm /GR /EHsc /I "..\..\src\stc\scintilla\include" /I "..\..\src\stc\scintilla\src" /Zi /Fd..\..\lib\vc_lib\wxscintillad.pdb /D "WIN32" /D "_LIB" /D "_DEBUG" /D "NDEBUG" /D "__WX__" /D "SCI_LEXER" /D "LINK_LEXERS" /c\r
+# ADD CPP /nologo /FD /MDd /W1 /Od /Gm /GR /EHsc /I "..\..\src\stc\scintilla\include" /I "..\..\src\stc\scintilla\src" /Zi /Fd..\..\lib\vc_lib\wxscintillad.pdb /D "WIN32" /D "_LIB" /D "_DEBUG" /D "NDEBUG" /D "__WX__" /D "SCI_LEXER" /D "LINK_LEXERS" /c\r
  # ADD BASE RSC /l 0x409\r
  # ADD RSC /l 0x409\r
  BSC32=bscmake.exe\r
@@ -184,8 +184,8 @@ LIB32=link.exe -lib
  # PROP Output_Dir "..\..\lib\vc_lib"\r
  # PROP Intermediate_Dir "vc_mswu\wxscintilla"\r
  # PROP Target_Dir ""\r
-# ADD BASE CPP /nologo /FD /MD /W1 /O2 /GR /EHsc /I "..\..\src\stc\scintilla\include" /I "..\..\src\stc\scintilla\src" /Zi /Fd..\..\lib\vc_lib\wxscintilla.pdb /D "WIN32" /D "_LIB" /D "NDEBUG" /D "__WX__" /D "SCI_LEXER" /D "LINK_LEXERS" /c
-# ADD CPP /nologo /FD /MD /W1 /O2 /GR /EHsc /I "..\..\src\stc\scintilla\include" /I "..\..\src\stc\scintilla\src" /Zi /Fd..\..\lib\vc_lib\wxscintilla.pdb /D "WIN32" /D "_LIB" /D "NDEBUG" /D "__WX__" /D "SCI_LEXER" /D "LINK_LEXERS" /c
+# ADD BASE CPP /nologo /FD /MD /W1 /O2 /GR /EHsc /I "..\..\src\stc\scintilla\include" /I "..\..\src\stc\scintilla\src" /Zi /Fd..\..\lib\vc_lib\wxscintilla.pdb /opt:ref /opt:icf /D "WIN32" /D "_LIB" /D "NDEBUG" /D "__WX__" /D "SCI_LEXER" /D "LINK_LEXERS" /c\r
+# ADD CPP /nologo /FD /MD /W1 /O2 /GR /EHsc /I "..\..\src\stc\scintilla\include" /I "..\..\src\stc\scintilla\src" /Zi /Fd..\..\lib\vc_lib\wxscintilla.pdb /opt:ref /opt:icf /D "WIN32" /D "_LIB" /D "NDEBUG" /D "__WX__" /D "SCI_LEXER" /D "LINK_LEXERS" /c\r
  # ADD BASE RSC /l 0x409\r
  # ADD RSC /l 0x409\r
  BSC32=bscmake.exe\r
@@ -207,8 +207,8 @@ LIB32=link.exe -lib
  # PROP Output_Dir "..\..\lib\vc_lib"\r
  # PROP Intermediate_Dir "vc_mswud\wxscintilla"\r
  # PROP Target_Dir ""\r
-# ADD BASE CPP /nologo /FD /MDd /W1 /Od /Gm /GR /EHsc /I "..\..\src\stc\scintilla\include" /I "..\..\src\stc\scintilla\src" /Zi /Fd..\..\lib\vc_lib\wxscintillad.pdb /D "WIN32" /D "_LIB" /D "_DEBUG" /D "NDEBUG" /D "__WX__" /D "SCI_LEXER" /D "LINK_LEXERS" /c
-# ADD CPP /nologo /FD /MDd /W1 /Od /Gm /GR /EHsc /I "..\..\src\stc\scintilla\include" /I "..\..\src\stc\scintilla\src" /Zi /Fd..\..\lib\vc_lib\wxscintillad.pdb /D "WIN32" /D "_LIB" /D "_DEBUG" /D "NDEBUG" /D "__WX__" /D "SCI_LEXER" /D "LINK_LEXERS" /c
+# ADD BASE CPP /nologo /FD /MDd /W1 /Od /Gm /GR /EHsc /I "..\..\src\stc\scintilla\include" /I "..\..\src\stc\scintilla\src" /Zi /Fd..\..\lib\vc_lib\wxscintillad.pdb /D "WIN32" /D "_LIB" /D "_DEBUG" /D "NDEBUG" /D "__WX__" /D "SCI_LEXER" /D "LINK_LEXERS" /c\r
+# ADD CPP /nologo /FD /MDd /W1 /Od /Gm /GR /EHsc /I "..\..\src\stc\scintilla\include" /I "..\..\src\stc\scintilla\src" /Zi /Fd..\..\lib\vc_lib\wxscintillad.pdb /D "WIN32" /D "_LIB" /D "_DEBUG" /D "NDEBUG" /D "__WX__" /D "SCI_LEXER" /D "LINK_LEXERS" /c\r
  # ADD BASE RSC /l 0x409\r
  # ADD RSC /l 0x409\r
  BSC32=bscmake.exe\r
diff --git a/build/msw/wx_wxtiff.dsp b/build/msw/wx_wxtiff.dsp

index 9cbef2c45efa5e850a84ca9111fb0721ee5dee60..4f700dbd1ce638720648533fad1aa91c58d8d5ff 100644 (file)
--- a/build/msw/wx_wxtiff.dsp
+++ b/build/msw/wx_wxtiff.dsp
@@ -46,8 +46,8 @@ RSC=rc.exe
  # PROP Output_Dir "..\..\lib\vc_dll"\r
  # PROP Intermediate_Dir "vc_mswunivudll\wxtiff"\r
  # PROP Target_Dir ""\r
-# ADD BASE CPP /nologo /FD /MD /W1 /O2 /GR /EHsc /Zi /Fd..\..\lib\vc_dll\wxtiff.pdb /I "..\..\src\zlib" /I "..\..\src\jpeg" /I "..\..\src\tiff\libtiff" /D "WIN32" /D "_LIB" /D "NDEBUG" /c
-# ADD CPP /nologo /FD /MD /W1 /O2 /GR /EHsc /Zi /Fd..\..\lib\vc_dll\wxtiff.pdb /I "..\..\src\zlib" /I "..\..\src\jpeg" /I "..\..\src\tiff\libtiff" /D "WIN32" /D "_LIB" /D "NDEBUG" /c
+# ADD BASE CPP /nologo /FD /MD /W1 /O2 /GR /EHsc /Zi /Fd..\..\lib\vc_dll\wxtiff.pdb /opt:ref /opt:icf /I "..\..\src\zlib" /I "..\..\src\jpeg" /I "..\..\src\tiff\libtiff" /D "WIN32" /D "_LIB" /D "NDEBUG" /c\r
+# ADD CPP /nologo /FD /MD /W1 /O2 /GR /EHsc /Zi /Fd..\..\lib\vc_dll\wxtiff.pdb /opt:ref /opt:icf /I "..\..\src\zlib" /I "..\..\src\jpeg" /I "..\..\src\tiff\libtiff" /D "WIN32" /D "_LIB" /D "NDEBUG" /c\r
  # ADD BASE RSC /l 0x409\r
  # ADD RSC /l 0x409\r
  BSC32=bscmake.exe\r
@@ -69,8 +69,8 @@ LIB32=link.exe -lib
  # PROP Output_Dir "..\..\lib\vc_dll"\r
  # PROP Intermediate_Dir "vc_mswunivuddll\wxtiff"\r
  # PROP Target_Dir ""\r
-# ADD BASE CPP /nologo /FD /MDd /W1 /Od /Gm /GR /EHsc /Zi /Fd..\..\lib\vc_dll\wxtiffd.pdb /I "..\..\src\zlib" /I "..\..\src\jpeg" /I "..\..\src\tiff\libtiff" /D "WIN32" /D "_LIB" /D "_DEBUG" /D "NDEBUG" /c
-# ADD CPP /nologo /FD /MDd /W1 /Od /Gm /GR /EHsc /Zi /Fd..\..\lib\vc_dll\wxtiffd.pdb /I "..\..\src\zlib" /I "..\..\src\jpeg" /I "..\..\src\tiff\libtiff" /D "WIN32" /D "_LIB" /D "_DEBUG" /D "NDEBUG" /c
+# ADD BASE CPP /nologo /FD /MDd /W1 /Od /Gm /GR /EHsc /Zi /Fd..\..\lib\vc_dll\wxtiffd.pdb /I "..\..\src\zlib" /I "..\..\src\jpeg" /I "..\..\src\tiff\libtiff" /D "WIN32" /D "_LIB" /D "_DEBUG" /D "NDEBUG" /c\r
+# ADD CPP /nologo /FD /MDd /W1 /Od /Gm /GR /EHsc /Zi /Fd..\..\lib\vc_dll\wxtiffd.pdb /I "..\..\src\zlib" /I "..\..\src\jpeg" /I "..\..\src\tiff\libtiff" /D "WIN32" /D "_LIB" /D "_DEBUG" /D "NDEBUG" /c\r
  # ADD BASE RSC /l 0x409\r
  # ADD RSC /l 0x409\r
  BSC32=bscmake.exe\r
@@ -92,8 +92,8 @@ LIB32=link.exe -lib
  # PROP Output_Dir "..\..\lib\vc_dll"\r
  # PROP Intermediate_Dir "vc_mswudll\wxtiff"\r
  # PROP Target_Dir ""\r
-# ADD BASE CPP /nologo /FD /MD /W1 /O2 /GR /EHsc /Zi /Fd..\..\lib\vc_dll\wxtiff.pdb /I "..\..\src\zlib" /I "..\..\src\jpeg" /I "..\..\src\tiff\libtiff" /D "WIN32" /D "_LIB" /D "NDEBUG" /c
-# ADD CPP /nologo /FD /MD /W1 /O2 /GR /EHsc /Zi /Fd..\..\lib\vc_dll\wxtiff.pdb /I "..\..\src\zlib" /I "..\..\src\jpeg" /I "..\..\src\tiff\libtiff" /D "WIN32" /D "_LIB" /D "NDEBUG" /c
+# ADD BASE CPP /nologo /FD /MD /W1 /O2 /GR /EHsc /Zi /Fd..\..\lib\vc_dll\wxtiff.pdb /opt:ref /opt:icf /I "..\..\src\zlib" /I "..\..\src\jpeg" /I "..\..\src\tiff\libtiff" /D "WIN32" /D "_LIB" /D "NDEBUG" /c\r
+# ADD CPP /nologo /FD /MD /W1 /O2 /GR /EHsc /Zi /Fd..\..\lib\vc_dll\wxtiff.pdb /opt:ref /opt:icf /I "..\..\src\zlib" /I "..\..\src\jpeg" /I "..\..\src\tiff\libtiff" /D "WIN32" /D "_LIB" /D "NDEBUG" /c\r
  # ADD BASE RSC /l 0x409\r
  # ADD RSC /l 0x409\r
  BSC32=bscmake.exe\r
@@ -115,8 +115,8 @@ LIB32=link.exe -lib
  # PROP Output_Dir "..\..\lib\vc_dll"\r
  # PROP Intermediate_Dir "vc_mswuddll\wxtiff"\r
  # PROP Target_Dir ""\r
-# ADD BASE CPP /nologo /FD /MDd /W1 /Od /Gm /GR /EHsc /Zi /Fd..\..\lib\vc_dll\wxtiffd.pdb /I "..\..\src\zlib" /I "..\..\src\jpeg" /I "..\..\src\tiff\libtiff" /D "WIN32" /D "_LIB" /D "_DEBUG" /D "NDEBUG" /c
-# ADD CPP /nologo /FD /MDd /W1 /Od /Gm /GR /EHsc /Zi /Fd..\..\lib\vc_dll\wxtiffd.pdb /I "..\..\src\zlib" /I "..\..\src\jpeg" /I "..\..\src\tiff\libtiff" /D "WIN32" /D "_LIB" /D "_DEBUG" /D "NDEBUG" /c
+# ADD BASE CPP /nologo /FD /MDd /W1 /Od /Gm /GR /EHsc /Zi /Fd..\..\lib\vc_dll\wxtiffd.pdb /I "..\..\src\zlib" /I "..\..\src\jpeg" /I "..\..\src\tiff\libtiff" /D "WIN32" /D "_LIB" /D "_DEBUG" /D "NDEBUG" /c\r
+# ADD CPP /nologo /FD /MDd /W1 /Od /Gm /GR /EHsc /Zi /Fd..\..\lib\vc_dll\wxtiffd.pdb /I "..\..\src\zlib" /I "..\..\src\jpeg" /I "..\..\src\tiff\libtiff" /D "WIN32" /D "_LIB" /D "_DEBUG" /D "NDEBUG" /c\r
  # ADD BASE RSC /l 0x409\r
  # ADD RSC /l 0x409\r
  BSC32=bscmake.exe\r
@@ -138,8 +138,8 @@ LIB32=link.exe -lib
  # PROP Output_Dir "..\..\lib\vc_lib"\r
  # PROP Intermediate_Dir "vc_mswunivu\wxtiff"\r
  # PROP Target_Dir ""\r
-# ADD BASE CPP /nologo /FD /MD /W1 /O2 /GR /EHsc /Zi /Fd..\..\lib\vc_lib\wxtiff.pdb /I "..\..\src\zlib" /I "..\..\src\jpeg" /I "..\..\src\tiff\libtiff" /D "WIN32" /D "_LIB" /D "NDEBUG" /c
-# ADD CPP /nologo /FD /MD /W1 /O2 /GR /EHsc /Zi /Fd..\..\lib\vc_lib\wxtiff.pdb /I "..\..\src\zlib" /I "..\..\src\jpeg" /I "..\..\src\tiff\libtiff" /D "WIN32" /D "_LIB" /D "NDEBUG" /c
+# ADD BASE CPP /nologo /FD /MD /W1 /O2 /GR /EHsc /Zi /Fd..\..\lib\vc_lib\wxtiff.pdb /opt:ref /opt:icf /I "..\..\src\zlib" /I "..\..\src\jpeg" /I "..\..\src\tiff\libtiff" /D "WIN32" /D "_LIB" /D "NDEBUG" /c\r
+# ADD CPP /nologo /FD /MD /W1 /O2 /GR /EHsc /Zi /Fd..\..\lib\vc_lib\wxtiff.pdb /opt:ref /opt:icf /I "..\..\src\zlib" /I "..\..\src\jpeg" /I "..\..\src\tiff\libtiff" /D "WIN32" /D "_LIB" /D "NDEBUG" /c\r
  # ADD BASE RSC /l 0x409\r
  # ADD RSC /l 0x409\r
  BSC32=bscmake.exe\r
@@ -161,8 +161,8 @@ LIB32=link.exe -lib
  # PROP Output_Dir "..\..\lib\vc_lib"\r
  # PROP Intermediate_Dir "vc_mswunivud\wxtiff"\r
  # PROP Target_Dir ""\r
-# ADD BASE CPP /nologo /FD /MDd /W1 /Od /Gm /GR /EHsc /Zi /Fd..\..\lib\vc_lib\wxtiffd.pdb /I "..\..\src\zlib" /I "..\..\src\jpeg" /I "..\..\src\tiff\libtiff" /D "WIN32" /D "_LIB" /D "_DEBUG" /D "NDEBUG" /c
-# ADD CPP /nologo /FD /MDd /W1 /Od /Gm /GR /EHsc /Zi /Fd..\..\lib\vc_lib\wxtiffd.pdb /I "..\..\src\zlib" /I "..\..\src\jpeg" /I "..\..\src\tiff\libtiff" /D "WIN32" /D "_LIB" /D "_DEBUG" /D "NDEBUG" /c
+# ADD BASE CPP /nologo /FD /MDd /W1 /Od /Gm /GR /EHsc /Zi /Fd..\..\lib\vc_lib\wxtiffd.pdb /I "..\..\src\zlib" /I "..\..\src\jpeg" /I "..\..\src\tiff\libtiff" /D "WIN32" /D "_LIB" /D "_DEBUG" /D "NDEBUG" /c\r
+# ADD CPP /nologo /FD /MDd /W1 /Od /Gm /GR /EHsc /Zi /Fd..\..\lib\vc_lib\wxtiffd.pdb /I "..\..\src\zlib" /I "..\..\src\jpeg" /I "..\..\src\tiff\libtiff" /D "WIN32" /D "_LIB" /D "_DEBUG" /D "NDEBUG" /c\r
  # ADD BASE RSC /l 0x409\r
  # ADD RSC /l 0x409\r
  BSC32=bscmake.exe\r
@@ -184,8 +184,8 @@ LIB32=link.exe -lib
  # PROP Output_Dir "..\..\lib\vc_lib"\r
  # PROP Intermediate_Dir "vc_mswu\wxtiff"\r
  # PROP Target_Dir ""\r
-# ADD BASE CPP /nologo /FD /MD /W1 /O2 /GR /EHsc /Zi /Fd..\..\lib\vc_lib\wxtiff.pdb /I "..\..\src\zlib" /I "..\..\src\jpeg" /I "..\..\src\tiff\libtiff" /D "WIN32" /D "_LIB" /D "NDEBUG" /c
-# ADD CPP /nologo /FD /MD /W1 /O2 /GR /EHsc /Zi /Fd..\..\lib\vc_lib\wxtiff.pdb /I "..\..\src\zlib" /I "..\..\src\jpeg" /I "..\..\src\tiff\libtiff" /D "WIN32" /D "_LIB" /D "NDEBUG" /c
+# ADD BASE CPP /nologo /FD /MD /W1 /O2 /GR /EHsc /Zi /Fd..\..\lib\vc_lib\wxtiff.pdb /opt:ref /opt:icf /I "..\..\src\zlib" /I "..\..\src\jpeg" /I "..\..\src\tiff\libtiff" /D "WIN32" /D "_LIB" /D "NDEBUG" /c\r
+# ADD CPP /nologo /FD /MD /W1 /O2 /GR /EHsc /Zi /Fd..\..\lib\vc_lib\wxtiff.pdb /opt:ref /opt:icf /I "..\..\src\zlib" /I "..\..\src\jpeg" /I "..\..\src\tiff\libtiff" /D "WIN32" /D "_LIB" /D "NDEBUG" /c\r
  # ADD BASE RSC /l 0x409\r
  # ADD RSC /l 0x409\r
  BSC32=bscmake.exe\r
@@ -207,8 +207,8 @@ LIB32=link.exe -lib
  # PROP Output_Dir "..\..\lib\vc_lib"\r
  # PROP Intermediate_Dir "vc_mswud\wxtiff"\r
  # PROP Target_Dir ""\r
-# ADD BASE CPP /nologo /FD /MDd /W1 /Od /Gm /GR /EHsc /Zi /Fd..\..\lib\vc_lib\wxtiffd.pdb /I "..\..\src\zlib" /I "..\..\src\jpeg" /I "..\..\src\tiff\libtiff" /D "WIN32" /D "_LIB" /D "_DEBUG" /D "NDEBUG" /c
-# ADD CPP /nologo /FD /MDd /W1 /Od /Gm /GR /EHsc /Zi /Fd..\..\lib\vc_lib\wxtiffd.pdb /I "..\..\src\zlib" /I "..\..\src\jpeg" /I "..\..\src\tiff\libtiff" /D "WIN32" /D "_LIB" /D "_DEBUG" /D "NDEBUG" /c
+# ADD BASE CPP /nologo /FD /MDd /W1 /Od /Gm /GR /EHsc /Zi /Fd..\..\lib\vc_lib\wxtiffd.pdb /I "..\..\src\zlib" /I "..\..\src\jpeg" /I "..\..\src\tiff\libtiff" /D "WIN32" /D "_LIB" /D "_DEBUG" /D "NDEBUG" /c\r
+# ADD CPP /nologo /FD /MDd /W1 /Od /Gm /GR /EHsc /Zi /Fd..\..\lib\vc_lib\wxtiffd.pdb /I "..\..\src\zlib" /I "..\..\src\jpeg" /I "..\..\src\tiff\libtiff" /D "WIN32" /D "_LIB" /D "_DEBUG" /D "NDEBUG" /c\r
  # ADD BASE RSC /l 0x409\r
  # ADD RSC /l 0x409\r
  BSC32=bscmake.exe\r
diff --git a/build/msw/wx_wxzlib.dsp b/build/msw/wx_wxzlib.dsp

index e0cad9c633af9676594b3ae72e3daf6017373ec3..c8ba9212c89624b2f822dfed1c912b2cdcacdd65 100644 (file)
--- a/build/msw/wx_wxzlib.dsp
+++ b/build/msw/wx_wxzlib.dsp
@@ -46,8 +46,8 @@ RSC=rc.exe
  # PROP Output_Dir "..\..\lib\vc_dll"\r
  # PROP Intermediate_Dir "vc_mswunivudll\wxzlib"\r
  # PROP Target_Dir ""\r
-# ADD BASE CPP /nologo /FD /MD /W1 /O2 /GR /EHsc /Zi /Fd..\..\lib\vc_dll\wxzlib.pdb /D "WIN32" /D "_LIB" /D "NDEBUG" /c
-# ADD CPP /nologo /FD /MD /W1 /O2 /GR /EHsc /Zi /Fd..\..\lib\vc_dll\wxzlib.pdb /D "WIN32" /D "_LIB" /D "NDEBUG" /c
+# ADD BASE CPP /nologo /FD /MD /W1 /O2 /GR /EHsc /Zi /Fd..\..\lib\vc_dll\wxzlib.pdb /opt:ref /opt:icf /D "WIN32" /D "_LIB" /D "NDEBUG" /c\r
+# ADD CPP /nologo /FD /MD /W1 /O2 /GR /EHsc /Zi /Fd..\..\lib\vc_dll\wxzlib.pdb /opt:ref /opt:icf /D "WIN32" /D "_LIB" /D "NDEBUG" /c\r
  # ADD BASE RSC /l 0x409\r
  # ADD RSC /l 0x409\r
  BSC32=bscmake.exe\r
@@ -69,8 +69,8 @@ LIB32=link.exe -lib
  # PROP Output_Dir "..\..\lib\vc_dll"\r
  # PROP Intermediate_Dir "vc_mswunivuddll\wxzlib"\r
  # PROP Target_Dir ""\r
-# ADD BASE CPP /nologo /FD /MDd /W1 /Od /Gm /GR /EHsc /Zi /Fd..\..\lib\vc_dll\wxzlibd.pdb /D "WIN32" /D "_LIB" /D "_DEBUG" /D "NDEBUG" /c
-# ADD CPP /nologo /FD /MDd /W1 /Od /Gm /GR /EHsc /Zi /Fd..\..\lib\vc_dll\wxzlibd.pdb /D "WIN32" /D "_LIB" /D "_DEBUG" /D "NDEBUG" /c
+# ADD BASE CPP /nologo /FD /MDd /W1 /Od /Gm /GR /EHsc /Zi /Fd..\..\lib\vc_dll\wxzlibd.pdb /D "WIN32" /D "_LIB" /D "_DEBUG" /D "NDEBUG" /c\r
+# ADD CPP /nologo /FD /MDd /W1 /Od /Gm /GR /EHsc /Zi /Fd..\..\lib\vc_dll\wxzlibd.pdb /D "WIN32" /D "_LIB" /D "_DEBUG" /D "NDEBUG" /c\r
  # ADD BASE RSC /l 0x409\r
  # ADD RSC /l 0x409\r
  BSC32=bscmake.exe\r
@@ -92,8 +92,8 @@ LIB32=link.exe -lib
  # PROP Output_Dir "..\..\lib\vc_dll"\r
  # PROP Intermediate_Dir "vc_mswudll\wxzlib"\r
  # PROP Target_Dir ""\r
-# ADD BASE CPP /nologo /FD /MD /W1 /O2 /GR /EHsc /Zi /Fd..\..\lib\vc_dll\wxzlib.pdb /D "WIN32" /D "_LIB" /D "NDEBUG" /c
-# ADD CPP /nologo /FD /MD /W1 /O2 /GR /EHsc /Zi /Fd..\..\lib\vc_dll\wxzlib.pdb /D "WIN32" /D "_LIB" /D "NDEBUG" /c
+# ADD BASE CPP /nologo /FD /MD /W1 /O2 /GR /EHsc /Zi /Fd..\..\lib\vc_dll\wxzlib.pdb /opt:ref /opt:icf /D "WIN32" /D "_LIB" /D "NDEBUG" /c\r
+# ADD CPP /nologo /FD /MD /W1 /O2 /GR /EHsc /Zi /Fd..\..\lib\vc_dll\wxzlib.pdb /opt:ref /opt:icf /D "WIN32" /D "_LIB" /D "NDEBUG" /c\r
  # ADD BASE RSC /l 0x409\r
  # ADD RSC /l 0x409\r
  BSC32=bscmake.exe\r
@@ -115,8 +115,8 @@ LIB32=link.exe -lib
  # PROP Output_Dir "..\..\lib\vc_dll"\r
  # PROP Intermediate_Dir "vc_mswuddll\wxzlib"\r
  # PROP Target_Dir ""\r
-# ADD BASE CPP /nologo /FD /MDd /W1 /Od /Gm /GR /EHsc /Zi /Fd..\..\lib\vc_dll\wxzlibd.pdb /D "WIN32" /D "_LIB" /D "_DEBUG" /D "NDEBUG" /c
-# ADD CPP /nologo /FD /MDd /W1 /Od /Gm /GR /EHsc /Zi /Fd..\..\lib\vc_dll\wxzlibd.pdb /D "WIN32" /D "_LIB" /D "_DEBUG" /D "NDEBUG" /c
+# ADD BASE CPP /nologo /FD /MDd /W1 /Od /Gm /GR /EHsc /Zi /Fd..\..\lib\vc_dll\wxzlibd.pdb /D "WIN32" /D "_LIB" /D "_DEBUG" /D "NDEBUG" /c\r
+# ADD CPP /nologo /FD /MDd /W1 /Od /Gm /GR /EHsc /Zi /Fd..\..\lib\vc_dll\wxzlibd.pdb /D "WIN32" /D "_LIB" /D "_DEBUG" /D "NDEBUG" /c\r
  # ADD BASE RSC /l 0x409\r
  # ADD RSC /l 0x409\r
  BSC32=bscmake.exe\r
@@ -138,8 +138,8 @@ LIB32=link.exe -lib
  # PROP Output_Dir "..\..\lib\vc_lib"\r
  # PROP Intermediate_Dir "vc_mswunivu\wxzlib"\r
  # PROP Target_Dir ""\r
-# ADD BASE CPP /nologo /FD /MD /W1 /O2 /GR /EHsc /Zi /Fd..\..\lib\vc_lib\wxzlib.pdb /D "WIN32" /D "_LIB" /D "NDEBUG" /c
-# ADD CPP /nologo /FD /MD /W1 /O2 /GR /EHsc /Zi /Fd..\..\lib\vc_lib\wxzlib.pdb /D "WIN32" /D "_LIB" /D "NDEBUG" /c
+# ADD BASE CPP /nologo /FD /MD /W1 /O2 /GR /EHsc /Zi /Fd..\..\lib\vc_lib\wxzlib.pdb /opt:ref /opt:icf /D "WIN32" /D "_LIB" /D "NDEBUG" /c\r
+# ADD CPP /nologo /FD /MD /W1 /O2 /GR /EHsc /Zi /Fd..\..\lib\vc_lib\wxzlib.pdb /opt:ref /opt:icf /D "WIN32" /D "_LIB" /D "NDEBUG" /c\r
  # ADD BASE RSC /l 0x409\r
  # ADD RSC /l 0x409\r
  BSC32=bscmake.exe\r
@@ -161,8 +161,8 @@ LIB32=link.exe -lib
  # PROP Output_Dir "..\..\lib\vc_lib"\r
  # PROP Intermediate_Dir "vc_mswunivud\wxzlib"\r
  # PROP Target_Dir ""\r
-# ADD BASE CPP /nologo /FD /MDd /W1 /Od /Gm /GR /EHsc /Zi /Fd..\..\lib\vc_lib\wxzlibd.pdb /D "WIN32" /D "_LIB" /D "_DEBUG" /D "NDEBUG" /c
-# ADD CPP /nologo /FD /MDd /W1 /Od /Gm /GR /EHsc /Zi /Fd..\..\lib\vc_lib\wxzlibd.pdb /D "WIN32" /D "_LIB" /D "_DEBUG" /D "NDEBUG" /c
+# ADD BASE CPP /nologo /FD /MDd /W1 /Od /Gm /GR /EHsc /Zi /Fd..\..\lib\vc_lib\wxzlibd.pdb /D "WIN32" /D "_LIB" /D "_DEBUG" /D "NDEBUG" /c\r
+# ADD CPP /nologo /FD /MDd /W1 /Od /Gm /GR /EHsc /Zi /Fd..\..\lib\vc_lib\wxzlibd.pdb /D "WIN32" /D "_LIB" /D "_DEBUG" /D "NDEBUG" /c\r
  # ADD BASE RSC /l 0x409\r
  # ADD RSC /l 0x409\r
  BSC32=bscmake.exe\r
@@ -184,8 +184,8 @@ LIB32=link.exe -lib
  # PROP Output_Dir "..\..\lib\vc_lib"\r
  # PROP Intermediate_Dir "vc_mswu\wxzlib"\r
  # PROP Target_Dir ""\r
-# ADD BASE CPP /nologo /FD /MD /W1 /O2 /GR /EHsc /Zi /Fd..\..\lib\vc_lib\wxzlib.pdb /D "WIN32" /D "_LIB" /D "NDEBUG" /c
-# ADD CPP /nologo /FD /MD /W1 /O2 /GR /EHsc /Zi /Fd..\..\lib\vc_lib\wxzlib.pdb /D "WIN32" /D "_LIB" /D "NDEBUG" /c
+# ADD BASE CPP /nologo /FD /MD /W1 /O2 /GR /EHsc /Zi /Fd..\..\lib\vc_lib\wxzlib.pdb /opt:ref /opt:icf /D "WIN32" /D "_LIB" /D "NDEBUG" /c\r
+# ADD CPP /nologo /FD /MD /W1 /O2 /GR /EHsc /Zi /Fd..\..\lib\vc_lib\wxzlib.pdb /opt:ref /opt:icf /D "WIN32" /D "_LIB" /D "NDEBUG" /c\r
  # ADD BASE RSC /l 0x409\r
  # ADD RSC /l 0x409\r
  BSC32=bscmake.exe\r
@@ -207,8 +207,8 @@ LIB32=link.exe -lib
  # PROP Output_Dir "..\..\lib\vc_lib"\r
  # PROP Intermediate_Dir "vc_mswud\wxzlib"\r
  # PROP Target_Dir ""\r
-# ADD BASE CPP /nologo /FD /MDd /W1 /Od /Gm /GR /EHsc /Zi /Fd..\..\lib\vc_lib\wxzlibd.pdb /D "WIN32" /D "_LIB" /D "_DEBUG" /D "NDEBUG" /c
-# ADD CPP /nologo /FD /MDd /W1 /Od /Gm /GR /EHsc /Zi /Fd..\..\lib\vc_lib\wxzlibd.pdb /D "WIN32" /D "_LIB" /D "_DEBUG" /D "NDEBUG" /c
+# ADD BASE CPP /nologo /FD /MDd /W1 /Od /Gm /GR /EHsc /Zi /Fd..\..\lib\vc_lib\wxzlibd.pdb /D "WIN32" /D "_LIB" /D "_DEBUG" /D "NDEBUG" /c\r
+# ADD CPP /nologo /FD /MDd /W1 /Od /Gm /GR /EHsc /Zi /Fd..\..\lib\vc_lib\wxzlibd.pdb /D "WIN32" /D "_LIB" /D "_DEBUG" /D "NDEBUG" /c\r
  # ADD BASE RSC /l 0x409\r
  # ADD RSC /l 0x409\r
  BSC32=bscmake.exe\r
diff --git a/build/msw/wx_xml.dsp b/build/msw/wx_xml.dsp

index 305d603a93323ac2b017c9cf06cb7b7ba1dab626..fe603196c88578b10aef6bb5e1008e39bd8bff76 100644 (file)
--- a/build/msw/wx_xml.dsp
+++ b/build/msw/wx_xml.dsp
@@ -47,8 +47,8 @@ RSC=rc.exe
  # PROP Output_Dir "..\..\lib\vc_dll"\r
  # PROP Intermediate_Dir "vc_mswunivudll\xml"\r
  # PROP Target_Dir ""\r
-# ADD BASE CPP /nologo /FD /MD /O2 /GR /EHsc /I "..\..\lib\vc_dll\mswunivu" /I "..\..\include" /W4 /Yu"wx/wxprec.h" /Fp"vc_mswunivudll\wxprec_xmldll.pch" /Zi /Fd..\..\lib\vc_dll\wxbase291u_xml_vc_custom.pdb /I "..\..\src\tiff\libtiff" /I "..\..\src\jpeg" /I "..\..\src\png" /I "..\..\src\zlib" /I "..\..\src\regex" /I "..\..\src\expat\lib" /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "WXBUILDING" /D wxUSE_GUI=0 /D "WXUSINGDLL" /D "WXMAKINGDLL_XML" /c\r
-# ADD CPP /nologo /FD /MD /O2 /GR /EHsc /I "..\..\lib\vc_dll\mswunivu" /I "..\..\include" /W4 /Yu"wx/wxprec.h" /Fp"vc_mswunivudll\wxprec_xmldll.pch" /Zi /Fd..\..\lib\vc_dll\wxbase291u_xml_vc_custom.pdb /I "..\..\src\tiff\libtiff" /I "..\..\src\jpeg" /I "..\..\src\png" /I "..\..\src\zlib" /I "..\..\src\regex" /I "..\..\src\expat\lib" /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "WXBUILDING" /D wxUSE_GUI=0 /D "WXUSINGDLL" /D "WXMAKINGDLL_XML" /c\r
+# ADD BASE CPP /nologo /FD /MD /O2 /GR /EHsc /I "..\..\lib\vc_dll\mswunivu" /I "..\..\include" /W4 /Yu"wx/wxprec.h" /Fp"vc_mswunivudll\wxprec_xmldll.pch" /Zi /Fd..\..\lib\vc_dll\wxbase291u_xml_vc_custom.pdb /opt:ref /opt:icf /I "..\..\src\tiff\libtiff" /I "..\..\src\jpeg" /I "..\..\src\png" /I "..\..\src\zlib" /I "..\..\src\regex" /I "..\..\src\expat\lib" /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "WXBUILDING" /D wxUSE_GUI=0 /D "WXUSINGDLL" /D "WXMAKINGDLL_XML" /c\r
+# ADD CPP /nologo /FD /MD /O2 /GR /EHsc /I "..\..\lib\vc_dll\mswunivu" /I "..\..\include" /W4 /Yu"wx/wxprec.h" /Fp"vc_mswunivudll\wxprec_xmldll.pch" /Zi /Fd..\..\lib\vc_dll\wxbase291u_xml_vc_custom.pdb /opt:ref /opt:icf /I "..\..\src\tiff\libtiff" /I "..\..\src\jpeg" /I "..\..\src\png" /I "..\..\src\zlib" /I "..\..\src\regex" /I "..\..\src\expat\lib" /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "WXBUILDING" /D wxUSE_GUI=0 /D "WXUSINGDLL" /D "WXMAKINGDLL_XML" /c\r
  # ADD BASE MTL /nologo /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "WXBUILDING" /D wxUSE_GUI=0 /D "WXUSINGDLL" /D "WXMAKINGDLL_XML" /mktyplib203 /win32\r
  # ADD MTL /nologo /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "WXBUILDING" /D wxUSE_GUI=0 /D "WXUSINGDLL" /D "WXMAKINGDLL_XML" /mktyplib203 /win32\r
  # ADD BASE RSC /l 0x409 /d "__WXMSW__" /d "__WXUNIVERSAL__" /d "_UNICODE" /i "..\..\lib\vc_dll\mswunivu" /i "..\..\include" /d "WXBUILDING" /d WXDLLNAME=wxbase291u_xml_vc_custom /i "..\..\src\tiff\libtiff" /i "..\..\src\jpeg" /i "..\..\src\png" /i "..\..\src\zlib" /i "..\..\src\regex" /i "..\..\src\expat\lib" /d wxUSE_GUI=0 /d "WXUSINGDLL" /d WXMAKINGDLL_XML\r
@@ -97,8 +97,8 @@ LINK32=link.exe
  # PROP Output_Dir "..\..\lib\vc_dll"\r
  # PROP Intermediate_Dir "vc_mswudll\xml"\r
  # PROP Target_Dir ""\r
-# ADD BASE CPP /nologo /FD /MD /O2 /GR /EHsc /I "..\..\lib\vc_dll\mswu" /I "..\..\include" /W4 /Yu"wx/wxprec.h" /Fp"vc_mswudll\wxprec_xmldll.pch" /Zi /Fd..\..\lib\vc_dll\wxbase291u_xml_vc_custom.pdb /I "..\..\src\tiff\libtiff" /I "..\..\src\jpeg" /I "..\..\src\png" /I "..\..\src\zlib" /I "..\..\src\regex" /I "..\..\src\expat\lib" /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "__WXMSW__" /D "_UNICODE" /D "WXBUILDING" /D wxUSE_GUI=0 /D "WXUSINGDLL" /D "WXMAKINGDLL_XML" /c\r
-# ADD CPP /nologo /FD /MD /O2 /GR /EHsc /I "..\..\lib\vc_dll\mswu" /I "..\..\include" /W4 /Yu"wx/wxprec.h" /Fp"vc_mswudll\wxprec_xmldll.pch" /Zi /Fd..\..\lib\vc_dll\wxbase291u_xml_vc_custom.pdb /I "..\..\src\tiff\libtiff" /I "..\..\src\jpeg" /I "..\..\src\png" /I "..\..\src\zlib" /I "..\..\src\regex" /I "..\..\src\expat\lib" /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "__WXMSW__" /D "_UNICODE" /D "WXBUILDING" /D wxUSE_GUI=0 /D "WXUSINGDLL" /D "WXMAKINGDLL_XML" /c\r
+# ADD BASE CPP /nologo /FD /MD /O2 /GR /EHsc /I "..\..\lib\vc_dll\mswu" /I "..\..\include" /W4 /Yu"wx/wxprec.h" /Fp"vc_mswudll\wxprec_xmldll.pch" /Zi /Fd..\..\lib\vc_dll\wxbase291u_xml_vc_custom.pdb /opt:ref /opt:icf /I "..\..\src\tiff\libtiff" /I "..\..\src\jpeg" /I "..\..\src\png" /I "..\..\src\zlib" /I "..\..\src\regex" /I "..\..\src\expat\lib" /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "__WXMSW__" /D "_UNICODE" /D "WXBUILDING" /D wxUSE_GUI=0 /D "WXUSINGDLL" /D "WXMAKINGDLL_XML" /c\r
+# ADD CPP /nologo /FD /MD /O2 /GR /EHsc /I "..\..\lib\vc_dll\mswu" /I "..\..\include" /W4 /Yu"wx/wxprec.h" /Fp"vc_mswudll\wxprec_xmldll.pch" /Zi /Fd..\..\lib\vc_dll\wxbase291u_xml_vc_custom.pdb /opt:ref /opt:icf /I "..\..\src\tiff\libtiff" /I "..\..\src\jpeg" /I "..\..\src\png" /I "..\..\src\zlib" /I "..\..\src\regex" /I "..\..\src\expat\lib" /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "__WXMSW__" /D "_UNICODE" /D "WXBUILDING" /D wxUSE_GUI=0 /D "WXUSINGDLL" /D "WXMAKINGDLL_XML" /c\r
  # ADD BASE MTL /nologo /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "__WXMSW__" /D "_UNICODE" /D "WXBUILDING" /D wxUSE_GUI=0 /D "WXUSINGDLL" /D "WXMAKINGDLL_XML" /mktyplib203 /win32\r
  # ADD MTL /nologo /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "__WXMSW__" /D "_UNICODE" /D "WXBUILDING" /D wxUSE_GUI=0 /D "WXUSINGDLL" /D "WXMAKINGDLL_XML" /mktyplib203 /win32\r
  # ADD BASE RSC /l 0x409 /d "__WXMSW__" /d "_UNICODE" /i "..\..\lib\vc_dll\mswu" /i "..\..\include" /d "WXBUILDING" /d WXDLLNAME=wxbase291u_xml_vc_custom /i "..\..\src\tiff\libtiff" /i "..\..\src\jpeg" /i "..\..\src\png" /i "..\..\src\zlib" /i "..\..\src\regex" /i "..\..\src\expat\lib" /d wxUSE_GUI=0 /d "WXUSINGDLL" /d WXMAKINGDLL_XML\r
@@ -147,8 +147,8 @@ LINK32=link.exe
  # PROP Output_Dir "..\..\lib\vc_lib"\r
  # PROP Intermediate_Dir "vc_mswunivu\xml"\r
  # PROP Target_Dir ""\r
-# ADD BASE CPP /nologo /FD /MD /O2 /GR /EHsc /I "..\..\lib\vc_lib\mswunivu" /I "..\..\include" /W4 /Zi /Fd..\..\lib\vc_lib\wxbase29u_xml.pdb /Yu"wx/wxprec.h" /Fp"vc_mswunivu\wxprec_xmllib.pch" /I "..\..\src\tiff\libtiff" /I "..\..\src\jpeg" /I "..\..\src\png" /I "..\..\src\zlib" /I "..\..\src\regex" /I "..\..\src\expat\lib" /D "WIN32" /D "_LIB" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "WXBUILDING" /D wxUSE_GUI=0 /c\r
-# ADD CPP /nologo /FD /MD /O2 /GR /EHsc /I "..\..\lib\vc_lib\mswunivu" /I "..\..\include" /W4 /Zi /Fd..\..\lib\vc_lib\wxbase29u_xml.pdb /Yu"wx/wxprec.h" /Fp"vc_mswunivu\wxprec_xmllib.pch" /I "..\..\src\tiff\libtiff" /I "..\..\src\jpeg" /I "..\..\src\png" /I "..\..\src\zlib" /I "..\..\src\regex" /I "..\..\src\expat\lib" /D "WIN32" /D "_LIB" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "WXBUILDING" /D wxUSE_GUI=0 /c\r
+# ADD BASE CPP /nologo /FD /MD /O2 /GR /EHsc /I "..\..\lib\vc_lib\mswunivu" /I "..\..\include" /W4 /Zi /Fd..\..\lib\vc_lib\wxbase29u_xml.pdb /opt:ref /opt:icf /Yu"wx/wxprec.h" /Fp"vc_mswunivu\wxprec_xmllib.pch" /I "..\..\src\tiff\libtiff" /I "..\..\src\jpeg" /I "..\..\src\png" /I "..\..\src\zlib" /I "..\..\src\regex" /I "..\..\src\expat\lib" /D "WIN32" /D "_LIB" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "WXBUILDING" /D wxUSE_GUI=0 /c\r
+# ADD CPP /nologo /FD /MD /O2 /GR /EHsc /I "..\..\lib\vc_lib\mswunivu" /I "..\..\include" /W4 /Zi /Fd..\..\lib\vc_lib\wxbase29u_xml.pdb /opt:ref /opt:icf /Yu"wx/wxprec.h" /Fp"vc_mswunivu\wxprec_xmllib.pch" /I "..\..\src\tiff\libtiff" /I "..\..\src\jpeg" /I "..\..\src\png" /I "..\..\src\zlib" /I "..\..\src\regex" /I "..\..\src\expat\lib" /D "WIN32" /D "_LIB" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "WXBUILDING" /D wxUSE_GUI=0 /c\r
  # ADD BASE RSC /l 0x409\r
  # ADD RSC /l 0x409\r
  BSC32=bscmake.exe\r
@@ -193,8 +193,8 @@ LIB32=link.exe -lib
  # PROP Output_Dir "..\..\lib\vc_lib"\r
  # PROP Intermediate_Dir "vc_mswu\xml"\r
  # PROP Target_Dir ""\r
-# ADD BASE CPP /nologo /FD /MD /O2 /GR /EHsc /I "..\..\lib\vc_lib\mswu" /I "..\..\include" /W4 /Zi /Fd..\..\lib\vc_lib\wxbase29u_xml.pdb /Yu"wx/wxprec.h" /Fp"vc_mswu\wxprec_xmllib.pch" /I "..\..\src\tiff\libtiff" /I "..\..\src\jpeg" /I "..\..\src\png" /I "..\..\src\zlib" /I "..\..\src\regex" /I "..\..\src\expat\lib" /D "WIN32" /D "_LIB" /D "__WXMSW__" /D "_UNICODE" /D "WXBUILDING" /D wxUSE_GUI=0 /c\r
-# ADD CPP /nologo /FD /MD /O2 /GR /EHsc /I "..\..\lib\vc_lib\mswu" /I "..\..\include" /W4 /Zi /Fd..\..\lib\vc_lib\wxbase29u_xml.pdb /Yu"wx/wxprec.h" /Fp"vc_mswu\wxprec_xmllib.pch" /I "..\..\src\tiff\libtiff" /I "..\..\src\jpeg" /I "..\..\src\png" /I "..\..\src\zlib" /I "..\..\src\regex" /I "..\..\src\expat\lib" /D "WIN32" /D "_LIB" /D "__WXMSW__" /D "_UNICODE" /D "WXBUILDING" /D wxUSE_GUI=0 /c\r
+# ADD BASE CPP /nologo /FD /MD /O2 /GR /EHsc /I "..\..\lib\vc_lib\mswu" /I "..\..\include" /W4 /Zi /Fd..\..\lib\vc_lib\wxbase29u_xml.pdb /opt:ref /opt:icf /Yu"wx/wxprec.h" /Fp"vc_mswu\wxprec_xmllib.pch" /I "..\..\src\tiff\libtiff" /I "..\..\src\jpeg" /I "..\..\src\png" /I "..\..\src\zlib" /I "..\..\src\regex" /I "..\..\src\expat\lib" /D "WIN32" /D "_LIB" /D "__WXMSW__" /D "_UNICODE" /D "WXBUILDING" /D wxUSE_GUI=0 /c\r
+# ADD CPP /nologo /FD /MD /O2 /GR /EHsc /I "..\..\lib\vc_lib\mswu" /I "..\..\include" /W4 /Zi /Fd..\..\lib\vc_lib\wxbase29u_xml.pdb /opt:ref /opt:icf /Yu"wx/wxprec.h" /Fp"vc_mswu\wxprec_xmllib.pch" /I "..\..\src\tiff\libtiff" /I "..\..\src\jpeg" /I "..\..\src\png" /I "..\..\src\zlib" /I "..\..\src\regex" /I "..\..\src\expat\lib" /D "WIN32" /D "_LIB" /D "__WXMSW__" /D "_UNICODE" /D "WXBUILDING" /D wxUSE_GUI=0 /c\r
  # ADD BASE RSC /l 0x409\r
  # ADD RSC /l 0x409\r
  BSC32=bscmake.exe\r
diff --git a/build/msw/wx_xrc.dsp b/build/msw/wx_xrc.dsp

index 95557655fc30ebf747235b58a12d1c6f719736f0..a490a46730abf6a6121c454d5f40e2a2349f8768 100644 (file)
--- a/build/msw/wx_xrc.dsp
+++ b/build/msw/wx_xrc.dsp
@@ -47,8 +47,8 @@ RSC=rc.exe
  # PROP Output_Dir "..\..\lib\vc_dll"\r
  # PROP Intermediate_Dir "vc_mswunivudll\xrc"\r
  # PROP Target_Dir ""\r
-# ADD BASE CPP /nologo /FD /MD /O2 /GR /EHsc /I "..\..\lib\vc_dll\mswunivu" /I "..\..\include" /W4 /Yu"wx/wxprec.h" /Fp"vc_mswunivudll\wxprec_xrcdll.pch" /Zi /Fd..\..\lib\vc_dll\wxmswuniv291u_xrc_vc_custom.pdb /I "..\..\src\tiff\libtiff" /I "..\..\src\jpeg" /I "..\..\src\png" /I "..\..\src\zlib" /I "..\..\src\regex" /I "..\..\src\expat\lib" /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "WXBUILDING" /D "WXUSINGDLL" /D "WXMAKINGDLL_XRC" /c\r
-# ADD CPP /nologo /FD /MD /O2 /GR /EHsc /I "..\..\lib\vc_dll\mswunivu" /I "..\..\include" /W4 /Yu"wx/wxprec.h" /Fp"vc_mswunivudll\wxprec_xrcdll.pch" /Zi /Fd..\..\lib\vc_dll\wxmswuniv291u_xrc_vc_custom.pdb /I "..\..\src\tiff\libtiff" /I "..\..\src\jpeg" /I "..\..\src\png" /I "..\..\src\zlib" /I "..\..\src\regex" /I "..\..\src\expat\lib" /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "WXBUILDING" /D "WXUSINGDLL" /D "WXMAKINGDLL_XRC" /c\r
+# ADD BASE CPP /nologo /FD /MD /O2 /GR /EHsc /I "..\..\lib\vc_dll\mswunivu" /I "..\..\include" /W4 /Yu"wx/wxprec.h" /Fp"vc_mswunivudll\wxprec_xrcdll.pch" /Zi /Fd..\..\lib\vc_dll\wxmswuniv291u_xrc_vc_custom.pdb /opt:ref /opt:icf /I "..\..\src\tiff\libtiff" /I "..\..\src\jpeg" /I "..\..\src\png" /I "..\..\src\zlib" /I "..\..\src\regex" /I "..\..\src\expat\lib" /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "WXBUILDING" /D "WXUSINGDLL" /D "WXMAKINGDLL_XRC" /c\r
+# ADD CPP /nologo /FD /MD /O2 /GR /EHsc /I "..\..\lib\vc_dll\mswunivu" /I "..\..\include" /W4 /Yu"wx/wxprec.h" /Fp"vc_mswunivudll\wxprec_xrcdll.pch" /Zi /Fd..\..\lib\vc_dll\wxmswuniv291u_xrc_vc_custom.pdb /opt:ref /opt:icf /I "..\..\src\tiff\libtiff" /I "..\..\src\jpeg" /I "..\..\src\png" /I "..\..\src\zlib" /I "..\..\src\regex" /I "..\..\src\expat\lib" /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "WXBUILDING" /D "WXUSINGDLL" /D "WXMAKINGDLL_XRC" /c\r
  # ADD BASE MTL /nologo /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "WXBUILDING" /D "WXUSINGDLL" /D "WXMAKINGDLL_XRC" /mktyplib203 /win32\r
  # ADD MTL /nologo /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "WXBUILDING" /D "WXUSINGDLL" /D "WXMAKINGDLL_XRC" /mktyplib203 /win32\r
  # ADD BASE RSC /l 0x409 /d "__WXMSW__" /d "__WXUNIVERSAL__" /d "_UNICODE" /i "..\..\lib\vc_dll\mswunivu" /i "..\..\include" /d "WXBUILDING" /d WXDLLNAME=wxmswuniv291u_xrc_vc_custom /i "..\..\src\tiff\libtiff" /i "..\..\src\jpeg" /i "..\..\src\png" /i "..\..\src\zlib" /i "..\..\src\regex" /i "..\..\src\expat\lib" /d "WXUSINGDLL" /d WXMAKINGDLL_XRC\r
@@ -97,8 +97,8 @@ LINK32=link.exe
  # PROP Output_Dir "..\..\lib\vc_dll"\r
  # PROP Intermediate_Dir "vc_mswudll\xrc"\r
  # PROP Target_Dir ""\r
-# ADD BASE CPP /nologo /FD /MD /O2 /GR /EHsc /I "..\..\lib\vc_dll\mswu" /I "..\..\include" /W4 /Yu"wx/wxprec.h" /Fp"vc_mswudll\wxprec_xrcdll.pch" /Zi /Fd..\..\lib\vc_dll\wxmsw291u_xrc_vc_custom.pdb /I "..\..\src\tiff\libtiff" /I "..\..\src\jpeg" /I "..\..\src\png" /I "..\..\src\zlib" /I "..\..\src\regex" /I "..\..\src\expat\lib" /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "__WXMSW__" /D "_UNICODE" /D "WXBUILDING" /D "WXUSINGDLL" /D "WXMAKINGDLL_XRC" /c\r
-# ADD CPP /nologo /FD /MD /O2 /GR /EHsc /I "..\..\lib\vc_dll\mswu" /I "..\..\include" /W4 /Yu"wx/wxprec.h" /Fp"vc_mswudll\wxprec_xrcdll.pch" /Zi /Fd..\..\lib\vc_dll\wxmsw291u_xrc_vc_custom.pdb /I "..\..\src\tiff\libtiff" /I "..\..\src\jpeg" /I "..\..\src\png" /I "..\..\src\zlib" /I "..\..\src\regex" /I "..\..\src\expat\lib" /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "__WXMSW__" /D "_UNICODE" /D "WXBUILDING" /D "WXUSINGDLL" /D "WXMAKINGDLL_XRC" /c\r
+# ADD BASE CPP /nologo /FD /MD /O2 /GR /EHsc /I "..\..\lib\vc_dll\mswu" /I "..\..\include" /W4 /Yu"wx/wxprec.h" /Fp"vc_mswudll\wxprec_xrcdll.pch" /Zi /Fd..\..\lib\vc_dll\wxmsw291u_xrc_vc_custom.pdb /opt:ref /opt:icf /I "..\..\src\tiff\libtiff" /I "..\..\src\jpeg" /I "..\..\src\png" /I "..\..\src\zlib" /I "..\..\src\regex" /I "..\..\src\expat\lib" /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "__WXMSW__" /D "_UNICODE" /D "WXBUILDING" /D "WXUSINGDLL" /D "WXMAKINGDLL_XRC" /c\r
+# ADD CPP /nologo /FD /MD /O2 /GR /EHsc /I "..\..\lib\vc_dll\mswu" /I "..\..\include" /W4 /Yu"wx/wxprec.h" /Fp"vc_mswudll\wxprec_xrcdll.pch" /Zi /Fd..\..\lib\vc_dll\wxmsw291u_xrc_vc_custom.pdb /opt:ref /opt:icf /I "..\..\src\tiff\libtiff" /I "..\..\src\jpeg" /I "..\..\src\png" /I "..\..\src\zlib" /I "..\..\src\regex" /I "..\..\src\expat\lib" /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "__WXMSW__" /D "_UNICODE" /D "WXBUILDING" /D "WXUSINGDLL" /D "WXMAKINGDLL_XRC" /c\r
  # ADD BASE MTL /nologo /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "__WXMSW__" /D "_UNICODE" /D "WXBUILDING" /D "WXUSINGDLL" /D "WXMAKINGDLL_XRC" /mktyplib203 /win32\r
  # ADD MTL /nologo /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "__WXMSW__" /D "_UNICODE" /D "WXBUILDING" /D "WXUSINGDLL" /D "WXMAKINGDLL_XRC" /mktyplib203 /win32\r
  # ADD BASE RSC /l 0x409 /d "__WXMSW__" /d "_UNICODE" /i "..\..\lib\vc_dll\mswu" /i "..\..\include" /d "WXBUILDING" /d WXDLLNAME=wxmsw291u_xrc_vc_custom /i "..\..\src\tiff\libtiff" /i "..\..\src\jpeg" /i "..\..\src\png" /i "..\..\src\zlib" /i "..\..\src\regex" /i "..\..\src\expat\lib" /d "WXUSINGDLL" /d WXMAKINGDLL_XRC\r
@@ -147,8 +147,8 @@ LINK32=link.exe
  # PROP Output_Dir "..\..\lib\vc_lib"\r
  # PROP Intermediate_Dir "vc_mswunivu\xrc"\r
  # PROP Target_Dir ""\r
-# ADD BASE CPP /nologo /FD /MD /O2 /GR /EHsc /I "..\..\lib\vc_lib\mswunivu" /I "..\..\include" /W4 /Zi /Fd..\..\lib\vc_lib\wxmswuniv29u_xrc.pdb /Yu"wx/wxprec.h" /Fp"vc_mswunivu\wxprec_xrclib.pch" /I "..\..\src\tiff\libtiff" /I "..\..\src\jpeg" /I "..\..\src\png" /I "..\..\src\zlib" /I "..\..\src\regex" /I "..\..\src\expat\lib" /D "WIN32" /D "_LIB" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "WXBUILDING" /c\r
-# ADD CPP /nologo /FD /MD /O2 /GR /EHsc /I "..\..\lib\vc_lib\mswunivu" /I "..\..\include" /W4 /Zi /Fd..\..\lib\vc_lib\wxmswuniv29u_xrc.pdb /Yu"wx/wxprec.h" /Fp"vc_mswunivu\wxprec_xrclib.pch" /I "..\..\src\tiff\libtiff" /I "..\..\src\jpeg" /I "..\..\src\png" /I "..\..\src\zlib" /I "..\..\src\regex" /I "..\..\src\expat\lib" /D "WIN32" /D "_LIB" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "WXBUILDING" /c\r
+# ADD BASE CPP /nologo /FD /MD /O2 /GR /EHsc /I "..\..\lib\vc_lib\mswunivu" /I "..\..\include" /W4 /Zi /Fd..\..\lib\vc_lib\wxmswuniv29u_xrc.pdb /opt:ref /opt:icf /Yu"wx/wxprec.h" /Fp"vc_mswunivu\wxprec_xrclib.pch" /I "..\..\src\tiff\libtiff" /I "..\..\src\jpeg" /I "..\..\src\png" /I "..\..\src\zlib" /I "..\..\src\regex" /I "..\..\src\expat\lib" /D "WIN32" /D "_LIB" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "WXBUILDING" /c\r
+# ADD CPP /nologo /FD /MD /O2 /GR /EHsc /I "..\..\lib\vc_lib\mswunivu" /I "..\..\include" /W4 /Zi /Fd..\..\lib\vc_lib\wxmswuniv29u_xrc.pdb /opt:ref /opt:icf /Yu"wx/wxprec.h" /Fp"vc_mswunivu\wxprec_xrclib.pch" /I "..\..\src\tiff\libtiff" /I "..\..\src\jpeg" /I "..\..\src\png" /I "..\..\src\zlib" /I "..\..\src\regex" /I "..\..\src\expat\lib" /D "WIN32" /D "_LIB" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "WXBUILDING" /c\r
  # ADD BASE RSC /l 0x409\r
  # ADD RSC /l 0x409\r
  BSC32=bscmake.exe\r
@@ -193,8 +193,8 @@ LIB32=link.exe -lib
  # PROP Output_Dir "..\..\lib\vc_lib"\r
  # PROP Intermediate_Dir "vc_mswu\xrc"\r
  # PROP Target_Dir ""\r
-# ADD BASE CPP /nologo /FD /MD /O2 /GR /EHsc /I "..\..\lib\vc_lib\mswu" /I "..\..\include" /W4 /Zi /Fd..\..\lib\vc_lib\wxmsw29u_xrc.pdb /Yu"wx/wxprec.h" /Fp"vc_mswu\wxprec_xrclib.pch" /I "..\..\src\tiff\libtiff" /I "..\..\src\jpeg" /I "..\..\src\png" /I "..\..\src\zlib" /I "..\..\src\regex" /I "..\..\src\expat\lib" /D "WIN32" /D "_LIB" /D "__WXMSW__" /D "_UNICODE" /D "WXBUILDING" /c\r
-# ADD CPP /nologo /FD /MD /O2 /GR /EHsc /I "..\..\lib\vc_lib\mswu" /I "..\..\include" /W4 /Zi /Fd..\..\lib\vc_lib\wxmsw29u_xrc.pdb /Yu"wx/wxprec.h" /Fp"vc_mswu\wxprec_xrclib.pch" /I "..\..\src\tiff\libtiff" /I "..\..\src\jpeg" /I "..\..\src\png" /I "..\..\src\zlib" /I "..\..\src\regex" /I "..\..\src\expat\lib" /D "WIN32" /D "_LIB" /D "__WXMSW__" /D "_UNICODE" /D "WXBUILDING" /c\r
+# ADD BASE CPP /nologo /FD /MD /O2 /GR /EHsc /I "..\..\lib\vc_lib\mswu" /I "..\..\include" /W4 /Zi /Fd..\..\lib\vc_lib\wxmsw29u_xrc.pdb /opt:ref /opt:icf /Yu"wx/wxprec.h" /Fp"vc_mswu\wxprec_xrclib.pch" /I "..\..\src\tiff\libtiff" /I "..\..\src\jpeg" /I "..\..\src\png" /I "..\..\src\zlib" /I "..\..\src\regex" /I "..\..\src\expat\lib" /D "WIN32" /D "_LIB" /D "__WXMSW__" /D "_UNICODE" /D "WXBUILDING" /c\r
+# ADD CPP /nologo /FD /MD /O2 /GR /EHsc /I "..\..\lib\vc_lib\mswu" /I "..\..\include" /W4 /Zi /Fd..\..\lib\vc_lib\wxmsw29u_xrc.pdb /opt:ref /opt:icf /Yu"wx/wxprec.h" /Fp"vc_mswu\wxprec_xrclib.pch" /I "..\..\src\tiff\libtiff" /I "..\..\src\jpeg" /I "..\..\src\png" /I "..\..\src\zlib" /I "..\..\src\regex" /I "..\..\src\expat\lib" /D "WIN32" /D "_LIB" /D "__WXMSW__" /D "_UNICODE" /D "WXBUILDING" /c\r
  # ADD BASE RSC /l 0x409\r
  # ADD RSC /l 0x409\r
  BSC32=bscmake.exe\r
author	Kevin Ollivier <kevino@theolliviers.com>
	Sun, 18 Oct 2009 22:38:22 +0000 (22:38 +0000)
committer	Kevin Ollivier <kevino@theolliviers.com>
	Sun, 18 Oct 2009 22:38:22 +0000 (22:38 +0000)
build/msw/wx_adv.dsp		patch \| blob \| blame \| history
build/msw/wx_aui.dsp		patch \| blob \| blame \| history
build/msw/wx_base.dsp		patch \| blob \| blame \| history
build/msw/wx_core.dsp		patch \| blob \| blame \| history
build/msw/wx_gl.dsp		patch \| blob \| blame \| history
build/msw/wx_html.dsp		patch \| blob \| blame \| history
build/msw/wx_media.dsp		patch \| blob \| blame \| history
build/msw/wx_net.dsp		patch \| blob \| blame \| history
build/msw/wx_propgrid.dsp		patch \| blob \| blame \| history
build/msw/wx_qa.dsp		patch \| blob \| blame \| history
build/msw/wx_ribbon.dsp		patch \| blob \| blame \| history
build/msw/wx_richtext.dsp		patch \| blob \| blame \| history
build/msw/wx_stc.dsp		patch \| blob \| blame \| history
build/msw/wx_vc7_adv.vcproj		patch \| blob \| blame \| history
build/msw/wx_vc7_aui.vcproj		patch \| blob \| blame \| history
build/msw/wx_vc7_base.vcproj		patch \| blob \| blame \| history
build/msw/wx_vc7_core.vcproj		patch \| blob \| blame \| history
build/msw/wx_vc7_gl.vcproj		patch \| blob \| blame \| history
build/msw/wx_vc7_html.vcproj		patch \| blob \| blame \| history
build/msw/wx_vc7_media.vcproj		patch \| blob \| blame \| history
build/msw/wx_vc7_net.vcproj		patch \| blob \| blame \| history
build/msw/wx_vc7_propgrid.vcproj		patch \| blob \| blame \| history
build/msw/wx_vc7_qa.vcproj		patch \| blob \| blame \| history
build/msw/wx_vc7_ribbon.vcproj		patch \| blob \| blame \| history
build/msw/wx_vc7_richtext.vcproj		patch \| blob \| blame \| history
build/msw/wx_vc7_stc.vcproj		patch \| blob \| blame \| history
build/msw/wx_vc7_xml.vcproj		patch \| blob \| blame \| history
build/msw/wx_vc7_xrc.vcproj		patch \| blob \| blame \| history
build/msw/wx_vc8_adv.vcproj		patch \| blob \| blame \| history
build/msw/wx_vc8_aui.vcproj		patch \| blob \| blame \| history
build/msw/wx_vc8_base.vcproj		patch \| blob \| blame \| history
build/msw/wx_vc8_core.vcproj		patch \| blob \| blame \| history
build/msw/wx_vc8_gl.vcproj		patch \| blob \| blame \| history
build/msw/wx_vc8_html.vcproj		patch \| blob \| blame \| history
build/msw/wx_vc8_media.vcproj		patch \| blob \| blame \| history
build/msw/wx_vc8_net.vcproj		patch \| blob \| blame \| history
build/msw/wx_vc8_propgrid.vcproj		patch \| blob \| blame \| history
build/msw/wx_vc8_qa.vcproj		patch \| blob \| blame \| history
build/msw/wx_vc8_ribbon.vcproj		patch \| blob \| blame \| history
build/msw/wx_vc8_richtext.vcproj		patch \| blob \| blame \| history
build/msw/wx_vc8_stc.vcproj		patch \| blob \| blame \| history
build/msw/wx_vc8_xml.vcproj		patch \| blob \| blame \| history
build/msw/wx_vc8_xrc.vcproj		patch \| blob \| blame \| history
build/msw/wx_vc9_adv.vcproj		patch \| blob \| blame \| history
build/msw/wx_vc9_aui.vcproj		patch \| blob \| blame \| history
build/msw/wx_vc9_base.vcproj		patch \| blob \| blame \| history
build/msw/wx_vc9_core.vcproj		patch \| blob \| blame \| history
build/msw/wx_vc9_gl.vcproj		patch \| blob \| blame \| history
build/msw/wx_vc9_html.vcproj		patch \| blob \| blame \| history
build/msw/wx_vc9_media.vcproj		patch \| blob \| blame \| history
build/msw/wx_vc9_net.vcproj		patch \| blob \| blame \| history
build/msw/wx_vc9_propgrid.vcproj		patch \| blob \| blame \| history
build/msw/wx_vc9_qa.vcproj		patch \| blob \| blame \| history
build/msw/wx_vc9_ribbon.vcproj		patch \| blob \| blame \| history
build/msw/wx_vc9_richtext.vcproj		patch \| blob \| blame \| history
build/msw/wx_vc9_stc.vcproj		patch \| blob \| blame \| history
build/msw/wx_vc9_wxexpat.vcproj		patch \| blob \| blame \| history
build/msw/wx_vc9_wxjpeg.vcproj		patch \| blob \| blame \| history
build/msw/wx_vc9_wxpng.vcproj		patch \| blob \| blame \| history
build/msw/wx_vc9_wxregex.vcproj		patch \| blob \| blame \| history
build/msw/wx_vc9_wxscintilla.vcproj		patch \| blob \| blame \| history
build/msw/wx_vc9_wxtiff.vcproj		patch \| blob \| blame \| history
build/msw/wx_vc9_wxzlib.vcproj		patch \| blob \| blame \| history
build/msw/wx_vc9_xml.vcproj		patch \| blob \| blame \| history
build/msw/wx_vc9_xrc.vcproj		patch \| blob \| blame \| history
build/msw/wx_wxexpat.dsp		patch \| blob \| blame \| history
build/msw/wx_wxjpeg.dsp		patch \| blob \| blame \| history
build/msw/wx_wxpng.dsp		patch \| blob \| blame \| history
build/msw/wx_wxregex.dsp		patch \| blob \| blame \| history
build/msw/wx_wxscintilla.dsp		patch \| blob \| blame \| history
build/msw/wx_wxtiff.dsp		patch \| blob \| blame \| history
build/msw/wx_wxzlib.dsp		patch \| blob \| blame \| history
build/msw/wx_xml.dsp		patch \| blob \| blame \| history
build/msw/wx_xrc.dsp		patch \| blob \| blame \| history