<?xml version="1.0" encoding="Windows-1252"?>\r
<!--\r
\r
- This makefile was generated by\r
- Bakefile 0.2.4 (http://www.bakefile.org)\r
+ This project was generated by\r
+ Bakefile 0.2.9 (http://www.bakefile.org)\r
Do not modify, all changes will be overwritten!\r
\r
-->\r
</ToolFiles>\r
<Configurations>\r
<Configuration\r
- Name="DLL Universal Release|Win32"\r
- OutputDirectory="..\..\lib\vc_dll"\r
- IntermediateDirectory="vc_mswunivudll\html"\r
- ConfigurationType="2"\r
+ Name="Debug|Win32"\r
+ OutputDirectory="..\..\lib\vc_lib"\r
+ IntermediateDirectory="vc_mswud\html"\r
+ ConfigurationType="4"\r
UseOfMFC="0"\r
ATLMinimizesCRunTimeLibraryUsage="false"\r
CharacterSet="1"\r
/>\r
<Tool\r
Name="VCMIDLTool"\r
+ PreprocessorDefinitions="WIN32;_LIB;_DEBUG;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__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
<Tool\r
Name="VCCLCompilerTool"\r
- Optimization="2"\r
- AdditionalIncludeDirectories="..\..\lib\vc_dll\mswunivu;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib"\r
- PreprocessorDefinitions="_USRDLL;DLL_EXPORTS;__WXMSW__;__WXUNIVERSAL__;_UNICODE;WXBUILDING;WXUSINGDLL;WXMAKINGDLL_HTML"\r
+ Optimization="0"\r
+ AdditionalIncludeDirectories="..\..\lib\vc_lib\mswud;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib"\r
+ PreprocessorDefinitions="WIN32;_LIB;_DEBUG;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;_UNICODE;WXBUILDING"\r
+ MinimalRebuild="true"\r
ExceptionHandling="1"\r
- RuntimeLibrary="2"\r
+ BasicRuntimeChecks="3"\r
+ RuntimeLibrary="3"\r
+ BufferSecurityCheck="true"\r
RuntimeTypeInfo="true"\r
UsePrecompiledHeader="2"\r
PrecompiledHeaderThrough="wx/wxprec.h"\r
- PrecompiledHeaderFile="vc_mswunivudll\wxprec_htmldll.pch"\r
- AssemblerListingLocation="vc_mswunivudll\html\"\r
- ObjectFile="vc_mswunivudll\html\"\r
- ProgramDataBaseFileName="..\..\lib\vc_dll\wxmswuniv290u_html_vc_custom.pdb"\r
+ PrecompiledHeaderFile="vc_mswud\wxprec_htmllib.pch"\r
+ ObjectFile="vc_mswud\html\"\r
+ ProgramDataBaseFileName="..\..\lib\vc_lib\wxmsw29ud_html.pdb"\r
WarningLevel="4"\r
SuppressStartupBanner="true"\r
Detect64BitPortabilityProblems="true"\r
/>\r
<Tool\r
Name="VCResourceCompilerTool"\r
- PreprocessorDefinitions="__WXMSW__;__WXUNIVERSAL__;_UNICODE;WXBUILDING;WXDLLNAME=wxmswuniv290u_html_vc_custom;WXUSINGDLL;WXMAKINGDLL_HTML"\r
+ PreprocessorDefinitions="_DEBUG;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;_UNICODE;WXBUILDING"\r
Culture="1033"\r
- AdditionalIncludeDirectories="..\..\lib\vc_dll\mswunivu;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib"\r
+ AdditionalIncludeDirectories="..\..\lib\vc_lib\mswud;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib"\r
/>\r
<Tool\r
Name="VCPreLinkEventTool"\r
/>\r
<Tool\r
- Name="VCLinkerTool"\r
- 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 ..\..\lib\vc_dll\wxmswuniv29u_core.lib ..\..\lib\vc_dll\wxbase29u.lib"\r
- OutputFile="..\..\lib\vc_dll\wxmswuniv290u_html_vc_custom.dll"\r
- LinkIncremental="2"\r
- ImportLibrary="..\..\lib\vc_dll\wxmswuniv29u_html.lib"\r
+ Name="VCLibrarianTool"\r
+ OutputFile="..\..\lib\vc_lib\wxmsw29ud_html.lib"\r
SuppressStartupBanner="true"\r
- AdditionalLibraryDirectories="..\..\lib\vc_dll"\r
- GenerateManifest="true"\r
- GenerateDebugInformation="true"\r
- ProgramDatabaseFile="..\..\lib\vc_dll\wxmswuniv290u_html_vc_custom.pdb"\r
- TargetMachine="1"\r
/>\r
<Tool\r
Name="VCALinkTool"\r
/>\r
<Tool\r
Name="VCBscMakeTool"\r
- OutputFile="..\..\lib\vc_dll\wx_vc8_html.bsc"\r
+ OutputFile="..\..\lib\vc_lib\wx_vc8_html.bsc"\r
SuppressStartupBanner="true"\r
/>\r
<Tool\r
/>\r
</Configuration>\r
<Configuration\r
- Name="DLL Universal Debug|Win32"\r
- OutputDirectory="..\..\lib\vc_dll"\r
- IntermediateDirectory="vc_mswunivuddll\html"\r
- ConfigurationType="2"\r
+ Name="Release|Win32"\r
+ OutputDirectory="..\..\lib\vc_lib"\r
+ IntermediateDirectory="vc_mswu\html"\r
+ ConfigurationType="4"\r
UseOfMFC="0"\r
ATLMinimizesCRunTimeLibraryUsage="false"\r
CharacterSet="1"\r
/>\r
<Tool\r
Name="VCMIDLTool"\r
+ PreprocessorDefinitions="WIN32;_LIB;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;NDEBUG;_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
<Tool\r
Name="VCCLCompilerTool"\r
- Optimization="0"\r
- AdditionalIncludeDirectories="..\..\lib\vc_dll\mswunivud;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib"\r
- PreprocessorDefinitions="_USRDLL;DLL_EXPORTS;_DEBUG;__WXMSW__;__WXUNIVERSAL__;__WXDEBUG__;_UNICODE;WXBUILDING;WXUSINGDLL;WXMAKINGDLL_HTML"\r
- MinimalRebuild="true"\r
+ Optimization="2"\r
+ AdditionalIncludeDirectories="..\..\lib\vc_lib\mswu;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib"\r
+ PreprocessorDefinitions="WIN32;_LIB;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;NDEBUG;_UNICODE;WXBUILDING"\r
ExceptionHandling="1"\r
- BasicRuntimeChecks="3"\r
- RuntimeLibrary="3"\r
- BufferSecurityCheck="true"\r
+ RuntimeLibrary="2"\r
RuntimeTypeInfo="true"\r
UsePrecompiledHeader="2"\r
PrecompiledHeaderThrough="wx/wxprec.h"\r
- PrecompiledHeaderFile="vc_mswunivuddll\wxprec_htmldll.pch"\r
- AssemblerListingLocation="vc_mswunivuddll\html\"\r
- ObjectFile="vc_mswunivuddll\html\"\r
- ProgramDataBaseFileName="..\..\lib\vc_dll\wxmswuniv290ud_html_vc_custom.pdb"\r
+ PrecompiledHeaderFile="vc_mswu\wxprec_htmllib.pch"\r
+ ObjectFile="vc_mswu\html\"\r
+ ProgramDataBaseFileName="..\..\lib\vc_lib\wxmsw29u_html.pdb"\r
WarningLevel="4"\r
SuppressStartupBanner="true"\r
Detect64BitPortabilityProblems="true"\r
/>\r
<Tool\r
Name="VCResourceCompilerTool"\r
- PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXUNIVERSAL__;__WXDEBUG__;_UNICODE;WXBUILDING;WXDLLNAME=wxmswuniv290ud_html_vc_custom;WXUSINGDLL;WXMAKINGDLL_HTML"\r
+ PreprocessorDefinitions="_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;NDEBUG;_UNICODE;WXBUILDING"\r
Culture="1033"\r
- AdditionalIncludeDirectories="..\..\lib\vc_dll\mswunivud;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib"\r
+ AdditionalIncludeDirectories="..\..\lib\vc_lib\mswu;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib"\r
/>\r
<Tool\r
Name="VCPreLinkEventTool"\r
/>\r
<Tool\r
- Name="VCLinkerTool"\r
- AdditionalOptions=""\r
- AdditionalDependencies="wxtiffd.lib wxjpegd.lib wxpngd.lib wxzlibd.lib wxregexud.lib wxexpatd.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib ..\..\lib\vc_dll\wxmswuniv29ud_core.lib ..\..\lib\vc_dll\wxbase29ud.lib"\r
- OutputFile="..\..\lib\vc_dll\wxmswuniv290ud_html_vc_custom.dll"\r
- LinkIncremental="2"\r
- ImportLibrary="..\..\lib\vc_dll\wxmswuniv29ud_html.lib"\r
+ Name="VCLibrarianTool"\r
+ OutputFile="..\..\lib\vc_lib\wxmsw29u_html.lib"\r
SuppressStartupBanner="true"\r
- AdditionalLibraryDirectories="..\..\lib\vc_dll"\r
- GenerateManifest="true"\r
- GenerateDebugInformation="true"\r
- ProgramDatabaseFile="..\..\lib\vc_dll\wxmswuniv290ud_html_vc_custom.pdb"\r
- TargetMachine="1"\r
/>\r
<Tool\r
Name="VCALinkTool"\r
/>\r
<Tool\r
Name="VCBscMakeTool"\r
- OutputFile="..\..\lib\vc_dll\wx_vc8_html.bsc"\r
+ OutputFile="..\..\lib\vc_lib\wx_vc8_html.bsc"\r
SuppressStartupBanner="true"\r
/>\r
<Tool\r
/>\r
</Configuration>\r
<Configuration\r
- Name="DLL Release|Win32"\r
- OutputDirectory="..\..\lib\vc_dll"\r
- IntermediateDirectory="vc_mswudll\html"\r
- ConfigurationType="2"\r
+ Name="Universal Debug|Win32"\r
+ OutputDirectory="..\..\lib\vc_lib"\r
+ IntermediateDirectory="vc_mswunivud\html"\r
+ ConfigurationType="4"\r
UseOfMFC="0"\r
ATLMinimizesCRunTimeLibraryUsage="false"\r
CharacterSet="1"\r
/>\r
<Tool\r
Name="VCMIDLTool"\r
+ PreprocessorDefinitions="WIN32;_LIB;_DEBUG;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__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
<Tool\r
Name="VCCLCompilerTool"\r
- Optimization="2"\r
- AdditionalIncludeDirectories="..\..\lib\vc_dll\mswu;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib"\r
- PreprocessorDefinitions="_USRDLL;DLL_EXPORTS;__WXMSW__;_UNICODE;WXBUILDING;WXUSINGDLL;WXMAKINGDLL_HTML"\r
+ Optimization="0"\r
+ AdditionalIncludeDirectories="..\..\lib\vc_lib\mswunivud;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib"\r
+ PreprocessorDefinitions="WIN32;_LIB;_DEBUG;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;__WXUNIVERSAL__;_UNICODE;WXBUILDING"\r
+ MinimalRebuild="true"\r
ExceptionHandling="1"\r
- RuntimeLibrary="2"\r
+ BasicRuntimeChecks="3"\r
+ RuntimeLibrary="3"\r
+ BufferSecurityCheck="true"\r
RuntimeTypeInfo="true"\r
UsePrecompiledHeader="2"\r
PrecompiledHeaderThrough="wx/wxprec.h"\r
- PrecompiledHeaderFile="vc_mswudll\wxprec_htmldll.pch"\r
- AssemblerListingLocation="vc_mswudll\html\"\r
- ObjectFile="vc_mswudll\html\"\r
- ProgramDataBaseFileName="..\..\lib\vc_dll\wxmsw290u_html_vc_custom.pdb"\r
+ PrecompiledHeaderFile="vc_mswunivud\wxprec_htmllib.pch"\r
+ ObjectFile="vc_mswunivud\html\"\r
+ ProgramDataBaseFileName="..\..\lib\vc_lib\wxmswuniv29ud_html.pdb"\r
WarningLevel="4"\r
SuppressStartupBanner="true"\r
Detect64BitPortabilityProblems="true"\r
/>\r
<Tool\r
Name="VCResourceCompilerTool"\r
- PreprocessorDefinitions="__WXMSW__;_UNICODE;WXBUILDING;WXDLLNAME=wxmsw290u_html_vc_custom;WXUSINGDLL;WXMAKINGDLL_HTML"\r
+ PreprocessorDefinitions="_DEBUG;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;__WXUNIVERSAL__;_UNICODE;WXBUILDING"\r
Culture="1033"\r
- AdditionalIncludeDirectories="..\..\lib\vc_dll\mswu;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib"\r
+ AdditionalIncludeDirectories="..\..\lib\vc_lib\mswunivud;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib"\r
/>\r
<Tool\r
Name="VCPreLinkEventTool"\r
/>\r
<Tool\r
- Name="VCLinkerTool"\r
- 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 ..\..\lib\vc_dll\wxmsw29u_core.lib ..\..\lib\vc_dll\wxbase29u.lib"\r
- OutputFile="..\..\lib\vc_dll\wxmsw290u_html_vc_custom.dll"\r
- LinkIncremental="2"\r
- ImportLibrary="..\..\lib\vc_dll\wxmsw29u_html.lib"\r
+ Name="VCLibrarianTool"\r
+ OutputFile="..\..\lib\vc_lib\wxmswuniv29ud_html.lib"\r
SuppressStartupBanner="true"\r
- AdditionalLibraryDirectories="..\..\lib\vc_dll"\r
- GenerateManifest="true"\r
- GenerateDebugInformation="true"\r
- ProgramDatabaseFile="..\..\lib\vc_dll\wxmsw290u_html_vc_custom.pdb"\r
- TargetMachine="1"\r
/>\r
<Tool\r
Name="VCALinkTool"\r
/>\r
<Tool\r
Name="VCBscMakeTool"\r
- OutputFile="..\..\lib\vc_dll\wx_vc8_html.bsc"\r
+ OutputFile="..\..\lib\vc_lib\wx_vc8_html.bsc"\r
SuppressStartupBanner="true"\r
/>\r
<Tool\r
/>\r
</Configuration>\r
<Configuration\r
- Name="DLL Debug|Win32"\r
- OutputDirectory="..\..\lib\vc_dll"\r
- IntermediateDirectory="vc_mswuddll\html"\r
- ConfigurationType="2"\r
+ Name="Universal Release|Win32"\r
+ OutputDirectory="..\..\lib\vc_lib"\r
+ IntermediateDirectory="vc_mswunivu\html"\r
+ ConfigurationType="4"\r
UseOfMFC="0"\r
ATLMinimizesCRunTimeLibraryUsage="false"\r
CharacterSet="1"\r
/>\r
<Tool\r
Name="VCMIDLTool"\r
+ PreprocessorDefinitions="WIN32;_LIB;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;__WXUNIVERSAL__;NDEBUG;_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
<Tool\r
Name="VCCLCompilerTool"\r
- Optimization="0"\r
- AdditionalIncludeDirectories="..\..\lib\vc_dll\mswud;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib"\r
- PreprocessorDefinitions="_USRDLL;DLL_EXPORTS;_DEBUG;__WXMSW__;__WXDEBUG__;_UNICODE;WXBUILDING;WXUSINGDLL;WXMAKINGDLL_HTML"\r
- MinimalRebuild="true"\r
+ Optimization="2"\r
+ AdditionalIncludeDirectories="..\..\lib\vc_lib\mswunivu;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib"\r
+ PreprocessorDefinitions="WIN32;_LIB;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;__WXUNIVERSAL__;NDEBUG;_UNICODE;WXBUILDING"\r
ExceptionHandling="1"\r
- BasicRuntimeChecks="3"\r
- RuntimeLibrary="3"\r
- BufferSecurityCheck="true"\r
+ RuntimeLibrary="2"\r
RuntimeTypeInfo="true"\r
UsePrecompiledHeader="2"\r
PrecompiledHeaderThrough="wx/wxprec.h"\r
- PrecompiledHeaderFile="vc_mswuddll\wxprec_htmldll.pch"\r
- AssemblerListingLocation="vc_mswuddll\html\"\r
- ObjectFile="vc_mswuddll\html\"\r
- ProgramDataBaseFileName="..\..\lib\vc_dll\wxmsw290ud_html_vc_custom.pdb"\r
+ PrecompiledHeaderFile="vc_mswunivu\wxprec_htmllib.pch"\r
+ ObjectFile="vc_mswunivu\html\"\r
+ ProgramDataBaseFileName="..\..\lib\vc_lib\wxmswuniv29u_html.pdb"\r
WarningLevel="4"\r
SuppressStartupBanner="true"\r
Detect64BitPortabilityProblems="true"\r
/>\r
<Tool\r
Name="VCResourceCompilerTool"\r
- PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXDEBUG__;_UNICODE;WXBUILDING;WXDLLNAME=wxmsw290ud_html_vc_custom;WXUSINGDLL;WXMAKINGDLL_HTML"\r
+ PreprocessorDefinitions="_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;__WXUNIVERSAL__;NDEBUG;_UNICODE;WXBUILDING"\r
Culture="1033"\r
- AdditionalIncludeDirectories="..\..\lib\vc_dll\mswud;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib"\r
+ AdditionalIncludeDirectories="..\..\lib\vc_lib\mswunivu;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib"\r
/>\r
<Tool\r
Name="VCPreLinkEventTool"\r
/>\r
<Tool\r
- Name="VCLinkerTool"\r
- AdditionalOptions=""\r
- AdditionalDependencies="wxtiffd.lib wxjpegd.lib wxpngd.lib wxzlibd.lib wxregexud.lib wxexpatd.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib ..\..\lib\vc_dll\wxmsw29ud_core.lib ..\..\lib\vc_dll\wxbase29ud.lib"\r
- OutputFile="..\..\lib\vc_dll\wxmsw290ud_html_vc_custom.dll"\r
- LinkIncremental="2"\r
- ImportLibrary="..\..\lib\vc_dll\wxmsw29ud_html.lib"\r
+ Name="VCLibrarianTool"\r
+ OutputFile="..\..\lib\vc_lib\wxmswuniv29u_html.lib"\r
SuppressStartupBanner="true"\r
- AdditionalLibraryDirectories="..\..\lib\vc_dll"\r
- GenerateManifest="true"\r
- GenerateDebugInformation="true"\r
- ProgramDatabaseFile="..\..\lib\vc_dll\wxmsw290ud_html_vc_custom.pdb"\r
- TargetMachine="1"\r
/>\r
<Tool\r
Name="VCALinkTool"\r
/>\r
<Tool\r
Name="VCBscMakeTool"\r
- OutputFile="..\..\lib\vc_dll\wx_vc8_html.bsc"\r
+ OutputFile="..\..\lib\vc_lib\wx_vc8_html.bsc"\r
SuppressStartupBanner="true"\r
/>\r
<Tool\r
/>\r
</Configuration>\r
<Configuration\r
- Name="Universal Release|Win32"\r
- OutputDirectory="..\..\lib\vc_lib"\r
- IntermediateDirectory="vc_mswunivu\html"\r
- ConfigurationType="4"\r
+ Name="DLL Debug|Win32"\r
+ OutputDirectory="..\..\lib\vc_dll"\r
+ IntermediateDirectory="vc_mswuddll\html"\r
+ ConfigurationType="2"\r
UseOfMFC="0"\r
ATLMinimizesCRunTimeLibraryUsage="false"\r
CharacterSet="1"\r
/>\r
<Tool\r
Name="VCMIDLTool"\r
+ PreprocessorDefinitions="WIN32;_USRDLL;DLL_EXPORTS;_DEBUG;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__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
<Tool\r
Name="VCCLCompilerTool"\r
- Optimization="2"\r
- AdditionalIncludeDirectories="..\..\lib\vc_lib\mswunivu;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib"\r
- PreprocessorDefinitions="_LIB;__WXMSW__;__WXUNIVERSAL__;_UNICODE;WXBUILDING"\r
+ Optimization="0"\r
+ AdditionalIncludeDirectories="..\..\lib\vc_dll\mswud;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib"\r
+ PreprocessorDefinitions="WIN32;_USRDLL;DLL_EXPORTS;_DEBUG;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;_UNICODE;WXBUILDING;WXUSINGDLL;WXMAKINGDLL_HTML"\r
+ MinimalRebuild="true"\r
ExceptionHandling="1"\r
- RuntimeLibrary="2"\r
+ BasicRuntimeChecks="3"\r
+ RuntimeLibrary="3"\r
+ BufferSecurityCheck="true"\r
RuntimeTypeInfo="true"\r
UsePrecompiledHeader="2"\r
PrecompiledHeaderThrough="wx/wxprec.h"\r
- PrecompiledHeaderFile="vc_mswunivu\wxprec_htmllib.pch"\r
- AssemblerListingLocation="vc_mswunivu\html\"\r
- ObjectFile="vc_mswunivu\html\"\r
- ProgramDataBaseFileName="..\..\lib\vc_lib\wxmswuniv29u_html.pdb"\r
+ PrecompiledHeaderFile="vc_mswuddll\wxprec_htmldll.pch"\r
+ ObjectFile="vc_mswuddll\html\"\r
+ ProgramDataBaseFileName="..\..\lib\vc_dll\wxmsw294ud_html_vc_custom.pdb"\r
WarningLevel="4"\r
SuppressStartupBanner="true"\r
Detect64BitPortabilityProblems="true"\r
/>\r
<Tool\r
Name="VCResourceCompilerTool"\r
- PreprocessorDefinitions="__WXMSW__;__WXUNIVERSAL__;_UNICODE;WXBUILDING"\r
+ PreprocessorDefinitions="_DEBUG;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;_UNICODE;WXBUILDING;WXDLLNAME=wxmsw294ud_html_vc_custom;WXUSINGDLL;WXMAKINGDLL_HTML"\r
Culture="1033"\r
- AdditionalIncludeDirectories="..\..\lib\vc_lib\mswunivu;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib"\r
+ AdditionalIncludeDirectories="..\..\lib\vc_dll\mswud;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib"\r
/>\r
<Tool\r
Name="VCPreLinkEventTool"\r
/>\r
<Tool\r
- Name="VCLibrarianTool"\r
- OutputFile="..\..\lib\vc_lib\wxmswuniv29u_html.lib"\r
+ Name="VCLinkerTool"\r
+ AdditionalOptions=""\r
+ AdditionalDependencies="wxtiffd.lib wxjpegd.lib wxpngd.lib wxzlibd.lib wxregexud.lib wxexpatd.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib ..\..\lib\vc_dll\wxmsw29ud_core.lib ..\..\lib\vc_dll\wxbase29ud.lib"\r
+ OutputFile="..\..\lib\vc_dll\wxmsw294ud_html_vc_custom.dll"\r
+ LinkIncremental="2"\r
+ ImportLibrary="..\..\lib\vc_dll\wxmsw29ud_html.lib"\r
SuppressStartupBanner="true"\r
+ AdditionalLibraryDirectories="..\..\lib\vc_dll"\r
+ GenerateManifest="true"\r
+ GenerateDebugInformation="true"\r
+ ProgramDatabaseFile="..\..\lib\vc_dll\wxmsw294ud_html_vc_custom.pdb"\r
+ TargetMachine="1"\r
/>\r
<Tool\r
Name="VCALinkTool"\r
/>\r
<Tool\r
Name="VCBscMakeTool"\r
- OutputFile="..\..\lib\vc_lib\wx_vc8_html.bsc"\r
+ OutputFile="..\..\lib\vc_dll\wx_vc8_html.bsc"\r
SuppressStartupBanner="true"\r
/>\r
<Tool\r
/>\r
</Configuration>\r
<Configuration\r
- Name="Universal Debug|Win32"\r
- OutputDirectory="..\..\lib\vc_lib"\r
- IntermediateDirectory="vc_mswunivud\html"\r
- ConfigurationType="4"\r
+ Name="DLL Release|Win32"\r
+ OutputDirectory="..\..\lib\vc_dll"\r
+ IntermediateDirectory="vc_mswudll\html"\r
+ ConfigurationType="2"\r
UseOfMFC="0"\r
ATLMinimizesCRunTimeLibraryUsage="false"\r
CharacterSet="1"\r
/>\r
<Tool\r
Name="VCMIDLTool"\r
+ PreprocessorDefinitions="WIN32;_USRDLL;DLL_EXPORTS;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;NDEBUG;_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
<Tool\r
Name="VCCLCompilerTool"\r
- Optimization="0"\r
- AdditionalIncludeDirectories="..\..\lib\vc_lib\mswunivud;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib"\r
- PreprocessorDefinitions="_LIB;_DEBUG;__WXMSW__;__WXUNIVERSAL__;__WXDEBUG__;_UNICODE;WXBUILDING"\r
- MinimalRebuild="true"\r
+ Optimization="2"\r
+ AdditionalIncludeDirectories="..\..\lib\vc_dll\mswu;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib"\r
+ PreprocessorDefinitions="WIN32;_USRDLL;DLL_EXPORTS;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;NDEBUG;_UNICODE;WXBUILDING;WXUSINGDLL;WXMAKINGDLL_HTML"\r
ExceptionHandling="1"\r
- BasicRuntimeChecks="3"\r
- RuntimeLibrary="3"\r
- BufferSecurityCheck="true"\r
+ RuntimeLibrary="2"\r
RuntimeTypeInfo="true"\r
UsePrecompiledHeader="2"\r
PrecompiledHeaderThrough="wx/wxprec.h"\r
- PrecompiledHeaderFile="vc_mswunivud\wxprec_htmllib.pch"\r
- AssemblerListingLocation="vc_mswunivud\html\"\r
- ObjectFile="vc_mswunivud\html\"\r
- ProgramDataBaseFileName="..\..\lib\vc_lib\wxmswuniv29ud_html.pdb"\r
+ PrecompiledHeaderFile="vc_mswudll\wxprec_htmldll.pch"\r
+ ObjectFile="vc_mswudll\html\"\r
+ ProgramDataBaseFileName="..\..\lib\vc_dll\wxmsw294u_html_vc_custom.pdb"\r
WarningLevel="4"\r
SuppressStartupBanner="true"\r
Detect64BitPortabilityProblems="true"\r
/>\r
<Tool\r
Name="VCResourceCompilerTool"\r
- PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXUNIVERSAL__;__WXDEBUG__;_UNICODE;WXBUILDING"\r
+ PreprocessorDefinitions="_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;NDEBUG;_UNICODE;WXBUILDING;WXDLLNAME=wxmsw294u_html_vc_custom;WXUSINGDLL;WXMAKINGDLL_HTML"\r
Culture="1033"\r
- AdditionalIncludeDirectories="..\..\lib\vc_lib\mswunivud;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib"\r
+ AdditionalIncludeDirectories="..\..\lib\vc_dll\mswu;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib"\r
/>\r
<Tool\r
Name="VCPreLinkEventTool"\r
/>\r
<Tool\r
- Name="VCLibrarianTool"\r
- OutputFile="..\..\lib\vc_lib\wxmswuniv29ud_html.lib"\r
+ Name="VCLinkerTool"\r
+ 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\wxmsw294u_html_vc_custom.dll"\r
+ LinkIncremental="1"\r
+ ImportLibrary="..\..\lib\vc_dll\wxmsw29u_html.lib"\r
SuppressStartupBanner="true"\r
+ AdditionalLibraryDirectories="..\..\lib\vc_dll"\r
+ GenerateManifest="true"\r
+ GenerateDebugInformation="true"\r
+ ProgramDatabaseFile="..\..\lib\vc_dll\wxmsw294u_html_vc_custom.pdb"\r
+ TargetMachine="1"\r
+ OptimizeReferences="2"\r
+ EnableCOMDATFolding="2"\r
/>\r
<Tool\r
Name="VCALinkTool"\r
/>\r
<Tool\r
Name="VCBscMakeTool"\r
- OutputFile="..\..\lib\vc_lib\wx_vc8_html.bsc"\r
+ OutputFile="..\..\lib\vc_dll\wx_vc8_html.bsc"\r
SuppressStartupBanner="true"\r
/>\r
<Tool\r
/>\r
</Configuration>\r
<Configuration\r
- Name="Release|Win32"\r
- OutputDirectory="..\..\lib\vc_lib"\r
- IntermediateDirectory="vc_mswu\html"\r
- ConfigurationType="4"\r
+ Name="DLL Universal Debug|Win32"\r
+ OutputDirectory="..\..\lib\vc_dll"\r
+ IntermediateDirectory="vc_mswunivuddll\html"\r
+ ConfigurationType="2"\r
UseOfMFC="0"\r
ATLMinimizesCRunTimeLibraryUsage="false"\r
CharacterSet="1"\r
/>\r
<Tool\r
Name="VCMIDLTool"\r
+ PreprocessorDefinitions="WIN32;_USRDLL;DLL_EXPORTS;_DEBUG;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__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
<Tool\r
Name="VCCLCompilerTool"\r
- Optimization="2"\r
- AdditionalIncludeDirectories="..\..\lib\vc_lib\mswu;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib"\r
- PreprocessorDefinitions="_LIB;__WXMSW__;_UNICODE;WXBUILDING"\r
+ Optimization="0"\r
+ AdditionalIncludeDirectories="..\..\lib\vc_dll\mswunivud;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib"\r
+ PreprocessorDefinitions="WIN32;_USRDLL;DLL_EXPORTS;_DEBUG;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;__WXUNIVERSAL__;_UNICODE;WXBUILDING;WXUSINGDLL;WXMAKINGDLL_HTML"\r
+ MinimalRebuild="true"\r
ExceptionHandling="1"\r
- RuntimeLibrary="2"\r
+ BasicRuntimeChecks="3"\r
+ RuntimeLibrary="3"\r
+ BufferSecurityCheck="true"\r
RuntimeTypeInfo="true"\r
UsePrecompiledHeader="2"\r
PrecompiledHeaderThrough="wx/wxprec.h"\r
- PrecompiledHeaderFile="vc_mswu\wxprec_htmllib.pch"\r
- AssemblerListingLocation="vc_mswu\html\"\r
- ObjectFile="vc_mswu\html\"\r
- ProgramDataBaseFileName="..\..\lib\vc_lib\wxmsw29u_html.pdb"\r
+ PrecompiledHeaderFile="vc_mswunivuddll\wxprec_htmldll.pch"\r
+ ObjectFile="vc_mswunivuddll\html\"\r
+ ProgramDataBaseFileName="..\..\lib\vc_dll\wxmswuniv294ud_html_vc_custom.pdb"\r
WarningLevel="4"\r
SuppressStartupBanner="true"\r
Detect64BitPortabilityProblems="true"\r
/>\r
<Tool\r
Name="VCResourceCompilerTool"\r
- PreprocessorDefinitions="__WXMSW__;_UNICODE;WXBUILDING"\r
+ PreprocessorDefinitions="_DEBUG;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;__WXUNIVERSAL__;_UNICODE;WXBUILDING;WXDLLNAME=wxmswuniv294ud_html_vc_custom;WXUSINGDLL;WXMAKINGDLL_HTML"\r
Culture="1033"\r
- AdditionalIncludeDirectories="..\..\lib\vc_lib\mswu;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib"\r
+ AdditionalIncludeDirectories="..\..\lib\vc_dll\mswunivud;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib"\r
/>\r
<Tool\r
Name="VCPreLinkEventTool"\r
/>\r
<Tool\r
- Name="VCLibrarianTool"\r
- OutputFile="..\..\lib\vc_lib\wxmsw29u_html.lib"\r
+ Name="VCLinkerTool"\r
+ AdditionalOptions=""\r
+ AdditionalDependencies="wxtiffd.lib wxjpegd.lib wxpngd.lib wxzlibd.lib wxregexud.lib wxexpatd.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib ..\..\lib\vc_dll\wxmswuniv29ud_core.lib ..\..\lib\vc_dll\wxbase29ud.lib"\r
+ OutputFile="..\..\lib\vc_dll\wxmswuniv294ud_html_vc_custom.dll"\r
+ LinkIncremental="2"\r
+ ImportLibrary="..\..\lib\vc_dll\wxmswuniv29ud_html.lib"\r
SuppressStartupBanner="true"\r
+ AdditionalLibraryDirectories="..\..\lib\vc_dll"\r
+ GenerateManifest="true"\r
+ GenerateDebugInformation="true"\r
+ ProgramDatabaseFile="..\..\lib\vc_dll\wxmswuniv294ud_html_vc_custom.pdb"\r
+ TargetMachine="1"\r
/>\r
<Tool\r
Name="VCALinkTool"\r
/>\r
<Tool\r
Name="VCBscMakeTool"\r
- OutputFile="..\..\lib\vc_lib\wx_vc8_html.bsc"\r
+ OutputFile="..\..\lib\vc_dll\wx_vc8_html.bsc"\r
SuppressStartupBanner="true"\r
/>\r
<Tool\r
/>\r
</Configuration>\r
<Configuration\r
- Name="Debug|Win32"\r
- OutputDirectory="..\..\lib\vc_lib"\r
- IntermediateDirectory="vc_mswud\html"\r
- ConfigurationType="4"\r
+ Name="DLL Universal Release|Win32"\r
+ OutputDirectory="..\..\lib\vc_dll"\r
+ IntermediateDirectory="vc_mswunivudll\html"\r
+ ConfigurationType="2"\r
UseOfMFC="0"\r
ATLMinimizesCRunTimeLibraryUsage="false"\r
CharacterSet="1"\r
/>\r
<Tool\r
Name="VCMIDLTool"\r
+ PreprocessorDefinitions="WIN32;_USRDLL;DLL_EXPORTS;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;__WXUNIVERSAL__;NDEBUG;_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
<Tool\r
Name="VCCLCompilerTool"\r
- Optimization="0"\r
- AdditionalIncludeDirectories="..\..\lib\vc_lib\mswud;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib"\r
- PreprocessorDefinitions="_LIB;_DEBUG;__WXMSW__;__WXDEBUG__;_UNICODE;WXBUILDING"\r
- MinimalRebuild="true"\r
+ Optimization="2"\r
+ AdditionalIncludeDirectories="..\..\lib\vc_dll\mswunivu;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib"\r
+ PreprocessorDefinitions="WIN32;_USRDLL;DLL_EXPORTS;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;__WXUNIVERSAL__;NDEBUG;_UNICODE;WXBUILDING;WXUSINGDLL;WXMAKINGDLL_HTML"\r
ExceptionHandling="1"\r
- BasicRuntimeChecks="3"\r
- RuntimeLibrary="3"\r
- BufferSecurityCheck="true"\r
+ RuntimeLibrary="2"\r
RuntimeTypeInfo="true"\r
UsePrecompiledHeader="2"\r
PrecompiledHeaderThrough="wx/wxprec.h"\r
- PrecompiledHeaderFile="vc_mswud\wxprec_htmllib.pch"\r
- AssemblerListingLocation="vc_mswud\html\"\r
- ObjectFile="vc_mswud\html\"\r
- ProgramDataBaseFileName="..\..\lib\vc_lib\wxmsw29ud_html.pdb"\r
+ PrecompiledHeaderFile="vc_mswunivudll\wxprec_htmldll.pch"\r
+ ObjectFile="vc_mswunivudll\html\"\r
+ ProgramDataBaseFileName="..\..\lib\vc_dll\wxmswuniv294u_html_vc_custom.pdb"\r
WarningLevel="4"\r
SuppressStartupBanner="true"\r
Detect64BitPortabilityProblems="true"\r
/>\r
<Tool\r
Name="VCResourceCompilerTool"\r
- PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXDEBUG__;_UNICODE;WXBUILDING"\r
+ PreprocessorDefinitions="_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;__WXUNIVERSAL__;NDEBUG;_UNICODE;WXBUILDING;WXDLLNAME=wxmswuniv294u_html_vc_custom;WXUSINGDLL;WXMAKINGDLL_HTML"\r
Culture="1033"\r
- AdditionalIncludeDirectories="..\..\lib\vc_lib\mswud;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib"\r
+ AdditionalIncludeDirectories="..\..\lib\vc_dll\mswunivu;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib"\r
/>\r
<Tool\r
Name="VCPreLinkEventTool"\r
/>\r
<Tool\r
- Name="VCLibrarianTool"\r
- OutputFile="..\..\lib\vc_lib\wxmsw29ud_html.lib"\r
+ Name="VCLinkerTool"\r
+ 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\wxmswuniv294u_html_vc_custom.dll"\r
+ LinkIncremental="1"\r
+ ImportLibrary="..\..\lib\vc_dll\wxmswuniv29u_html.lib"\r
SuppressStartupBanner="true"\r
+ AdditionalLibraryDirectories="..\..\lib\vc_dll"\r
+ GenerateManifest="true"\r
+ GenerateDebugInformation="true"\r
+ ProgramDatabaseFile="..\..\lib\vc_dll\wxmswuniv294u_html_vc_custom.pdb"\r
+ TargetMachine="1"\r
+ OptimizeReferences="2"\r
+ EnableCOMDATFolding="2"\r
/>\r
<Tool\r
Name="VCALinkTool"\r
/>\r
<Tool\r
Name="VCBscMakeTool"\r
- OutputFile="..\..\lib\vc_lib\wx_vc8_html.bsc"\r
+ OutputFile="..\..\lib\vc_dll\wx_vc8_html.bsc"\r
SuppressStartupBanner="true"\r
/>\r
<Tool\r
RelativePath="..\..\src\common\dummy.cpp"\r
>\r
<FileConfiguration\r
- Name="DLL Universal Release|Win32"\r
+ Name="Debug|Win32"\r
>\r
<Tool\r
Name="VCCLCompilerTool"\r
/>\r
</FileConfiguration>\r
<FileConfiguration\r
- Name="DLL Universal Debug|Win32"\r
+ Name="Release|Win32"\r
>\r
<Tool\r
Name="VCCLCompilerTool"\r
/>\r
</FileConfiguration>\r
<FileConfiguration\r
- Name="DLL Release|Win32"\r
+ Name="Universal Debug|Win32"\r
>\r
<Tool\r
Name="VCCLCompilerTool"\r
/>\r
</FileConfiguration>\r
<FileConfiguration\r
- Name="DLL Debug|Win32"\r
+ Name="Universal Release|Win32"\r
>\r
<Tool\r
Name="VCCLCompilerTool"\r
/>\r
</FileConfiguration>\r
<FileConfiguration\r
- Name="Universal Release|Win32"\r
+ Name="DLL Debug|Win32"\r
>\r
<Tool\r
Name="VCCLCompilerTool"\r
/>\r
</FileConfiguration>\r
<FileConfiguration\r
- Name="Universal Debug|Win32"\r
+ Name="DLL Release|Win32"\r
>\r
<Tool\r
Name="VCCLCompilerTool"\r
/>\r
</FileConfiguration>\r
<FileConfiguration\r
- Name="Release|Win32"\r
+ Name="DLL Universal Debug|Win32"\r
>\r
<Tool\r
Name="VCCLCompilerTool"\r
/>\r
</FileConfiguration>\r
<FileConfiguration\r
- Name="Debug|Win32"\r
+ Name="DLL Universal Release|Win32"\r
>\r
<Tool\r
Name="VCCLCompilerTool"\r
RelativePath="..\..\src\msw\version.rc"\r
>\r
<FileConfiguration\r
- Name="Universal Release|Win32"\r
+ Name="Debug|Win32"\r
ExcludedFromBuild="true"\r
/>\r
<FileConfiguration\r
- Name="Universal Debug|Win32"\r
+ Name="Release|Win32"\r
ExcludedFromBuild="true"\r
/>\r
<FileConfiguration\r
- Name="Release|Win32"\r
+ Name="Universal Debug|Win32"\r
ExcludedFromBuild="true"\r
/>\r
<FileConfiguration\r
- Name="Debug|Win32"\r
+ Name="Universal Release|Win32"\r
ExcludedFromBuild="true"\r
/>\r
</File>\r
RelativePath="..\..\src\html\m_pre.cpp"\r
>\r
</File>\r
+ <File\r
+ RelativePath="..\..\src\html\m_span.cpp"\r
+ >\r
+ </File>\r
<File\r
RelativePath="..\..\src\html\m_style.cpp"\r
>\r
RelativePath="..\..\src\html\m_tables.cpp"\r
>\r
</File>\r
+ <File\r
+ RelativePath="..\..\src\html\styleparams.cpp"\r
+ >\r
+ </File>\r
<File\r
RelativePath="..\..\src\html\winpars.cpp"\r
>\r
RelativePath="..\..\include\wx\msw\setup.h"\r
>\r
<FileConfiguration\r
- Name="DLL Universal Release|Win32"\r
- />\r
- <FileConfiguration\r
- Name="DLL Universal Debug|Win32"\r
- />\r
- <FileConfiguration\r
- Name="DLL Release|Win32"\r
+ Name="Debug|Win32"\r
>\r
<Tool\r
Name="VCCustomBuildTool"\r
- Description="Creating ..\..\lib\vc_dll\mswu\wx\setup.h"\r
- CommandLine="copy "$(InputPath)" ..\..\lib\vc_dll\mswu\wx\setup.h"\r
- Outputs="..\..\lib\vc_dll\mswu\wx\setup.h"\r
- AdditionalDependencies=""$(INTDIR)" "$(OUTDIR)""\r
+ Description="Creating ..\..\lib\vc_lib\mswud\wx\setup.h"\r
+ CommandLine="copy "$(InputPath)" ..\..\lib\vc_lib\mswud\wx\setup.h"\r
+ Outputs="..\..\lib\vc_lib\mswud\wx\setup.h"\r
/>\r
</FileConfiguration>\r
<FileConfiguration\r
- Name="DLL Debug|Win32"\r
+ Name="Release|Win32"\r
>\r
<Tool\r
Name="VCCustomBuildTool"\r
- Description="Creating ..\..\lib\vc_dll\mswud\wx\setup.h"\r
- CommandLine="copy "$(InputPath)" ..\..\lib\vc_dll\mswud\wx\setup.h"\r
- Outputs="..\..\lib\vc_dll\mswud\wx\setup.h"\r
- AdditionalDependencies=""$(INTDIR)" "$(OUTDIR)""\r
+ Description="Creating ..\..\lib\vc_lib\mswu\wx\setup.h"\r
+ CommandLine="copy "$(InputPath)" ..\..\lib\vc_lib\mswu\wx\setup.h"\r
+ Outputs="..\..\lib\vc_lib\mswu\wx\setup.h"\r
/>\r
</FileConfiguration>\r
<FileConfiguration\r
- Name="Universal Release|Win32"\r
+ Name="Universal Debug|Win32"\r
/>\r
<FileConfiguration\r
- Name="Universal Debug|Win32"\r
+ Name="Universal Release|Win32"\r
/>\r
<FileConfiguration\r
- Name="Release|Win32"\r
+ Name="DLL Debug|Win32"\r
>\r
<Tool\r
Name="VCCustomBuildTool"\r
- Description="Creating ..\..\lib\vc_lib\mswu\wx\setup.h"\r
- CommandLine="copy "$(InputPath)" ..\..\lib\vc_lib\mswu\wx\setup.h"\r
- Outputs="..\..\lib\vc_lib\mswu\wx\setup.h"\r
- AdditionalDependencies=""$(INTDIR)" "$(OUTDIR)""\r
+ Description="Creating ..\..\lib\vc_dll\mswud\wx\setup.h"\r
+ CommandLine="copy "$(InputPath)" ..\..\lib\vc_dll\mswud\wx\setup.h"\r
+ Outputs="..\..\lib\vc_dll\mswud\wx\setup.h"\r
/>\r
</FileConfiguration>\r
<FileConfiguration\r
- Name="Debug|Win32"\r
+ Name="DLL Release|Win32"\r
>\r
<Tool\r
Name="VCCustomBuildTool"\r
- Description="Creating ..\..\lib\vc_lib\mswud\wx\setup.h"\r
- CommandLine="copy "$(InputPath)" ..\..\lib\vc_lib\mswud\wx\setup.h"\r
- Outputs="..\..\lib\vc_lib\mswud\wx\setup.h"\r
- AdditionalDependencies=""$(INTDIR)" "$(OUTDIR)""\r
+ Description="Creating ..\..\lib\vc_dll\mswu\wx\setup.h"\r
+ CommandLine="copy "$(InputPath)" ..\..\lib\vc_dll\mswu\wx\setup.h"\r
+ Outputs="..\..\lib\vc_dll\mswu\wx\setup.h"\r
/>\r
</FileConfiguration>\r
+ <FileConfiguration\r
+ Name="DLL Universal Debug|Win32"\r
+ />\r
+ <FileConfiguration\r
+ Name="DLL Universal Release|Win32"\r
+ />\r
</File>\r
<File\r
RelativePath="..\..\include\wx\univ\setup.h"\r
>\r
<FileConfiguration\r
- Name="DLL Universal Release|Win32"\r
+ Name="Debug|Win32"\r
+ />\r
+ <FileConfiguration\r
+ Name="Release|Win32"\r
+ />\r
+ <FileConfiguration\r
+ Name="Universal Debug|Win32"\r
>\r
<Tool\r
Name="VCCustomBuildTool"\r
- Description="Creating ..\..\lib\vc_dll\mswunivu\wx\setup.h"\r
- CommandLine="copy "$(InputPath)" ..\..\lib\vc_dll\mswunivu\wx\setup.h"\r
- Outputs="..\..\lib\vc_dll\mswunivu\wx\setup.h"\r
- AdditionalDependencies=""$(INTDIR)" "$(OUTDIR)""\r
+ Description="Creating ..\..\lib\vc_lib\mswunivud\wx\setup.h"\r
+ CommandLine="copy "$(InputPath)" ..\..\lib\vc_lib\mswunivud\wx\setup.h"\r
+ Outputs="..\..\lib\vc_lib\mswunivud\wx\setup.h"\r
/>\r
</FileConfiguration>\r
<FileConfiguration\r
- Name="DLL Universal Debug|Win32"\r
+ Name="Universal Release|Win32"\r
>\r
<Tool\r
Name="VCCustomBuildTool"\r
- Description="Creating ..\..\lib\vc_dll\mswunivud\wx\setup.h"\r
- CommandLine="copy "$(InputPath)" ..\..\lib\vc_dll\mswunivud\wx\setup.h"\r
- Outputs="..\..\lib\vc_dll\mswunivud\wx\setup.h"\r
- AdditionalDependencies=""$(INTDIR)" "$(OUTDIR)""\r
+ Description="Creating ..\..\lib\vc_lib\mswunivu\wx\setup.h"\r
+ CommandLine="copy "$(InputPath)" ..\..\lib\vc_lib\mswunivu\wx\setup.h"\r
+ Outputs="..\..\lib\vc_lib\mswunivu\wx\setup.h"\r
/>\r
</FileConfiguration>\r
<FileConfiguration\r
- Name="DLL Release|Win32"\r
+ Name="DLL Debug|Win32"\r
/>\r
<FileConfiguration\r
- Name="DLL Debug|Win32"\r
+ Name="DLL Release|Win32"\r
/>\r
<FileConfiguration\r
- Name="Universal Release|Win32"\r
+ Name="DLL Universal Debug|Win32"\r
>\r
<Tool\r
Name="VCCustomBuildTool"\r
- Description="Creating ..\..\lib\vc_lib\mswunivu\wx\setup.h"\r
- CommandLine="copy "$(InputPath)" ..\..\lib\vc_lib\mswunivu\wx\setup.h"\r
- Outputs="..\..\lib\vc_lib\mswunivu\wx\setup.h"\r
- AdditionalDependencies=""$(INTDIR)" "$(OUTDIR)""\r
+ Description="Creating ..\..\lib\vc_dll\mswunivud\wx\setup.h"\r
+ CommandLine="copy "$(InputPath)" ..\..\lib\vc_dll\mswunivud\wx\setup.h"\r
+ Outputs="..\..\lib\vc_dll\mswunivud\wx\setup.h"\r
/>\r
</FileConfiguration>\r
<FileConfiguration\r
- Name="Universal Debug|Win32"\r
+ Name="DLL Universal Release|Win32"\r
>\r
<Tool\r
Name="VCCustomBuildTool"\r
- Description="Creating ..\..\lib\vc_lib\mswunivud\wx\setup.h"\r
- CommandLine="copy "$(InputPath)" ..\..\lib\vc_lib\mswunivud\wx\setup.h"\r
- Outputs="..\..\lib\vc_lib\mswunivud\wx\setup.h"\r
- AdditionalDependencies=""$(INTDIR)" "$(OUTDIR)""\r
+ Description="Creating ..\..\lib\vc_dll\mswunivu\wx\setup.h"\r
+ CommandLine="copy "$(InputPath)" ..\..\lib\vc_dll\mswunivu\wx\setup.h"\r
+ Outputs="..\..\lib\vc_dll\mswunivu\wx\setup.h"\r
/>\r
</FileConfiguration>\r
- <FileConfiguration\r
- Name="Release|Win32"\r
- />\r
- <FileConfiguration\r
- Name="Debug|Win32"\r
- />\r
</File>\r
</Filter>\r
<Filter\r
RelativePath="..\..\include\wx\msw\genrcdefs.h"\r
>\r
<FileConfiguration\r
- Name="DLL Universal Release|Win32"\r
+ Name="Debug|Win32"\r
>\r
<Tool\r
Name="VCCustomBuildTool"\r
- Description="Creating ..\..\lib\vc_dll\mswunivu\wx\msw\rcdefs.h"\r
- CommandLine="cl /EP /nologo "$(InputPath)" > "..\..\lib\vc_dll\mswunivu\wx\msw\rcdefs.h""\r
- Outputs="..\..\lib\vc_dll\mswunivu\wx\msw\rcdefs.h"\r
- AdditionalDependencies=""..\..\lib\vc_dll\mswunivu\wx\msw""\r
+ Description="Creating ..\..\lib\vc_lib\mswud\wx\msw\rcdefs.h"\r
+ CommandLine="cl /EP /nologo "$(InputPath)" > "..\..\lib\vc_lib\mswud\wx\msw\rcdefs.h""\r
+ Outputs="..\..\lib\vc_lib\mswud\wx\msw\rcdefs.h"\r
+ AdditionalDependencies=""..\..\lib\vc_lib\mswud\wx\msw""\r
/>\r
</FileConfiguration>\r
<FileConfiguration\r
- Name="DLL Universal Debug|Win32"\r
+ Name="Release|Win32"\r
>\r
<Tool\r
Name="VCCustomBuildTool"\r
- Description="Creating ..\..\lib\vc_dll\mswunivud\wx\msw\rcdefs.h"\r
- CommandLine="cl /EP /nologo "$(InputPath)" > "..\..\lib\vc_dll\mswunivud\wx\msw\rcdefs.h""\r
- Outputs="..\..\lib\vc_dll\mswunivud\wx\msw\rcdefs.h"\r
- AdditionalDependencies=""..\..\lib\vc_dll\mswunivud\wx\msw""\r
+ Description="Creating ..\..\lib\vc_lib\mswu\wx\msw\rcdefs.h"\r
+ CommandLine="cl /EP /nologo "$(InputPath)" > "..\..\lib\vc_lib\mswu\wx\msw\rcdefs.h""\r
+ Outputs="..\..\lib\vc_lib\mswu\wx\msw\rcdefs.h"\r
+ AdditionalDependencies=""..\..\lib\vc_lib\mswu\wx\msw""\r
/>\r
</FileConfiguration>\r
<FileConfiguration\r
- Name="DLL Release|Win32"\r
+ Name="Universal Debug|Win32"\r
>\r
<Tool\r
Name="VCCustomBuildTool"\r
- Description="Creating ..\..\lib\vc_dll\mswu\wx\msw\rcdefs.h"\r
- CommandLine="cl /EP /nologo "$(InputPath)" > "..\..\lib\vc_dll\mswu\wx\msw\rcdefs.h""\r
- Outputs="..\..\lib\vc_dll\mswu\wx\msw\rcdefs.h"\r
- AdditionalDependencies=""..\..\lib\vc_dll\mswu\wx\msw""\r
+ Description="Creating ..\..\lib\vc_lib\mswunivud\wx\msw\rcdefs.h"\r
+ CommandLine="cl /EP /nologo "$(InputPath)" > "..\..\lib\vc_lib\mswunivud\wx\msw\rcdefs.h""\r
+ Outputs="..\..\lib\vc_lib\mswunivud\wx\msw\rcdefs.h"\r
+ AdditionalDependencies=""..\..\lib\vc_lib\mswunivud\wx\msw""\r
/>\r
</FileConfiguration>\r
<FileConfiguration\r
- Name="DLL Debug|Win32"\r
+ Name="Universal Release|Win32"\r
>\r
<Tool\r
Name="VCCustomBuildTool"\r
- Description="Creating ..\..\lib\vc_dll\mswud\wx\msw\rcdefs.h"\r
- CommandLine="cl /EP /nologo "$(InputPath)" > "..\..\lib\vc_dll\mswud\wx\msw\rcdefs.h""\r
- Outputs="..\..\lib\vc_dll\mswud\wx\msw\rcdefs.h"\r
- AdditionalDependencies=""..\..\lib\vc_dll\mswud\wx\msw""\r
+ Description="Creating ..\..\lib\vc_lib\mswunivu\wx\msw\rcdefs.h"\r
+ CommandLine="cl /EP /nologo "$(InputPath)" > "..\..\lib\vc_lib\mswunivu\wx\msw\rcdefs.h""\r
+ Outputs="..\..\lib\vc_lib\mswunivu\wx\msw\rcdefs.h"\r
+ AdditionalDependencies=""..\..\lib\vc_lib\mswunivu\wx\msw""\r
/>\r
</FileConfiguration>\r
<FileConfiguration\r
- Name="Universal Release|Win32"\r
+ Name="DLL Debug|Win32"\r
>\r
<Tool\r
Name="VCCustomBuildTool"\r
- Description="Creating ..\..\lib\vc_lib\mswunivu\wx\msw\rcdefs.h"\r
- CommandLine="cl /EP /nologo "$(InputPath)" > "..\..\lib\vc_lib\mswunivu\wx\msw\rcdefs.h""\r
- Outputs="..\..\lib\vc_lib\mswunivu\wx\msw\rcdefs.h"\r
- AdditionalDependencies=""..\..\lib\vc_lib\mswunivu\wx\msw""\r
+ Description="Creating ..\..\lib\vc_dll\mswud\wx\msw\rcdefs.h"\r
+ CommandLine="cl /EP /nologo "$(InputPath)" > "..\..\lib\vc_dll\mswud\wx\msw\rcdefs.h""\r
+ Outputs="..\..\lib\vc_dll\mswud\wx\msw\rcdefs.h"\r
+ AdditionalDependencies=""..\..\lib\vc_dll\mswud\wx\msw""\r
/>\r
</FileConfiguration>\r
<FileConfiguration\r
- Name="Universal Debug|Win32"\r
+ Name="DLL Release|Win32"\r
>\r
<Tool\r
Name="VCCustomBuildTool"\r
- Description="Creating ..\..\lib\vc_lib\mswunivud\wx\msw\rcdefs.h"\r
- CommandLine="cl /EP /nologo "$(InputPath)" > "..\..\lib\vc_lib\mswunivud\wx\msw\rcdefs.h""\r
- Outputs="..\..\lib\vc_lib\mswunivud\wx\msw\rcdefs.h"\r
- AdditionalDependencies=""..\..\lib\vc_lib\mswunivud\wx\msw""\r
+ Description="Creating ..\..\lib\vc_dll\mswu\wx\msw\rcdefs.h"\r
+ CommandLine="cl /EP /nologo "$(InputPath)" > "..\..\lib\vc_dll\mswu\wx\msw\rcdefs.h""\r
+ Outputs="..\..\lib\vc_dll\mswu\wx\msw\rcdefs.h"\r
+ AdditionalDependencies=""..\..\lib\vc_dll\mswu\wx\msw""\r
/>\r
</FileConfiguration>\r
<FileConfiguration\r
- Name="Release|Win32"\r
+ Name="DLL Universal Debug|Win32"\r
>\r
<Tool\r
Name="VCCustomBuildTool"\r
- Description="Creating ..\..\lib\vc_lib\mswu\wx\msw\rcdefs.h"\r
- CommandLine="cl /EP /nologo "$(InputPath)" > "..\..\lib\vc_lib\mswu\wx\msw\rcdefs.h""\r
- Outputs="..\..\lib\vc_lib\mswu\wx\msw\rcdefs.h"\r
- AdditionalDependencies=""..\..\lib\vc_lib\mswu\wx\msw""\r
+ Description="Creating ..\..\lib\vc_dll\mswunivud\wx\msw\rcdefs.h"\r
+ CommandLine="cl /EP /nologo "$(InputPath)" > "..\..\lib\vc_dll\mswunivud\wx\msw\rcdefs.h""\r
+ Outputs="..\..\lib\vc_dll\mswunivud\wx\msw\rcdefs.h"\r
+ AdditionalDependencies=""..\..\lib\vc_dll\mswunivud\wx\msw""\r
/>\r
</FileConfiguration>\r
<FileConfiguration\r
- Name="Debug|Win32"\r
+ Name="DLL Universal Release|Win32"\r
>\r
<Tool\r
Name="VCCustomBuildTool"\r
- Description="Creating ..\..\lib\vc_lib\mswud\wx\msw\rcdefs.h"\r
- CommandLine="cl /EP /nologo "$(InputPath)" > "..\..\lib\vc_lib\mswud\wx\msw\rcdefs.h""\r
- Outputs="..\..\lib\vc_lib\mswud\wx\msw\rcdefs.h"\r
- AdditionalDependencies=""..\..\lib\vc_lib\mswud\wx\msw""\r
+ Description="Creating ..\..\lib\vc_dll\mswunivu\wx\msw\rcdefs.h"\r
+ CommandLine="cl /EP /nologo "$(InputPath)" > "..\..\lib\vc_dll\mswunivu\wx\msw\rcdefs.h""\r
+ Outputs="..\..\lib\vc_dll\mswunivu\wx\msw\rcdefs.h"\r
+ AdditionalDependencies=""..\..\lib\vc_dll\mswunivu\wx\msw""\r
/>\r
</FileConfiguration>\r
</File>\r
RelativePath="..\..\include\wx\html\m_templ.h"\r
>\r
</File>\r
+ <File\r
+ RelativePath="..\..\include\wx\html\styleparams.h"\r
+ >\r
+ </File>\r
<File\r
RelativePath="..\..\include\wx\html\winpars.h"\r
>\r
projects / wxWidgets.git / blobdiff