projects
/
wxWidgets.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Resolve ambiguity between GetClientXXX() methods in wxOSX wxComboBox.
[wxWidgets.git]
/
samples
/
combo
/
combo_vc9.vcproj
diff --git
a/samples/combo/combo_vc9.vcproj
b/samples/combo/combo_vc9.vcproj
index 5c6c3715f05be7428a149927b902227454cfd433..db635cb6c1464f84c96d3be5aeccd08a437dfa51 100644
(file)
--- a/
samples/combo/combo_vc9.vcproj
+++ b/
samples/combo/combo_vc9.vcproj
@@
-1,8
+1,8
@@
<?xml version="1.0" encoding="Windows-1252"?>
\r
<!--
\r
\r
<?xml version="1.0" encoding="Windows-1252"?>
\r
<!--
\r
\r
- This
makefile
was generated by
\r
- Bakefile 0.2.
5
(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
Do not modify, all changes will be overwritten!
\r
\r
-->
\r
@@
-22,9
+22,9
@@
</ToolFiles>
\r
<Configurations>
\r
<Configuration
\r
</ToolFiles>
\r
<Configurations>
\r
<Configuration
\r
- Name="D
LL Universal Release
|Win32"
\r
- OutputDirectory="vc_mswu
nivudll
"
\r
- IntermediateDirectory="vc_mswu
nivudll
\combo"
\r
+ Name="D
ebug
|Win32"
\r
+ OutputDirectory="vc_mswu
d
"
\r
+ IntermediateDirectory="vc_mswu
d
\combo"
\r
ConfigurationType="1"
\r
UseOfMFC="0"
\r
ATLMinimizesCRunTimeLibraryUsage="false"
\r
ConfigurationType="1"
\r
UseOfMFC="0"
\r
ATLMinimizesCRunTimeLibraryUsage="false"
\r
@@
-43,20
+43,23
@@
Name="VCWebServiceProxyGeneratorTool"
\r
/>
\r
<Tool
\r
Name="VCWebServiceProxyGeneratorTool"
\r
/>
\r
<Tool
\r
- Name="VCIDLTool"
\r
+ Name="VCMIDLTool"
\r
+ PreprocessorDefinitions="WIN32;_DEBUG;__WXMSW__;_UNICODE;_WINDOWS;NOPCH"
\r
+ AdditionalIncludeDirectories=".\..\..\lib\vc_lib\mswud;.\..\..\include;.;.\..\..\samples"
\r
/>
\r
<Tool
\r
Name="VCCLCompilerTool"
\r
AdditionalOptions="/MP"
\r
/>
\r
<Tool
\r
Name="VCCLCompilerTool"
\r
AdditionalOptions="/MP"
\r
- Optimization="
2
"
\r
- AdditionalIncludeDirectories=".\..\..\lib\vc_
dll\mswunivu
;.\..\..\include;.;.\..\..\samples"
\r
- PreprocessorDefinitions="
__WXMSW__;__WXUNIVERSAL__;_UNICODE;WXUSINGDLL
;_WINDOWS;NOPCH"
\r
+ Optimization="
0
"
\r
+ AdditionalIncludeDirectories=".\..\..\lib\vc_
lib\mswud
;.\..\..\include;.;.\..\..\samples"
\r
+ PreprocessorDefinitions="
WIN32;_DEBUG;__WXMSW__;_UNICODE
;_WINDOWS;NOPCH"
\r
ExceptionHandling="1"
\r
ExceptionHandling="1"
\r
- RuntimeLibrary="2"
\r
+ BasicRuntimeChecks="3"
\r
+ RuntimeLibrary="3"
\r
+ BufferSecurityCheck="true"
\r
RuntimeTypeInfo="true"
\r
RuntimeTypeInfo="true"
\r
- AssemblerListingLocation="vc_mswunivudll\combo\"
\r
- ObjectFile="vc_mswunivudll\combo\"
\r
- ProgramDataBaseFileName="vc_mswunivudll\combo.pdb"
\r
+ ObjectFile="vc_mswud\combo\"
\r
+ ProgramDataBaseFileName="vc_mswud\combo.pdb"
\r
WarningLevel="4"
\r
SuppressStartupBanner="true"
\r
DebugInformationFormat="3"
\r
WarningLevel="4"
\r
SuppressStartupBanner="true"
\r
DebugInformationFormat="3"
\r
@@
-66,9
+69,9
@@
/>
\r
<Tool
\r
Name="VCResourceCompilerTool"
\r
/>
\r
<Tool
\r
Name="VCResourceCompilerTool"
\r
- PreprocessorDefinitions="_
_WXMSW__;__WXUNIVERSAL__;_UNICODE;WXUSINGDLL
;_WINDOWS;NOPCH"
\r
+ PreprocessorDefinitions="_
DEBUG;__WXMSW__;_UNICODE
;_WINDOWS;NOPCH"
\r
Culture="1033"
\r
Culture="1033"
\r
- AdditionalIncludeDirectories=".\..\..\lib\vc_
dll\mswunivu
;.\..\..\include;.;.\..\..\samples"
\r
+ AdditionalIncludeDirectories=".\..\..\lib\vc_
lib\mswud
;.\..\..\include;.;.\..\..\samples"
\r
/>
\r
<Tool
\r
Name="VCPreLinkEventTool"
\r
/>
\r
<Tool
\r
Name="VCPreLinkEventTool"
\r
@@
-76,14
+79,14
@@
<Tool
\r
Name="VCLinkerTool"
\r
AdditionalOptions=""
\r
<Tool
\r
Name="VCLinkerTool"
\r
AdditionalOptions=""
\r
- AdditionalDependencies="wxmsw
univ29u_adv.lib wxmswuniv29u_core.lib wxbase29u.lib 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"
\r
- OutputFile="vc_mswu
nivudll
\combo.exe"
\r
+ AdditionalDependencies="wxmsw
29ud_adv.lib wxmsw29ud_core.lib wxbase29ud.lib 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"
\r
+ OutputFile="vc_mswu
d
\combo.exe"
\r
LinkIncremental="2"
\r
SuppressStartupBanner="true"
\r
LinkIncremental="2"
\r
SuppressStartupBanner="true"
\r
- AdditionalLibraryDirectories=".\..\..\lib\vc_
dll
"
\r
+ AdditionalLibraryDirectories=".\..\..\lib\vc_
lib
"
\r
GenerateManifest="true"
\r
GenerateDebugInformation="true"
\r
GenerateManifest="true"
\r
GenerateDebugInformation="true"
\r
- ProgramDatabaseFile="vc_mswu
nivudll
\combo.pdb"
\r
+ ProgramDatabaseFile="vc_mswu
d
\combo.pdb"
\r
SubSystem="2"
\r
TargetMachine="1"
\r
/>
\r
SubSystem="2"
\r
TargetMachine="1"
\r
/>
\r
@@
-98,7
+101,7
@@
/>
\r
<Tool
\r
Name="VCBscMakeTool"
\r
/>
\r
<Tool
\r
Name="VCBscMakeTool"
\r
- OutputFile="vc_mswu
nivudll
\combo_vc9.bsc"
\r
+ OutputFile="vc_mswu
d
\combo_vc9.bsc"
\r
SuppressStartupBanner="true"
\r
/>
\r
<Tool
\r
SuppressStartupBanner="true"
\r
/>
\r
<Tool
\r
@@
-112,9
+115,9
@@
/>
\r
</Configuration>
\r
<Configuration
\r
/>
\r
</Configuration>
\r
<Configuration
\r
- Name="
DLL Universal Debug
|Win32"
\r
- OutputDirectory="vc_mswu
nivuddll
"
\r
- IntermediateDirectory="vc_mswu
nivuddll
\combo"
\r
+ Name="
Release
|Win32"
\r
+ OutputDirectory="vc_mswu"
\r
+ IntermediateDirectory="vc_mswu\combo"
\r
ConfigurationType="1"
\r
UseOfMFC="0"
\r
ATLMinimizesCRunTimeLibraryUsage="false"
\r
ConfigurationType="1"
\r
UseOfMFC="0"
\r
ATLMinimizesCRunTimeLibraryUsage="false"
\r
@@
-133,22
+136,21
@@
Name="VCWebServiceProxyGeneratorTool"
\r
/>
\r
<Tool
\r
Name="VCWebServiceProxyGeneratorTool"
\r
/>
\r
<Tool
\r
- Name="VCIDLTool"
\r
+ Name="VCMIDLTool"
\r
+ PreprocessorDefinitions="WIN32;__WXMSW__;NDEBUG;_UNICODE;_WINDOWS;NOPCH"
\r
+ AdditionalIncludeDirectories=".\..\..\lib\vc_lib\mswu;.\..\..\include;.;.\..\..\samples"
\r
/>
\r
<Tool
\r
Name="VCCLCompilerTool"
\r
AdditionalOptions="/MP"
\r
/>
\r
<Tool
\r
Name="VCCLCompilerTool"
\r
AdditionalOptions="/MP"
\r
- Optimization="
0
"
\r
- AdditionalIncludeDirectories=".\..\..\lib\vc_
dll\mswunivud
;.\..\..\include;.;.\..\..\samples"
\r
- PreprocessorDefinitions="
_DEBUG;__WXMSW__;__WXUNIVERSAL__;__WXDEBUG__;_UNICODE;WXUSINGDLL
;_WINDOWS;NOPCH"
\r
+ Optimization="
2
"
\r
+ AdditionalIncludeDirectories=".\..\..\lib\vc_
lib\mswu
;.\..\..\include;.;.\..\..\samples"
\r
+ PreprocessorDefinitions="
WIN32;__WXMSW__;NDEBUG;_UNICODE
;_WINDOWS;NOPCH"
\r
ExceptionHandling="1"
\r
ExceptionHandling="1"
\r
- BasicRuntimeChecks="3"
\r
- RuntimeLibrary="3"
\r
- BufferSecurityCheck="true"
\r
+ RuntimeLibrary="2"
\r
RuntimeTypeInfo="true"
\r
RuntimeTypeInfo="true"
\r
- AssemblerListingLocation="vc_mswunivuddll\combo\"
\r
- ObjectFile="vc_mswunivuddll\combo\"
\r
- ProgramDataBaseFileName="vc_mswunivuddll\combo.pdb"
\r
+ ObjectFile="vc_mswu\combo\"
\r
+ ProgramDataBaseFileName="vc_mswu\combo.pdb"
\r
WarningLevel="4"
\r
SuppressStartupBanner="true"
\r
DebugInformationFormat="3"
\r
WarningLevel="4"
\r
SuppressStartupBanner="true"
\r
DebugInformationFormat="3"
\r
@@
-158,9
+160,9
@@
/>
\r
<Tool
\r
Name="VCResourceCompilerTool"
\r
/>
\r
<Tool
\r
Name="VCResourceCompilerTool"
\r
- PreprocessorDefinitions="_
DEBUG;__WXMSW__;__WXUNIVERSAL__;__WXDEBUG__;_UNICODE;WXUSINGDLL
;_WINDOWS;NOPCH"
\r
+ PreprocessorDefinitions="_
_WXMSW__;NDEBUG;_UNICODE
;_WINDOWS;NOPCH"
\r
Culture="1033"
\r
Culture="1033"
\r
- AdditionalIncludeDirectories=".\..\..\lib\vc_
dll\mswunivud
;.\..\..\include;.;.\..\..\samples"
\r
+ AdditionalIncludeDirectories=".\..\..\lib\vc_
lib\mswu
;.\..\..\include;.;.\..\..\samples"
\r
/>
\r
<Tool
\r
Name="VCPreLinkEventTool"
\r
/>
\r
<Tool
\r
Name="VCPreLinkEventTool"
\r
@@
-168,16
+170,18
@@
<Tool
\r
Name="VCLinkerTool"
\r
AdditionalOptions=""
\r
<Tool
\r
Name="VCLinkerTool"
\r
AdditionalOptions=""
\r
- AdditionalDependencies="wxmsw
univ29ud_adv.lib wxmswuniv29ud_core.lib wxbase29ud.lib 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"
\r
- OutputFile="vc_mswu
nivuddll
\combo.exe"
\r
- LinkIncremental="
2
"
\r
+ AdditionalDependencies="wxmsw
29u_adv.lib wxmsw29u_core.lib wxbase29u.lib 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"
\r
+ OutputFile="vc_mswu\combo.exe"
\r
+ LinkIncremental="
1
"
\r
SuppressStartupBanner="true"
\r
SuppressStartupBanner="true"
\r
- AdditionalLibraryDirectories=".\..\..\lib\vc_
dll
"
\r
+ AdditionalLibraryDirectories=".\..\..\lib\vc_
lib
"
\r
GenerateManifest="true"
\r
GenerateDebugInformation="true"
\r
GenerateManifest="true"
\r
GenerateDebugInformation="true"
\r
- ProgramDatabaseFile="vc_mswu
nivuddll
\combo.pdb"
\r
+ ProgramDatabaseFile="vc_mswu\combo.pdb"
\r
SubSystem="2"
\r
TargetMachine="1"
\r
SubSystem="2"
\r
TargetMachine="1"
\r
+ OptimizeReferences="2"
\r
+ EnableCOMDATFolding="2"
\r
/>
\r
<Tool
\r
Name="VCALinkTool"
\r
/>
\r
<Tool
\r
Name="VCALinkTool"
\r
@@
-190,7
+194,7
@@
/>
\r
<Tool
\r
Name="VCBscMakeTool"
\r
/>
\r
<Tool
\r
Name="VCBscMakeTool"
\r
- OutputFile="vc_mswu
nivuddll
\combo_vc9.bsc"
\r
+ OutputFile="vc_mswu\combo_vc9.bsc"
\r
SuppressStartupBanner="true"
\r
/>
\r
<Tool
\r
SuppressStartupBanner="true"
\r
/>
\r
<Tool
\r
@@
-204,9
+208,9
@@
/>
\r
</Configuration>
\r
<Configuration
\r
/>
\r
</Configuration>
\r
<Configuration
\r
- Name="
DLL Release
|Win32"
\r
- OutputDirectory="vc_mswu
dll
"
\r
- IntermediateDirectory="vc_mswu
dll
\combo"
\r
+ Name="
Universal Debug
|Win32"
\r
+ OutputDirectory="vc_mswu
nivud
"
\r
+ IntermediateDirectory="vc_mswu
nivud
\combo"
\r
ConfigurationType="1"
\r
UseOfMFC="0"
\r
ATLMinimizesCRunTimeLibraryUsage="false"
\r
ConfigurationType="1"
\r
UseOfMFC="0"
\r
ATLMinimizesCRunTimeLibraryUsage="false"
\r
@@
-225,20
+229,23
@@
Name="VCWebServiceProxyGeneratorTool"
\r
/>
\r
<Tool
\r
Name="VCWebServiceProxyGeneratorTool"
\r
/>
\r
<Tool
\r
- Name="VCIDLTool"
\r
+ Name="VCMIDLTool"
\r
+ PreprocessorDefinitions="WIN32;_DEBUG;__WXMSW__;__WXUNIVERSAL__;_UNICODE;_WINDOWS;NOPCH"
\r
+ AdditionalIncludeDirectories=".\..\..\lib\vc_lib\mswunivud;.\..\..\include;.;.\..\..\samples"
\r
/>
\r
<Tool
\r
Name="VCCLCompilerTool"
\r
AdditionalOptions="/MP"
\r
/>
\r
<Tool
\r
Name="VCCLCompilerTool"
\r
AdditionalOptions="/MP"
\r
- Optimization="
2
"
\r
- AdditionalIncludeDirectories=".\..\..\lib\vc_
dll\mswu
;.\..\..\include;.;.\..\..\samples"
\r
- PreprocessorDefinitions="
__WXMSW__;_UNICODE;WXUSINGDLL
;_WINDOWS;NOPCH"
\r
+ Optimization="
0
"
\r
+ AdditionalIncludeDirectories=".\..\..\lib\vc_
lib\mswunivud
;.\..\..\include;.;.\..\..\samples"
\r
+ PreprocessorDefinitions="
WIN32;_DEBUG;__WXMSW__;__WXUNIVERSAL__;_UNICODE
;_WINDOWS;NOPCH"
\r
ExceptionHandling="1"
\r
ExceptionHandling="1"
\r
- RuntimeLibrary="2"
\r
+ BasicRuntimeChecks="3"
\r
+ RuntimeLibrary="3"
\r
+ BufferSecurityCheck="true"
\r
RuntimeTypeInfo="true"
\r
RuntimeTypeInfo="true"
\r
- AssemblerListingLocation="vc_mswudll\combo\"
\r
- ObjectFile="vc_mswudll\combo\"
\r
- ProgramDataBaseFileName="vc_mswudll\combo.pdb"
\r
+ ObjectFile="vc_mswunivud\combo\"
\r
+ ProgramDataBaseFileName="vc_mswunivud\combo.pdb"
\r
WarningLevel="4"
\r
SuppressStartupBanner="true"
\r
DebugInformationFormat="3"
\r
WarningLevel="4"
\r
SuppressStartupBanner="true"
\r
DebugInformationFormat="3"
\r
@@
-248,9
+255,9
@@
/>
\r
<Tool
\r
Name="VCResourceCompilerTool"
\r
/>
\r
<Tool
\r
Name="VCResourceCompilerTool"
\r
- PreprocessorDefinitions="_
_WXMSW__;_UNICODE;WXUSINGDLL
;_WINDOWS;NOPCH"
\r
+ PreprocessorDefinitions="_
DEBUG;__WXMSW__;__WXUNIVERSAL__;_UNICODE
;_WINDOWS;NOPCH"
\r
Culture="1033"
\r
Culture="1033"
\r
- AdditionalIncludeDirectories=".\..\..\lib\vc_
dll\mswu
;.\..\..\include;.;.\..\..\samples"
\r
+ AdditionalIncludeDirectories=".\..\..\lib\vc_
lib\mswunivud
;.\..\..\include;.;.\..\..\samples"
\r
/>
\r
<Tool
\r
Name="VCPreLinkEventTool"
\r
/>
\r
<Tool
\r
Name="VCPreLinkEventTool"
\r
@@
-258,14
+265,14
@@
<Tool
\r
Name="VCLinkerTool"
\r
AdditionalOptions=""
\r
<Tool
\r
Name="VCLinkerTool"
\r
AdditionalOptions=""
\r
- AdditionalDependencies="wxmsw
29u_adv.lib wxmsw29u_core.lib wxbase29u.lib 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"
\r
- OutputFile="vc_mswu
dll
\combo.exe"
\r
+ AdditionalDependencies="wxmsw
univ29ud_adv.lib wxmswuniv29ud_core.lib wxbase29ud.lib 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"
\r
+ OutputFile="vc_mswu
nivud
\combo.exe"
\r
LinkIncremental="2"
\r
SuppressStartupBanner="true"
\r
LinkIncremental="2"
\r
SuppressStartupBanner="true"
\r
- AdditionalLibraryDirectories=".\..\..\lib\vc_
dll
"
\r
+ AdditionalLibraryDirectories=".\..\..\lib\vc_
lib
"
\r
GenerateManifest="true"
\r
GenerateDebugInformation="true"
\r
GenerateManifest="true"
\r
GenerateDebugInformation="true"
\r
- ProgramDatabaseFile="vc_mswu
dll
\combo.pdb"
\r
+ ProgramDatabaseFile="vc_mswu
nivud
\combo.pdb"
\r
SubSystem="2"
\r
TargetMachine="1"
\r
/>
\r
SubSystem="2"
\r
TargetMachine="1"
\r
/>
\r
@@
-280,7
+287,7
@@
/>
\r
<Tool
\r
Name="VCBscMakeTool"
\r
/>
\r
<Tool
\r
Name="VCBscMakeTool"
\r
- OutputFile="vc_mswu
dll
\combo_vc9.bsc"
\r
+ OutputFile="vc_mswu
nivud
\combo_vc9.bsc"
\r
SuppressStartupBanner="true"
\r
/>
\r
<Tool
\r
SuppressStartupBanner="true"
\r
/>
\r
<Tool
\r
@@
-294,9
+301,9
@@
/>
\r
</Configuration>
\r
<Configuration
\r
/>
\r
</Configuration>
\r
<Configuration
\r
- Name="
DLL Debug
|Win32"
\r
- OutputDirectory="vc_mswu
ddll
"
\r
- IntermediateDirectory="vc_mswu
ddll
\combo"
\r
+ Name="
Universal Release
|Win32"
\r
+ OutputDirectory="vc_mswu
nivu
"
\r
+ IntermediateDirectory="vc_mswu
nivu
\combo"
\r
ConfigurationType="1"
\r
UseOfMFC="0"
\r
ATLMinimizesCRunTimeLibraryUsage="false"
\r
ConfigurationType="1"
\r
UseOfMFC="0"
\r
ATLMinimizesCRunTimeLibraryUsage="false"
\r
@@
-315,22
+322,21
@@
Name="VCWebServiceProxyGeneratorTool"
\r
/>
\r
<Tool
\r
Name="VCWebServiceProxyGeneratorTool"
\r
/>
\r
<Tool
\r
- Name="VCIDLTool"
\r
+ Name="VCMIDLTool"
\r
+ PreprocessorDefinitions="WIN32;__WXMSW__;__WXUNIVERSAL__;NDEBUG;_UNICODE;_WINDOWS;NOPCH"
\r
+ AdditionalIncludeDirectories=".\..\..\lib\vc_lib\mswunivu;.\..\..\include;.;.\..\..\samples"
\r
/>
\r
<Tool
\r
Name="VCCLCompilerTool"
\r
AdditionalOptions="/MP"
\r
/>
\r
<Tool
\r
Name="VCCLCompilerTool"
\r
AdditionalOptions="/MP"
\r
- Optimization="
0
"
\r
- AdditionalIncludeDirectories=".\..\..\lib\vc_
dll\mswud
;.\..\..\include;.;.\..\..\samples"
\r
- PreprocessorDefinitions="
_DEBUG;__WXMSW__;__WXDEBUG__;_UNICODE;WXUSINGDLL
;_WINDOWS;NOPCH"
\r
+ Optimization="
2
"
\r
+ AdditionalIncludeDirectories=".\..\..\lib\vc_
lib\mswunivu
;.\..\..\include;.;.\..\..\samples"
\r
+ PreprocessorDefinitions="
WIN32;__WXMSW__;__WXUNIVERSAL__;NDEBUG;_UNICODE
;_WINDOWS;NOPCH"
\r
ExceptionHandling="1"
\r
ExceptionHandling="1"
\r
- BasicRuntimeChecks="3"
\r
- RuntimeLibrary="3"
\r
- BufferSecurityCheck="true"
\r
+ RuntimeLibrary="2"
\r
RuntimeTypeInfo="true"
\r
RuntimeTypeInfo="true"
\r
- AssemblerListingLocation="vc_mswuddll\combo\"
\r
- ObjectFile="vc_mswuddll\combo\"
\r
- ProgramDataBaseFileName="vc_mswuddll\combo.pdb"
\r
+ ObjectFile="vc_mswunivu\combo\"
\r
+ ProgramDataBaseFileName="vc_mswunivu\combo.pdb"
\r
WarningLevel="4"
\r
SuppressStartupBanner="true"
\r
DebugInformationFormat="3"
\r
WarningLevel="4"
\r
SuppressStartupBanner="true"
\r
DebugInformationFormat="3"
\r
@@
-340,9
+346,9
@@
/>
\r
<Tool
\r
Name="VCResourceCompilerTool"
\r
/>
\r
<Tool
\r
Name="VCResourceCompilerTool"
\r
- PreprocessorDefinitions="_
DEBUG;__WXMSW__;__WXDEBUG__;_UNICODE;WXUSINGDLL
;_WINDOWS;NOPCH"
\r
+ PreprocessorDefinitions="_
_WXMSW__;__WXUNIVERSAL__;NDEBUG;_UNICODE
;_WINDOWS;NOPCH"
\r
Culture="1033"
\r
Culture="1033"
\r
- AdditionalIncludeDirectories=".\..\..\lib\vc_
dll\mswud
;.\..\..\include;.;.\..\..\samples"
\r
+ AdditionalIncludeDirectories=".\..\..\lib\vc_
lib\mswunivu
;.\..\..\include;.;.\..\..\samples"
\r
/>
\r
<Tool
\r
Name="VCPreLinkEventTool"
\r
/>
\r
<Tool
\r
Name="VCPreLinkEventTool"
\r
@@
-350,16
+356,18
@@
<Tool
\r
Name="VCLinkerTool"
\r
AdditionalOptions=""
\r
<Tool
\r
Name="VCLinkerTool"
\r
AdditionalOptions=""
\r
- AdditionalDependencies="wxmsw
29ud_adv.lib wxmsw29ud_core.lib wxbase29ud.lib 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"
\r
- OutputFile="vc_mswu
ddll
\combo.exe"
\r
- LinkIncremental="
2
"
\r
+ AdditionalDependencies="wxmsw
univ29u_adv.lib wxmswuniv29u_core.lib wxbase29u.lib 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"
\r
+ OutputFile="vc_mswu
nivu
\combo.exe"
\r
+ LinkIncremental="
1
"
\r
SuppressStartupBanner="true"
\r
SuppressStartupBanner="true"
\r
- AdditionalLibraryDirectories=".\..\..\lib\vc_
dll
"
\r
+ AdditionalLibraryDirectories=".\..\..\lib\vc_
lib
"
\r
GenerateManifest="true"
\r
GenerateDebugInformation="true"
\r
GenerateManifest="true"
\r
GenerateDebugInformation="true"
\r
- ProgramDatabaseFile="vc_mswu
ddll
\combo.pdb"
\r
+ ProgramDatabaseFile="vc_mswu
nivu
\combo.pdb"
\r
SubSystem="2"
\r
TargetMachine="1"
\r
SubSystem="2"
\r
TargetMachine="1"
\r
+ OptimizeReferences="2"
\r
+ EnableCOMDATFolding="2"
\r
/>
\r
<Tool
\r
Name="VCALinkTool"
\r
/>
\r
<Tool
\r
Name="VCALinkTool"
\r
@@
-372,7
+380,7
@@
/>
\r
<Tool
\r
Name="VCBscMakeTool"
\r
/>
\r
<Tool
\r
Name="VCBscMakeTool"
\r
- OutputFile="vc_mswu
ddll
\combo_vc9.bsc"
\r
+ OutputFile="vc_mswu
nivu
\combo_vc9.bsc"
\r
SuppressStartupBanner="true"
\r
/>
\r
<Tool
\r
SuppressStartupBanner="true"
\r
/>
\r
<Tool
\r
@@
-386,9
+394,9
@@
/>
\r
</Configuration>
\r
<Configuration
\r
/>
\r
</Configuration>
\r
<Configuration
\r
- Name="
Universal Release
|Win32"
\r
- OutputDirectory="vc_mswu
nivu
"
\r
- IntermediateDirectory="vc_mswu
nivu
\combo"
\r
+ Name="
DLL Debug
|Win32"
\r
+ OutputDirectory="vc_mswu
ddll
"
\r
+ IntermediateDirectory="vc_mswu
ddll
\combo"
\r
ConfigurationType="1"
\r
UseOfMFC="0"
\r
ATLMinimizesCRunTimeLibraryUsage="false"
\r
ConfigurationType="1"
\r
UseOfMFC="0"
\r
ATLMinimizesCRunTimeLibraryUsage="false"
\r
@@
-407,20
+415,23
@@
Name="VCWebServiceProxyGeneratorTool"
\r
/>
\r
<Tool
\r
Name="VCWebServiceProxyGeneratorTool"
\r
/>
\r
<Tool
\r
- Name="VCIDLTool"
\r
+ Name="VCMIDLTool"
\r
+ PreprocessorDefinitions="WIN32;_DEBUG;__WXMSW__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH"
\r
+ AdditionalIncludeDirectories=".\..\..\lib\vc_dll\mswud;.\..\..\include;.;.\..\..\samples"
\r
/>
\r
<Tool
\r
Name="VCCLCompilerTool"
\r
AdditionalOptions="/MP"
\r
/>
\r
<Tool
\r
Name="VCCLCompilerTool"
\r
AdditionalOptions="/MP"
\r
- Optimization="
2
"
\r
- AdditionalIncludeDirectories=".\..\..\lib\vc_
lib\mswunivu
;.\..\..\include;.;.\..\..\samples"
\r
- PreprocessorDefinitions="
__WXMSW__;__WXUNIVERSAL__;_UNICODE
;_WINDOWS;NOPCH"
\r
+ Optimization="
0
"
\r
+ AdditionalIncludeDirectories=".\..\..\lib\vc_
dll\mswud
;.\..\..\include;.;.\..\..\samples"
\r
+ PreprocessorDefinitions="
WIN32;_DEBUG;__WXMSW__;_UNICODE;WXUSINGDLL
;_WINDOWS;NOPCH"
\r
ExceptionHandling="1"
\r
ExceptionHandling="1"
\r
- RuntimeLibrary="2"
\r
+ BasicRuntimeChecks="3"
\r
+ RuntimeLibrary="3"
\r
+ BufferSecurityCheck="true"
\r
RuntimeTypeInfo="true"
\r
RuntimeTypeInfo="true"
\r
- AssemblerListingLocation="vc_mswunivu\combo\"
\r
- ObjectFile="vc_mswunivu\combo\"
\r
- ProgramDataBaseFileName="vc_mswunivu\combo.pdb"
\r
+ ObjectFile="vc_mswuddll\combo\"
\r
+ ProgramDataBaseFileName="vc_mswuddll\combo.pdb"
\r
WarningLevel="4"
\r
SuppressStartupBanner="true"
\r
DebugInformationFormat="3"
\r
WarningLevel="4"
\r
SuppressStartupBanner="true"
\r
DebugInformationFormat="3"
\r
@@
-430,9
+441,9
@@
/>
\r
<Tool
\r
Name="VCResourceCompilerTool"
\r
/>
\r
<Tool
\r
Name="VCResourceCompilerTool"
\r
- PreprocessorDefinitions="_
_WXMSW__;__WXUNIVERSAL__;_UNICODE
;_WINDOWS;NOPCH"
\r
+ PreprocessorDefinitions="_
DEBUG;__WXMSW__;_UNICODE;WXUSINGDLL
;_WINDOWS;NOPCH"
\r
Culture="1033"
\r
Culture="1033"
\r
- AdditionalIncludeDirectories=".\..\..\lib\vc_
lib\mswunivu
;.\..\..\include;.;.\..\..\samples"
\r
+ AdditionalIncludeDirectories=".\..\..\lib\vc_
dll\mswud
;.\..\..\include;.;.\..\..\samples"
\r
/>
\r
<Tool
\r
Name="VCPreLinkEventTool"
\r
/>
\r
<Tool
\r
Name="VCPreLinkEventTool"
\r
@@
-440,14
+451,14
@@
<Tool
\r
Name="VCLinkerTool"
\r
AdditionalOptions=""
\r
<Tool
\r
Name="VCLinkerTool"
\r
AdditionalOptions=""
\r
- AdditionalDependencies="wxmsw
univ29u_adv.lib wxmswuniv29u_core.lib wxbase29u.lib 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"
\r
- OutputFile="vc_mswu
nivu
\combo.exe"
\r
+ AdditionalDependencies="wxmsw
29ud_adv.lib wxmsw29ud_core.lib wxbase29ud.lib 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"
\r
+ OutputFile="vc_mswu
ddll
\combo.exe"
\r
LinkIncremental="2"
\r
SuppressStartupBanner="true"
\r
LinkIncremental="2"
\r
SuppressStartupBanner="true"
\r
- AdditionalLibraryDirectories=".\..\..\lib\vc_
lib
"
\r
+ AdditionalLibraryDirectories=".\..\..\lib\vc_
dll
"
\r
GenerateManifest="true"
\r
GenerateDebugInformation="true"
\r
GenerateManifest="true"
\r
GenerateDebugInformation="true"
\r
- ProgramDatabaseFile="vc_mswu
nivu
\combo.pdb"
\r
+ ProgramDatabaseFile="vc_mswu
ddll
\combo.pdb"
\r
SubSystem="2"
\r
TargetMachine="1"
\r
/>
\r
SubSystem="2"
\r
TargetMachine="1"
\r
/>
\r
@@
-462,7
+473,7
@@
/>
\r
<Tool
\r
Name="VCBscMakeTool"
\r
/>
\r
<Tool
\r
Name="VCBscMakeTool"
\r
- OutputFile="vc_mswu
nivu
\combo_vc9.bsc"
\r
+ OutputFile="vc_mswu
ddll
\combo_vc9.bsc"
\r
SuppressStartupBanner="true"
\r
/>
\r
<Tool
\r
SuppressStartupBanner="true"
\r
/>
\r
<Tool
\r
@@
-476,9
+487,9
@@
/>
\r
</Configuration>
\r
<Configuration
\r
/>
\r
</Configuration>
\r
<Configuration
\r
- Name="
Universal Debug
|Win32"
\r
- OutputDirectory="vc_mswu
nivud
"
\r
- IntermediateDirectory="vc_mswu
nivud
\combo"
\r
+ Name="
DLL Release
|Win32"
\r
+ OutputDirectory="vc_mswu
dll
"
\r
+ IntermediateDirectory="vc_mswu
dll
\combo"
\r
ConfigurationType="1"
\r
UseOfMFC="0"
\r
ATLMinimizesCRunTimeLibraryUsage="false"
\r
ConfigurationType="1"
\r
UseOfMFC="0"
\r
ATLMinimizesCRunTimeLibraryUsage="false"
\r
@@
-497,22
+508,21
@@
Name="VCWebServiceProxyGeneratorTool"
\r
/>
\r
<Tool
\r
Name="VCWebServiceProxyGeneratorTool"
\r
/>
\r
<Tool
\r
- Name="VCIDLTool"
\r
+ Name="VCMIDLTool"
\r
+ PreprocessorDefinitions="WIN32;__WXMSW__;NDEBUG;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH"
\r
+ AdditionalIncludeDirectories=".\..\..\lib\vc_dll\mswu;.\..\..\include;.;.\..\..\samples"
\r
/>
\r
<Tool
\r
Name="VCCLCompilerTool"
\r
AdditionalOptions="/MP"
\r
/>
\r
<Tool
\r
Name="VCCLCompilerTool"
\r
AdditionalOptions="/MP"
\r
- Optimization="
0
"
\r
- AdditionalIncludeDirectories=".\..\..\lib\vc_
lib\mswunivud
;.\..\..\include;.;.\..\..\samples"
\r
- PreprocessorDefinitions="
_DEBUG;__WXMSW__;__WXUNIVERSAL__;__WXDEBUG__;_UNICODE
;_WINDOWS;NOPCH"
\r
+ Optimization="
2
"
\r
+ AdditionalIncludeDirectories=".\..\..\lib\vc_
dll\mswu
;.\..\..\include;.;.\..\..\samples"
\r
+ PreprocessorDefinitions="
WIN32;__WXMSW__;NDEBUG;_UNICODE;WXUSINGDLL
;_WINDOWS;NOPCH"
\r
ExceptionHandling="1"
\r
ExceptionHandling="1"
\r
- BasicRuntimeChecks="3"
\r
- RuntimeLibrary="3"
\r
- BufferSecurityCheck="true"
\r
+ RuntimeLibrary="2"
\r
RuntimeTypeInfo="true"
\r
RuntimeTypeInfo="true"
\r
- AssemblerListingLocation="vc_mswunivud\combo\"
\r
- ObjectFile="vc_mswunivud\combo\"
\r
- ProgramDataBaseFileName="vc_mswunivud\combo.pdb"
\r
+ ObjectFile="vc_mswudll\combo\"
\r
+ ProgramDataBaseFileName="vc_mswudll\combo.pdb"
\r
WarningLevel="4"
\r
SuppressStartupBanner="true"
\r
DebugInformationFormat="3"
\r
WarningLevel="4"
\r
SuppressStartupBanner="true"
\r
DebugInformationFormat="3"
\r
@@
-522,9
+532,9
@@
/>
\r
<Tool
\r
Name="VCResourceCompilerTool"
\r
/>
\r
<Tool
\r
Name="VCResourceCompilerTool"
\r
- PreprocessorDefinitions="_
DEBUG;__WXMSW__;__WXUNIVERSAL__;__WXDEBUG__;_UNICODE
;_WINDOWS;NOPCH"
\r
+ PreprocessorDefinitions="_
_WXMSW__;NDEBUG;_UNICODE;WXUSINGDLL
;_WINDOWS;NOPCH"
\r
Culture="1033"
\r
Culture="1033"
\r
- AdditionalIncludeDirectories=".\..\..\lib\vc_
lib\mswunivud
;.\..\..\include;.;.\..\..\samples"
\r
+ AdditionalIncludeDirectories=".\..\..\lib\vc_
dll\mswu
;.\..\..\include;.;.\..\..\samples"
\r
/>
\r
<Tool
\r
Name="VCPreLinkEventTool"
\r
/>
\r
<Tool
\r
Name="VCPreLinkEventTool"
\r
@@
-532,16
+542,18
@@
<Tool
\r
Name="VCLinkerTool"
\r
AdditionalOptions=""
\r
<Tool
\r
Name="VCLinkerTool"
\r
AdditionalOptions=""
\r
- AdditionalDependencies="wxmsw
univ29ud_adv.lib wxmswuniv29ud_core.lib wxbase29ud.lib 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"
\r
- OutputFile="vc_mswu
nivud
\combo.exe"
\r
- LinkIncremental="
2
"
\r
+ AdditionalDependencies="wxmsw
29u_adv.lib wxmsw29u_core.lib wxbase29u.lib 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"
\r
+ OutputFile="vc_mswu
dll
\combo.exe"
\r
+ LinkIncremental="
1
"
\r
SuppressStartupBanner="true"
\r
SuppressStartupBanner="true"
\r
- AdditionalLibraryDirectories=".\..\..\lib\vc_
lib
"
\r
+ AdditionalLibraryDirectories=".\..\..\lib\vc_
dll
"
\r
GenerateManifest="true"
\r
GenerateDebugInformation="true"
\r
GenerateManifest="true"
\r
GenerateDebugInformation="true"
\r
- ProgramDatabaseFile="vc_mswu
nivud
\combo.pdb"
\r
+ ProgramDatabaseFile="vc_mswu
dll
\combo.pdb"
\r
SubSystem="2"
\r
TargetMachine="1"
\r
SubSystem="2"
\r
TargetMachine="1"
\r
+ OptimizeReferences="2"
\r
+ EnableCOMDATFolding="2"
\r
/>
\r
<Tool
\r
Name="VCALinkTool"
\r
/>
\r
<Tool
\r
Name="VCALinkTool"
\r
@@
-554,7
+566,7
@@
/>
\r
<Tool
\r
Name="VCBscMakeTool"
\r
/>
\r
<Tool
\r
Name="VCBscMakeTool"
\r
- OutputFile="vc_mswu
nivud
\combo_vc9.bsc"
\r
+ OutputFile="vc_mswu
dll
\combo_vc9.bsc"
\r
SuppressStartupBanner="true"
\r
/>
\r
<Tool
\r
SuppressStartupBanner="true"
\r
/>
\r
<Tool
\r
@@
-568,9
+580,9
@@
/>
\r
</Configuration>
\r
<Configuration
\r
/>
\r
</Configuration>
\r
<Configuration
\r
- Name="
Release
|Win32"
\r
- OutputDirectory="vc_mswu"
\r
- IntermediateDirectory="vc_mswu\combo"
\r
+ Name="
DLL Universal Debug
|Win32"
\r
+ OutputDirectory="vc_mswu
nivuddll
"
\r
+ IntermediateDirectory="vc_mswu
nivuddll
\combo"
\r
ConfigurationType="1"
\r
UseOfMFC="0"
\r
ATLMinimizesCRunTimeLibraryUsage="false"
\r
ConfigurationType="1"
\r
UseOfMFC="0"
\r
ATLMinimizesCRunTimeLibraryUsage="false"
\r
@@
-589,20
+601,23
@@
Name="VCWebServiceProxyGeneratorTool"
\r
/>
\r
<Tool
\r
Name="VCWebServiceProxyGeneratorTool"
\r
/>
\r
<Tool
\r
- Name="VCIDLTool"
\r
+ Name="VCMIDLTool"
\r
+ PreprocessorDefinitions="WIN32;_DEBUG;__WXMSW__;__WXUNIVERSAL__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH"
\r
+ AdditionalIncludeDirectories=".\..\..\lib\vc_dll\mswunivud;.\..\..\include;.;.\..\..\samples"
\r
/>
\r
<Tool
\r
Name="VCCLCompilerTool"
\r
AdditionalOptions="/MP"
\r
/>
\r
<Tool
\r
Name="VCCLCompilerTool"
\r
AdditionalOptions="/MP"
\r
- Optimization="
2
"
\r
- AdditionalIncludeDirectories=".\..\..\lib\vc_
lib\mswu
;.\..\..\include;.;.\..\..\samples"
\r
- PreprocessorDefinitions="
__WXMSW__;_UNICODE
;_WINDOWS;NOPCH"
\r
+ Optimization="
0
"
\r
+ AdditionalIncludeDirectories=".\..\..\lib\vc_
dll\mswunivud
;.\..\..\include;.;.\..\..\samples"
\r
+ PreprocessorDefinitions="
WIN32;_DEBUG;__WXMSW__;__WXUNIVERSAL__;_UNICODE;WXUSINGDLL
;_WINDOWS;NOPCH"
\r
ExceptionHandling="1"
\r
ExceptionHandling="1"
\r
- RuntimeLibrary="2"
\r
+ BasicRuntimeChecks="3"
\r
+ RuntimeLibrary="3"
\r
+ BufferSecurityCheck="true"
\r
RuntimeTypeInfo="true"
\r
RuntimeTypeInfo="true"
\r
- AssemblerListingLocation="vc_mswu\combo\"
\r
- ObjectFile="vc_mswu\combo\"
\r
- ProgramDataBaseFileName="vc_mswu\combo.pdb"
\r
+ ObjectFile="vc_mswunivuddll\combo\"
\r
+ ProgramDataBaseFileName="vc_mswunivuddll\combo.pdb"
\r
WarningLevel="4"
\r
SuppressStartupBanner="true"
\r
DebugInformationFormat="3"
\r
WarningLevel="4"
\r
SuppressStartupBanner="true"
\r
DebugInformationFormat="3"
\r
@@
-612,9
+627,9
@@
/>
\r
<Tool
\r
Name="VCResourceCompilerTool"
\r
/>
\r
<Tool
\r
Name="VCResourceCompilerTool"
\r
- PreprocessorDefinitions="_
_WXMSW__;_UNICODE
;_WINDOWS;NOPCH"
\r
+ PreprocessorDefinitions="_
DEBUG;__WXMSW__;__WXUNIVERSAL__;_UNICODE;WXUSINGDLL
;_WINDOWS;NOPCH"
\r
Culture="1033"
\r
Culture="1033"
\r
- AdditionalIncludeDirectories=".\..\..\lib\vc_
lib\mswu
;.\..\..\include;.;.\..\..\samples"
\r
+ AdditionalIncludeDirectories=".\..\..\lib\vc_
dll\mswunivud
;.\..\..\include;.;.\..\..\samples"
\r
/>
\r
<Tool
\r
Name="VCPreLinkEventTool"
\r
/>
\r
<Tool
\r
Name="VCPreLinkEventTool"
\r
@@
-622,14
+637,14
@@
<Tool
\r
Name="VCLinkerTool"
\r
AdditionalOptions=""
\r
<Tool
\r
Name="VCLinkerTool"
\r
AdditionalOptions=""
\r
- AdditionalDependencies="wxmsw
29u_adv.lib wxmsw29u_core.lib wxbase29u.lib 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"
\r
- OutputFile="vc_mswu\combo.exe"
\r
+ AdditionalDependencies="wxmsw
univ29ud_adv.lib wxmswuniv29ud_core.lib wxbase29ud.lib 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"
\r
+ OutputFile="vc_mswu
nivuddll
\combo.exe"
\r
LinkIncremental="2"
\r
SuppressStartupBanner="true"
\r
LinkIncremental="2"
\r
SuppressStartupBanner="true"
\r
- AdditionalLibraryDirectories=".\..\..\lib\vc_
lib
"
\r
+ AdditionalLibraryDirectories=".\..\..\lib\vc_
dll
"
\r
GenerateManifest="true"
\r
GenerateDebugInformation="true"
\r
GenerateManifest="true"
\r
GenerateDebugInformation="true"
\r
- ProgramDatabaseFile="vc_mswu\combo.pdb"
\r
+ ProgramDatabaseFile="vc_mswu
nivuddll
\combo.pdb"
\r
SubSystem="2"
\r
TargetMachine="1"
\r
/>
\r
SubSystem="2"
\r
TargetMachine="1"
\r
/>
\r
@@
-644,7
+659,7
@@
/>
\r
<Tool
\r
Name="VCBscMakeTool"
\r
/>
\r
<Tool
\r
Name="VCBscMakeTool"
\r
- OutputFile="vc_mswu\combo_vc9.bsc"
\r
+ OutputFile="vc_mswu
nivuddll
\combo_vc9.bsc"
\r
SuppressStartupBanner="true"
\r
/>
\r
<Tool
\r
SuppressStartupBanner="true"
\r
/>
\r
<Tool
\r
@@
-658,9
+673,9
@@
/>
\r
</Configuration>
\r
<Configuration
\r
/>
\r
</Configuration>
\r
<Configuration
\r
- Name="D
ebug
|Win32"
\r
- OutputDirectory="vc_mswu
d
"
\r
- IntermediateDirectory="vc_mswu
d
\combo"
\r
+ Name="D
LL Universal Release
|Win32"
\r
+ OutputDirectory="vc_mswu
nivudll
"
\r
+ IntermediateDirectory="vc_mswu
nivudll
\combo"
\r
ConfigurationType="1"
\r
UseOfMFC="0"
\r
ATLMinimizesCRunTimeLibraryUsage="false"
\r
ConfigurationType="1"
\r
UseOfMFC="0"
\r
ATLMinimizesCRunTimeLibraryUsage="false"
\r
@@
-679,22
+694,21
@@
Name="VCWebServiceProxyGeneratorTool"
\r
/>
\r
<Tool
\r
Name="VCWebServiceProxyGeneratorTool"
\r
/>
\r
<Tool
\r
- Name="VCIDLTool"
\r
+ Name="VCMIDLTool"
\r
+ PreprocessorDefinitions="WIN32;__WXMSW__;__WXUNIVERSAL__;NDEBUG;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH"
\r
+ AdditionalIncludeDirectories=".\..\..\lib\vc_dll\mswunivu;.\..\..\include;.;.\..\..\samples"
\r
/>
\r
<Tool
\r
Name="VCCLCompilerTool"
\r
AdditionalOptions="/MP"
\r
/>
\r
<Tool
\r
Name="VCCLCompilerTool"
\r
AdditionalOptions="/MP"
\r
- Optimization="
0
"
\r
- AdditionalIncludeDirectories=".\..\..\lib\vc_
lib\mswud
;.\..\..\include;.;.\..\..\samples"
\r
- PreprocessorDefinitions="
_DEBUG;__WXMSW__;__WXDEBUG__;_UNICODE
;_WINDOWS;NOPCH"
\r
+ Optimization="
2
"
\r
+ AdditionalIncludeDirectories=".\..\..\lib\vc_
dll\mswunivu
;.\..\..\include;.;.\..\..\samples"
\r
+ PreprocessorDefinitions="
WIN32;__WXMSW__;__WXUNIVERSAL__;NDEBUG;_UNICODE;WXUSINGDLL
;_WINDOWS;NOPCH"
\r
ExceptionHandling="1"
\r
ExceptionHandling="1"
\r
- BasicRuntimeChecks="3"
\r
- RuntimeLibrary="3"
\r
- BufferSecurityCheck="true"
\r
+ RuntimeLibrary="2"
\r
RuntimeTypeInfo="true"
\r
RuntimeTypeInfo="true"
\r
- AssemblerListingLocation="vc_mswud\combo\"
\r
- ObjectFile="vc_mswud\combo\"
\r
- ProgramDataBaseFileName="vc_mswud\combo.pdb"
\r
+ ObjectFile="vc_mswunivudll\combo\"
\r
+ ProgramDataBaseFileName="vc_mswunivudll\combo.pdb"
\r
WarningLevel="4"
\r
SuppressStartupBanner="true"
\r
DebugInformationFormat="3"
\r
WarningLevel="4"
\r
SuppressStartupBanner="true"
\r
DebugInformationFormat="3"
\r
@@
-704,9
+718,9
@@
/>
\r
<Tool
\r
Name="VCResourceCompilerTool"
\r
/>
\r
<Tool
\r
Name="VCResourceCompilerTool"
\r
- PreprocessorDefinitions="_
DEBUG;__WXMSW__;__WXDEBUG__;_UNICODE
;_WINDOWS;NOPCH"
\r
+ PreprocessorDefinitions="_
_WXMSW__;__WXUNIVERSAL__;NDEBUG;_UNICODE;WXUSINGDLL
;_WINDOWS;NOPCH"
\r
Culture="1033"
\r
Culture="1033"
\r
- AdditionalIncludeDirectories=".\..\..\lib\vc_
lib\mswud
;.\..\..\include;.;.\..\..\samples"
\r
+ AdditionalIncludeDirectories=".\..\..\lib\vc_
dll\mswunivu
;.\..\..\include;.;.\..\..\samples"
\r
/>
\r
<Tool
\r
Name="VCPreLinkEventTool"
\r
/>
\r
<Tool
\r
Name="VCPreLinkEventTool"
\r
@@
-714,16
+728,18
@@
<Tool
\r
Name="VCLinkerTool"
\r
AdditionalOptions=""
\r
<Tool
\r
Name="VCLinkerTool"
\r
AdditionalOptions=""
\r
- AdditionalDependencies="wxmsw
29ud_adv.lib wxmsw29ud_core.lib wxbase29ud.lib 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"
\r
- OutputFile="vc_mswu
d
\combo.exe"
\r
- LinkIncremental="
2
"
\r
+ AdditionalDependencies="wxmsw
univ29u_adv.lib wxmswuniv29u_core.lib wxbase29u.lib 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"
\r
+ OutputFile="vc_mswu
nivudll
\combo.exe"
\r
+ LinkIncremental="
1
"
\r
SuppressStartupBanner="true"
\r
SuppressStartupBanner="true"
\r
- AdditionalLibraryDirectories=".\..\..\lib\vc_
lib
"
\r
+ AdditionalLibraryDirectories=".\..\..\lib\vc_
dll
"
\r
GenerateManifest="true"
\r
GenerateDebugInformation="true"
\r
GenerateManifest="true"
\r
GenerateDebugInformation="true"
\r
- ProgramDatabaseFile="vc_mswu
d
\combo.pdb"
\r
+ ProgramDatabaseFile="vc_mswu
nivudll
\combo.pdb"
\r
SubSystem="2"
\r
TargetMachine="1"
\r
SubSystem="2"
\r
TargetMachine="1"
\r
+ OptimizeReferences="2"
\r
+ EnableCOMDATFolding="2"
\r
/>
\r
<Tool
\r
Name="VCALinkTool"
\r
/>
\r
<Tool
\r
Name="VCALinkTool"
\r
@@
-736,7
+752,7
@@
/>
\r
<Tool
\r
Name="VCBscMakeTool"
\r
/>
\r
<Tool
\r
Name="VCBscMakeTool"
\r
- OutputFile="vc_mswu
d
\combo_vc9.bsc"
\r
+ OutputFile="vc_mswu
nivudll
\combo_vc9.bsc"
\r
SuppressStartupBanner="true"
\r
/>
\r
<Tool
\r
SuppressStartupBanner="true"
\r
/>
\r
<Tool
\r
@@
-770,7
+786,7
@@
UniqueIdentifier="{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}"
\r
>
\r
<File
\r
UniqueIdentifier="{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}"
\r
>
\r
<File
\r
- RelativePath=".
\.
.\..\samples\sample.rc"
\r
+ RelativePath="..\..\samples\sample.rc"
\r
>
\r
</File>
\r
</Filter>
\r
>
\r
</File>
\r
</Filter>
\r