X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/d12d9edacbcea0920e58346be8dd26ef3eeee43d..23a9a87c85d4e08cd96ab6ab95db64efe46a972f:/build/msw/wx_vc8_html.vcproj diff --git a/build/msw/wx_vc8_html.vcproj b/build/msw/wx_vc8_html.vcproj index 14f2ed35a3..84db1d1e3b 100644 --- a/build/msw/wx_vc8_html.vcproj +++ b/build/msw/wx_vc8_html.vcproj @@ -2,7 +2,7 @@ @@ -129,14 +129,14 @@ /> @@ -296,14 +296,14 @@ /> @@ -396,7 +396,7 @@ PrecompiledHeaderThrough="wx/wxprec.h" PrecompiledHeaderFile="vc_mswuddll\wxprec_htmldll.pch" ObjectFile="vc_mswuddll\html\" - ProgramDataBaseFileName="..\..\lib\vc_dll\wxmsw291ud_html_vc_custom.pdb" + ProgramDataBaseFileName="..\..\lib\vc_dll\wxmsw293ud_html_vc_custom.pdb" WarningLevel="4" SuppressStartupBanner="true" Detect64BitPortabilityProblems="true" @@ -407,7 +407,7 @@ /> @@ -418,14 +418,14 @@ Name="VCLinkerTool" AdditionalOptions="" AdditionalDependencies="wxtiffd.lib wxjpegd.lib wxpngd.lib wxzlibd.lib wxregexud.lib wxexpatd.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib ..\..\lib\vc_dll\wxmsw29ud_core.lib ..\..\lib\vc_dll\wxbase29ud.lib" - OutputFile="..\..\lib\vc_dll\wxmsw291ud_html_vc_custom.dll" + OutputFile="..\..\lib\vc_dll\wxmsw293ud_html_vc_custom.dll" LinkIncremental="2" ImportLibrary="..\..\lib\vc_dll\wxmsw29ud_html.lib" SuppressStartupBanner="true" AdditionalLibraryDirectories="..\..\lib\vc_dll" GenerateManifest="true" GenerateDebugInformation="true" - ProgramDatabaseFile="..\..\lib\vc_dll\wxmsw291ud_html_vc_custom.pdb" + ProgramDatabaseFile="..\..\lib\vc_dll\wxmsw293ud_html_vc_custom.pdb" TargetMachine="1" /> @@ -509,15 +509,17 @@ Name="VCLinkerTool" AdditionalOptions="" 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" - OutputFile="..\..\lib\vc_dll\wxmsw291u_html_vc_custom.dll" - LinkIncremental="2" + OutputFile="..\..\lib\vc_dll\wxmsw293u_html_vc_custom.dll" + LinkIncremental="1" ImportLibrary="..\..\lib\vc_dll\wxmsw29u_html.lib" SuppressStartupBanner="true" AdditionalLibraryDirectories="..\..\lib\vc_dll" GenerateManifest="true" GenerateDebugInformation="true" - ProgramDatabaseFile="..\..\lib\vc_dll\wxmsw291u_html_vc_custom.pdb" + ProgramDatabaseFile="..\..\lib\vc_dll\wxmsw293u_html_vc_custom.pdb" TargetMachine="1" + OptimizeReferences="2" + EnableCOMDATFolding="2" /> @@ -603,14 +605,14 @@ Name="VCLinkerTool" AdditionalOptions="" AdditionalDependencies="wxtiffd.lib wxjpegd.lib wxpngd.lib wxzlibd.lib wxregexud.lib wxexpatd.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib ..\..\lib\vc_dll\wxmswuniv29ud_core.lib ..\..\lib\vc_dll\wxbase29ud.lib" - OutputFile="..\..\lib\vc_dll\wxmswuniv291ud_html_vc_custom.dll" + OutputFile="..\..\lib\vc_dll\wxmswuniv293ud_html_vc_custom.dll" LinkIncremental="2" ImportLibrary="..\..\lib\vc_dll\wxmswuniv29ud_html.lib" SuppressStartupBanner="true" AdditionalLibraryDirectories="..\..\lib\vc_dll" GenerateManifest="true" GenerateDebugInformation="true" - ProgramDatabaseFile="..\..\lib\vc_dll\wxmswuniv291ud_html_vc_custom.pdb" + ProgramDatabaseFile="..\..\lib\vc_dll\wxmswuniv293ud_html_vc_custom.pdb" TargetMachine="1" /> @@ -694,15 +696,17 @@ Name="VCLinkerTool" AdditionalOptions="" 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" - OutputFile="..\..\lib\vc_dll\wxmswuniv291u_html_vc_custom.dll" - LinkIncremental="2" + OutputFile="..\..\lib\vc_dll\wxmswuniv293u_html_vc_custom.dll" + LinkIncremental="1" ImportLibrary="..\..\lib\vc_dll\wxmswuniv29u_html.lib" SuppressStartupBanner="true" AdditionalLibraryDirectories="..\..\lib\vc_dll" GenerateManifest="true" GenerateDebugInformation="true" - ProgramDatabaseFile="..\..\lib\vc_dll\wxmswuniv291u_html_vc_custom.pdb" + ProgramDatabaseFile="..\..\lib\vc_dll\wxmswuniv293u_html_vc_custom.pdb" TargetMachine="1" + OptimizeReferences="2" + EnableCOMDATFolding="2" /> + + @@ -929,6 +937,10 @@ RelativePath="..\..\src\html\m_tables.cpp" > + + @@ -949,7 +961,6 @@ Description="Creating ..\..\lib\vc_lib\mswud\wx\setup.h" CommandLine="copy "$(InputPath)" ..\..\lib\vc_lib\mswud\wx\setup.h" Outputs="..\..\lib\vc_lib\mswud\wx\setup.h" - AdditionalDependencies=""$(INTDIR)" "$(OUTDIR)"" /> @@ -1220,6 +1224,10 @@ RelativePath="..\..\include\wx\html\m_templ.h" > + +