Skip to content

Commit

Permalink
More version change related changes to the generated files.
Browse files Browse the repository at this point in the history 
Somehow not all files seem to have been regenerated after version.bkl change.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@75270 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
  • Loading branch information
@vadz
vadz committed Nov 23, 2013
1 parent 7439c09 commit 7684504
Show file tree
Hide file tree
Showing 503 changed files with 1,736 additions and 1,728 deletions.
311 changes: 156 additions & 155 deletions build/msw/makefile.bcc
View file

Large diffs are not rendered by default.

141 changes: 71 additions & 70 deletions build/msw/makefile.gcc
View file

Large diffs are not rendered by default.

281 changes: 141 additions & 140 deletions build/msw/makefile.vc
View file

Large diffs are not rendered by default.

141 changes: 71 additions & 70 deletions build/msw/makefile.wat
View file

Large diffs are not rendered by default.

32 changes: 16 additions & 16 deletions build/msw/wx_vc7_adv.vcproj
View file
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,7 @@
PrecompiledHeaderThrough="wx/wxprec.h"
PrecompiledHeaderFile="vc_mswud\wxprec_advlib.pch"
ObjectFile="vc_mswud\adv\"
ProgramDataBaseFileName="..\..\lib\vc_lib\wxmsw30ud_adv.pdb"
ProgramDataBaseFileName="..\..\lib\vc_lib\wxmsw31ud_adv.pdb"
WarningLevel="4"
SuppressStartupBanner="TRUE"
Detect64BitPortabilityProblems="TRUE"
Expand All @@ -48,7 +48,7 @@
Name="VCCustomBuildTool"/>
<Tool
Name="VCLibrarianTool"
OutputFile="..\..\lib\vc_lib\wxmsw30ud_adv.lib"
OutputFile="..\..\lib\vc_lib\wxmsw31ud_adv.lib"
SuppressStartupBanner="TRUE"/>
<Tool
Name="VCMIDLTool"
Expand Down Expand Up @@ -96,7 +96,7 @@
PrecompiledHeaderThrough="wx/wxprec.h"
PrecompiledHeaderFile="vc_mswu\wxprec_advlib.pch"
ObjectFile="vc_mswu\adv\"
ProgramDataBaseFileName="..\..\lib\vc_lib\wxmsw30u_adv.pdb"
ProgramDataBaseFileName="..\..\lib\vc_lib\wxmsw31u_adv.pdb"
WarningLevel="4"
SuppressStartupBanner="TRUE"
Detect64BitPortabilityProblems="TRUE"
Expand All @@ -105,7 +105,7 @@
Name="VCCustomBuildTool"/>
<Tool
Name="VCLibrarianTool"
OutputFile="..\..\lib\vc_lib\wxmsw30u_adv.lib"
OutputFile="..\..\lib\vc_lib\wxmsw31u_adv.lib"
SuppressStartupBanner="TRUE"/>
<Tool
Name="VCMIDLTool"
Expand Down Expand Up @@ -156,7 +156,7 @@
PrecompiledHeaderThrough="wx/wxprec.h"
PrecompiledHeaderFile="vc_mswuddll\wxprec_advdll.pch"
ObjectFile="vc_mswuddll\adv\"
ProgramDataBaseFileName="..\..\lib\vc_dll\wxmsw30ud_adv_vc_custom.pdb"
ProgramDataBaseFileName="..\..\lib\vc_dll\wxmsw310ud_adv_vc_custom.pdb"
WarningLevel="4"
SuppressStartupBanner="TRUE"
Detect64BitPortabilityProblems="TRUE"
Expand All @@ -166,14 +166,14 @@
<Tool
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\wxmsw30ud_core.lib ..\..\lib\vc_dll\wxbase30ud.lib"
OutputFile="..\..\lib\vc_dll\wxmsw30ud_adv_vc_custom.dll"
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\wxmsw31ud_core.lib ..\..\lib\vc_dll\wxbase31ud.lib"
OutputFile="..\..\lib\vc_dll\wxmsw310ud_adv_vc_custom.dll"
LinkIncremental="2"
ImportLibrary="..\..\lib\vc_dll\wxmsw30ud_adv.lib"
ImportLibrary="..\..\lib\vc_dll\wxmsw31ud_adv.lib"
SuppressStartupBanner="TRUE"
AdditionalLibraryDirectories="..\..\lib\vc_dll"
GenerateDebugInformation="TRUE"
ProgramDatabaseFile="..\..\lib\vc_dll\wxmsw30ud_adv_vc_custom.pdb"
ProgramDatabaseFile="..\..\lib\vc_dll\wxmsw310ud_adv_vc_custom.pdb"
TargetMachine="1"/>
<Tool
Name="VCMIDLTool"
Expand All @@ -187,7 +187,7 @@
Name="VCPreLinkEventTool"/>
<Tool
Name="VCResourceCompilerTool"
PreprocessorDefinitions="_DEBUG;__WXMSW__;_UNICODE;WXBUILDING;WXDLLNAME=wxmsw30ud_adv_vc_custom;WXUSINGDLL;WXMAKINGDLL_ADV"
PreprocessorDefinitions="_DEBUG;__WXMSW__;_UNICODE;WXBUILDING;WXDLLNAME=wxmsw310ud_adv_vc_custom;WXUSINGDLL;WXMAKINGDLL_ADV"
Culture="1033"
AdditionalIncludeDirectories="..\..\lib\vc_dll\mswud;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib"/>
<Tool
Expand Down Expand Up @@ -221,7 +221,7 @@
PrecompiledHeaderThrough="wx/wxprec.h"
PrecompiledHeaderFile="vc_mswudll\wxprec_advdll.pch"
ObjectFile="vc_mswudll\adv\"
ProgramDataBaseFileName="..\..\lib\vc_dll\wxmsw30u_adv_vc_custom.pdb"
ProgramDataBaseFileName="..\..\lib\vc_dll\wxmsw310u_adv_vc_custom.pdb"
WarningLevel="4"
SuppressStartupBanner="TRUE"
Detect64BitPortabilityProblems="TRUE"
Expand All @@ -231,14 +231,14 @@
<Tool
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\wxmsw30u_core.lib ..\..\lib\vc_dll\wxbase30u.lib"
OutputFile="..\..\lib\vc_dll\wxmsw30u_adv_vc_custom.dll"
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\wxmsw31u_core.lib ..\..\lib\vc_dll\wxbase31u.lib"
OutputFile="..\..\lib\vc_dll\wxmsw310u_adv_vc_custom.dll"
LinkIncremental="1"
ImportLibrary="..\..\lib\vc_dll\wxmsw30u_adv.lib"
ImportLibrary="..\..\lib\vc_dll\wxmsw31u_adv.lib"
SuppressStartupBanner="TRUE"
AdditionalLibraryDirectories="..\..\lib\vc_dll"
GenerateDebugInformation="TRUE"
ProgramDatabaseFile="..\..\lib\vc_dll\wxmsw30u_adv_vc_custom.pdb"
ProgramDatabaseFile="..\..\lib\vc_dll\wxmsw310u_adv_vc_custom.pdb"
TargetMachine="1"
OptimizeReferences="2"
EnableCOMDATFolding="2"/>
Expand All @@ -254,7 +254,7 @@
Name="VCPreLinkEventTool"/>
<Tool
Name="VCResourceCompilerTool"
PreprocessorDefinitions="__WXMSW__;NDEBUG;_UNICODE;WXBUILDING;WXDLLNAME=wxmsw30u_adv_vc_custom;WXUSINGDLL;WXMAKINGDLL_ADV"
PreprocessorDefinitions="__WXMSW__;NDEBUG;_UNICODE;WXBUILDING;WXDLLNAME=wxmsw310u_adv_vc_custom;WXUSINGDLL;WXMAKINGDLL_ADV"
Culture="1033"
AdditionalIncludeDirectories="..\..\lib\vc_dll\mswu;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib"/>
<Tool
Expand Down
32 changes: 16 additions & 16 deletions build/msw/wx_vc7_aui.vcproj
View file
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,7 @@
PrecompiledHeaderThrough="wx/wxprec.h"
PrecompiledHeaderFile="vc_mswud\wxprec_auilib.pch"
ObjectFile="vc_mswud\aui\"
ProgramDataBaseFileName="..\..\lib\vc_lib\wxmsw30ud_aui.pdb"
ProgramDataBaseFileName="..\..\lib\vc_lib\wxmsw31ud_aui.pdb"
WarningLevel="4"
SuppressStartupBanner="TRUE"
Detect64BitPortabilityProblems="TRUE"
Expand All @@ -48,7 +48,7 @@
Name="VCCustomBuildTool"/>
<Tool
Name="VCLibrarianTool"
OutputFile="..\..\lib\vc_lib\wxmsw30ud_aui.lib"
OutputFile="..\..\lib\vc_lib\wxmsw31ud_aui.lib"
SuppressStartupBanner="TRUE"/>
<Tool
Name="VCMIDLTool"
Expand Down Expand Up @@ -96,7 +96,7 @@
PrecompiledHeaderThrough="wx/wxprec.h"
PrecompiledHeaderFile="vc_mswu\wxprec_auilib.pch"
ObjectFile="vc_mswu\aui\"
ProgramDataBaseFileName="..\..\lib\vc_lib\wxmsw30u_aui.pdb"
ProgramDataBaseFileName="..\..\lib\vc_lib\wxmsw31u_aui.pdb"
WarningLevel="4"
SuppressStartupBanner="TRUE"
Detect64BitPortabilityProblems="TRUE"
Expand All @@ -105,7 +105,7 @@
Name="VCCustomBuildTool"/>
<Tool
Name="VCLibrarianTool"
OutputFile="..\..\lib\vc_lib\wxmsw30u_aui.lib"
OutputFile="..\..\lib\vc_lib\wxmsw31u_aui.lib"
SuppressStartupBanner="TRUE"/>
<Tool
Name="VCMIDLTool"
Expand Down Expand Up @@ -156,7 +156,7 @@
PrecompiledHeaderThrough="wx/wxprec.h"
PrecompiledHeaderFile="vc_mswuddll\wxprec_auidll.pch"
ObjectFile="vc_mswuddll\aui\"
ProgramDataBaseFileName="..\..\lib\vc_dll\wxmsw30ud_aui_vc_custom.pdb"
ProgramDataBaseFileName="..\..\lib\vc_dll\wxmsw310ud_aui_vc_custom.pdb"
WarningLevel="4"
SuppressStartupBanner="TRUE"
Detect64BitPortabilityProblems="TRUE"
Expand All @@ -166,14 +166,14 @@
<Tool
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\wxmsw30ud_adv.lib ..\..\lib\vc_dll\wxmsw30ud_core.lib ..\..\lib\vc_dll\wxbase30ud.lib"
OutputFile="..\..\lib\vc_dll\wxmsw30ud_aui_vc_custom.dll"
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\wxmsw31ud_adv.lib ..\..\lib\vc_dll\wxmsw31ud_core.lib ..\..\lib\vc_dll\wxbase31ud.lib"
OutputFile="..\..\lib\vc_dll\wxmsw310ud_aui_vc_custom.dll"
LinkIncremental="2"
ImportLibrary="..\..\lib\vc_dll\wxmsw30ud_aui.lib"
ImportLibrary="..\..\lib\vc_dll\wxmsw31ud_aui.lib"
SuppressStartupBanner="TRUE"
AdditionalLibraryDirectories="..\..\lib\vc_dll"
GenerateDebugInformation="TRUE"
ProgramDatabaseFile="..\..\lib\vc_dll\wxmsw30ud_aui_vc_custom.pdb"
ProgramDatabaseFile="..\..\lib\vc_dll\wxmsw310ud_aui_vc_custom.pdb"
TargetMachine="1"/>
<Tool
Name="VCMIDLTool"
Expand All @@ -187,7 +187,7 @@
Name="VCPreLinkEventTool"/>
<Tool
Name="VCResourceCompilerTool"
PreprocessorDefinitions="_DEBUG;__WXMSW__;_UNICODE;WXBUILDING;WXDLLNAME=wxmsw30ud_aui_vc_custom;WXUSINGDLL;WXMAKINGDLL_AUI"
PreprocessorDefinitions="_DEBUG;__WXMSW__;_UNICODE;WXBUILDING;WXDLLNAME=wxmsw310ud_aui_vc_custom;WXUSINGDLL;WXMAKINGDLL_AUI"
Culture="1033"
AdditionalIncludeDirectories="..\..\lib\vc_dll\mswud;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib"/>
<Tool
Expand Down Expand Up @@ -221,7 +221,7 @@
PrecompiledHeaderThrough="wx/wxprec.h"
PrecompiledHeaderFile="vc_mswudll\wxprec_auidll.pch"
ObjectFile="vc_mswudll\aui\"
ProgramDataBaseFileName="..\..\lib\vc_dll\wxmsw30u_aui_vc_custom.pdb"
ProgramDataBaseFileName="..\..\lib\vc_dll\wxmsw310u_aui_vc_custom.pdb"
WarningLevel="4"
SuppressStartupBanner="TRUE"
Detect64BitPortabilityProblems="TRUE"
Expand All @@ -231,14 +231,14 @@
<Tool
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\wxmsw30u_adv.lib ..\..\lib\vc_dll\wxmsw30u_core.lib ..\..\lib\vc_dll\wxbase30u.lib"
OutputFile="..\..\lib\vc_dll\wxmsw30u_aui_vc_custom.dll"
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\wxmsw31u_adv.lib ..\..\lib\vc_dll\wxmsw31u_core.lib ..\..\lib\vc_dll\wxbase31u.lib"
OutputFile="..\..\lib\vc_dll\wxmsw310u_aui_vc_custom.dll"
LinkIncremental="1"
ImportLibrary="..\..\lib\vc_dll\wxmsw30u_aui.lib"
ImportLibrary="..\..\lib\vc_dll\wxmsw31u_aui.lib"
SuppressStartupBanner="TRUE"
AdditionalLibraryDirectories="..\..\lib\vc_dll"
GenerateDebugInformation="TRUE"
ProgramDatabaseFile="..\..\lib\vc_dll\wxmsw30u_aui_vc_custom.pdb"
ProgramDatabaseFile="..\..\lib\vc_dll\wxmsw310u_aui_vc_custom.pdb"
TargetMachine="1"
OptimizeReferences="2"
EnableCOMDATFolding="2"/>
Expand All @@ -254,7 +254,7 @@
Name="VCPreLinkEventTool"/>
<Tool
Name="VCResourceCompilerTool"
PreprocessorDefinitions="__WXMSW__;NDEBUG;_UNICODE;WXBUILDING;WXDLLNAME=wxmsw30u_aui_vc_custom;WXUSINGDLL;WXMAKINGDLL_AUI"
PreprocessorDefinitions="__WXMSW__;NDEBUG;_UNICODE;WXBUILDING;WXDLLNAME=wxmsw310u_aui_vc_custom;WXUSINGDLL;WXMAKINGDLL_AUI"
Culture="1033"
AdditionalIncludeDirectories="..\..\lib\vc_dll\mswu;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib"/>
<Tool
Expand Down
28 changes: 14 additions & 14 deletions build/msw/wx_vc7_base.vcproj
View file
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,7 @@
PrecompiledHeaderThrough="wx/wxprec.h"
PrecompiledHeaderFile="vc_mswud\wxprec_baselib.pch"
ObjectFile="vc_mswud\base\"
ProgramDataBaseFileName="..\..\lib\vc_lib\wxbase30ud.pdb"
ProgramDataBaseFileName="..\..\lib\vc_lib\wxbase31ud.pdb"
WarningLevel="4"
SuppressStartupBanner="TRUE"
Detect64BitPortabilityProblems="TRUE"
Expand All @@ -48,7 +48,7 @@
Name="VCCustomBuildTool"/>
<Tool
Name="VCLibrarianTool"
OutputFile="..\..\lib\vc_lib\wxbase30ud.lib"
OutputFile="..\..\lib\vc_lib\wxbase31ud.lib"
SuppressStartupBanner="TRUE"/>
<Tool
Name="VCMIDLTool"
Expand Down Expand Up @@ -96,7 +96,7 @@
PrecompiledHeaderThrough="wx/wxprec.h"
PrecompiledHeaderFile="vc_mswu\wxprec_baselib.pch"
ObjectFile="vc_mswu\base\"
ProgramDataBaseFileName="..\..\lib\vc_lib\wxbase30u.pdb"
ProgramDataBaseFileName="..\..\lib\vc_lib\wxbase31u.pdb"
WarningLevel="4"
SuppressStartupBanner="TRUE"
Detect64BitPortabilityProblems="TRUE"
Expand All @@ -105,7 +105,7 @@
Name="VCCustomBuildTool"/>
<Tool
Name="VCLibrarianTool"
OutputFile="..\..\lib\vc_lib\wxbase30u.lib"
OutputFile="..\..\lib\vc_lib\wxbase31u.lib"
SuppressStartupBanner="TRUE"/>
<Tool
Name="VCMIDLTool"
Expand Down Expand Up @@ -156,7 +156,7 @@
PrecompiledHeaderThrough="wx/wxprec.h"
PrecompiledHeaderFile="vc_mswuddll\wxprec_basedll.pch"
ObjectFile="vc_mswuddll\base\"
ProgramDataBaseFileName="..\..\lib\vc_dll\wxbase30ud_vc_custom.pdb"
ProgramDataBaseFileName="..\..\lib\vc_dll\wxbase310ud_vc_custom.pdb"
WarningLevel="4"
SuppressStartupBanner="TRUE"
Detect64BitPortabilityProblems="TRUE"
Expand All @@ -167,13 +167,13 @@
Name="VCLinkerTool"
AdditionalOptions=""
AdditionalDependencies="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"
OutputFile="..\..\lib\vc_dll\wxbase30ud_vc_custom.dll"
OutputFile="..\..\lib\vc_dll\wxbase310ud_vc_custom.dll"
LinkIncremental="2"
ImportLibrary="..\..\lib\vc_dll\wxbase30ud.lib"
ImportLibrary="..\..\lib\vc_dll\wxbase31ud.lib"
SuppressStartupBanner="TRUE"
AdditionalLibraryDirectories="..\..\lib\vc_dll"
GenerateDebugInformation="TRUE"
ProgramDatabaseFile="..\..\lib\vc_dll\wxbase30ud_vc_custom.pdb"
ProgramDatabaseFile="..\..\lib\vc_dll\wxbase310ud_vc_custom.pdb"
TargetMachine="1"/>
<Tool
Name="VCMIDLTool"
Expand All @@ -187,7 +187,7 @@
Name="VCPreLinkEventTool"/>
<Tool
Name="VCResourceCompilerTool"
PreprocessorDefinitions="_DEBUG;__WXMSW__;_UNICODE;WXBUILDING;WXDLLNAME=wxbase30ud_vc_custom;wxUSE_GUI=0;WXMAKINGDLL_BASE;wxUSE_BASE=1"
PreprocessorDefinitions="_DEBUG;__WXMSW__;_UNICODE;WXBUILDING;WXDLLNAME=wxbase310ud_vc_custom;wxUSE_GUI=0;WXMAKINGDLL_BASE;wxUSE_BASE=1"
Culture="1033"
AdditionalIncludeDirectories="..\..\lib\vc_dll\mswud;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib"/>
<Tool
Expand Down Expand Up @@ -221,7 +221,7 @@
PrecompiledHeaderThrough="wx/wxprec.h"
PrecompiledHeaderFile="vc_mswudll\wxprec_basedll.pch"
ObjectFile="vc_mswudll\base\"
ProgramDataBaseFileName="..\..\lib\vc_dll\wxbase30u_vc_custom.pdb"
ProgramDataBaseFileName="..\..\lib\vc_dll\wxbase310u_vc_custom.pdb"
WarningLevel="4"
SuppressStartupBanner="TRUE"
Detect64BitPortabilityProblems="TRUE"
Expand All @@ -232,13 +232,13 @@
Name="VCLinkerTool"
AdditionalOptions=""
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"
OutputFile="..\..\lib\vc_dll\wxbase30u_vc_custom.dll"
OutputFile="..\..\lib\vc_dll\wxbase310u_vc_custom.dll"
LinkIncremental="1"
ImportLibrary="..\..\lib\vc_dll\wxbase30u.lib"
ImportLibrary="..\..\lib\vc_dll\wxbase31u.lib"
SuppressStartupBanner="TRUE"
AdditionalLibraryDirectories="..\..\lib\vc_dll"
GenerateDebugInformation="TRUE"
ProgramDatabaseFile="..\..\lib\vc_dll\wxbase30u_vc_custom.pdb"
ProgramDatabaseFile="..\..\lib\vc_dll\wxbase310u_vc_custom.pdb"
TargetMachine="1"
OptimizeReferences="2"
EnableCOMDATFolding="2"/>
Expand All @@ -254,7 +254,7 @@
Name="VCPreLinkEventTool"/>
<Tool
Name="VCResourceCompilerTool"
PreprocessorDefinitions="__WXMSW__;NDEBUG;_UNICODE;WXBUILDING;WXDLLNAME=wxbase30u_vc_custom;wxUSE_GUI=0;WXMAKINGDLL_BASE;wxUSE_BASE=1"
PreprocessorDefinitions="__WXMSW__;NDEBUG;_UNICODE;WXBUILDING;WXDLLNAME=wxbase310u_vc_custom;wxUSE_GUI=0;WXMAKINGDLL_BASE;wxUSE_BASE=1"
Culture="1033"
AdditionalIncludeDirectories="..\..\lib\vc_dll\mswu;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib"/>
<Tool
Expand Down
Loading

0 comments on commit 7684504

Please sign in to comment.