Amebis/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Don't include wxUniversal configurations in MSVC project files.

Browse Source 
wxUniversal is practically not used under MSW and just confuses people.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@73427 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Vadim Zeitlin
2013-01-21 16:37:01 +00:00
parent b640fa17f3
commit 22a3b6e4b2
1137 changed files with 30808 additions and 204321 deletions
Download Patch File Download Diff File Expand all files Collapse all files

298
build/msw/wx_vc7_wxregex.vcproj
View File

@@ -127,117 +127,6 @@
<Tool
Name="VCAuxiliaryManagedWrapperGeneratorTool"/>
</Configuration>
<Configuration
Name="Universal Debug|Win32"
OutputDirectory="..\..\lib\vc_lib"
IntermediateDirectory="vc_mswunivud\wxregex"
ConfigurationType="4"
UseOfMFC="0"
ATLMinimizesCRunTimeLibraryUsage="FALSE"
CharacterSet="1">
<Tool
Name="VCCLCompilerTool"
Optimization="0"
AdditionalIncludeDirectories="..\..\include;..\..\lib\vc_lib\mswunivud"
PreprocessorDefinitions="WIN32;_LIB;_DEBUG;NDEBUG;_CRT_SECURE_NO_WARNINGS;__WXMSW__;__WXUNIVERSAL__;_UNICODE"
MinimalRebuild="TRUE"
ExceptionHandling="TRUE"
BasicRuntimeChecks="3"
RuntimeLibrary="3"
BufferSecurityCheck="TRUE"
RuntimeTypeInfo="TRUE"
ObjectFile="vc_mswunivud\wxregex\"
ProgramDataBaseFileName="..\..\lib\vc_lib\wxregexud.pdb"
WarningLevel="3"
SuppressStartupBanner="TRUE"
Detect64BitPortabilityProblems="TRUE"
DebugInformationFormat="3"/>
<Tool
Name="VCCustomBuildTool"/>
<Tool
Name="VCLibrarianTool"
OutputFile="..\..\lib\vc_lib\wxregexud.lib"
SuppressStartupBanner="TRUE"/>
<Tool
Name="VCMIDLTool"
PreprocessorDefinitions="WIN32;_LIB;_DEBUG;NDEBUG;_CRT_SECURE_NO_WARNINGS;__WXMSW__;__WXUNIVERSAL__;_UNICODE"
AdditionalIncludeDirectories="..\..\include;..\..\lib\vc_lib\mswunivud"/>
<Tool
Name="VCPostBuildEventTool"/>
<Tool
Name="VCPreBuildEventTool"/>
<Tool
Name="VCPreLinkEventTool"/>
<Tool
Name="VCResourceCompilerTool"
PreprocessorDefinitions="_DEBUG;NDEBUG;_CRT_SECURE_NO_WARNINGS;__WXMSW__;__WXUNIVERSAL__;_UNICODE"
Culture="1033"
AdditionalIncludeDirectories="..\..\include;..\..\lib\vc_lib\mswunivud"/>
<Tool
Name="VCWebServiceProxyGeneratorTool"/>
<Tool
Name="VCXMLDataGeneratorTool"/>
<Tool
Name="VCWebDeploymentTool"/>
<Tool
Name="VCManagedWrapperGeneratorTool"/>
<Tool
Name="VCAuxiliaryManagedWrapperGeneratorTool"/>
</Configuration>
<Configuration
Name="Universal Release|Win32"
OutputDirectory="..\..\lib\vc_lib"
IntermediateDirectory="vc_mswunivu\wxregex"
ConfigurationType="4"
UseOfMFC="0"
ATLMinimizesCRunTimeLibraryUsage="FALSE"
CharacterSet="1">
<Tool
Name="VCCLCompilerTool"
Optimization="2"
AdditionalIncludeDirectories="..\..\include;..\..\lib\vc_lib\mswunivu"
PreprocessorDefinitions="WIN32;_LIB;NDEBUG;_CRT_SECURE_NO_WARNINGS;__WXMSW__;__WXUNIVERSAL__;_UNICODE"
ExceptionHandling="TRUE"
RuntimeLibrary="2"
RuntimeTypeInfo="TRUE"
ObjectFile="vc_mswunivu\wxregex\"
ProgramDataBaseFileName="..\..\lib\vc_lib\wxregexu.pdb"
WarningLevel="3"
SuppressStartupBanner="TRUE"
Detect64BitPortabilityProblems="TRUE"
DebugInformationFormat="3"/>
<Tool
Name="VCCustomBuildTool"/>
<Tool
Name="VCLibrarianTool"
OutputFile="..\..\lib\vc_lib\wxregexu.lib"
SuppressStartupBanner="TRUE"/>
<Tool
Name="VCMIDLTool"
PreprocessorDefinitions="WIN32;_LIB;NDEBUG;_CRT_SECURE_NO_WARNINGS;__WXMSW__;__WXUNIVERSAL__;_UNICODE"
AdditionalIncludeDirectories="..\..\include;..\..\lib\vc_lib\mswunivu"/>
<Tool
Name="VCPostBuildEventTool"/>
<Tool
Name="VCPreBuildEventTool"/>
<Tool
Name="VCPreLinkEventTool"/>
<Tool
Name="VCResourceCompilerTool"
PreprocessorDefinitions="NDEBUG;_CRT_SECURE_NO_WARNINGS;__WXMSW__;__WXUNIVERSAL__;_UNICODE"
Culture="1033"
AdditionalIncludeDirectories="..\..\include;..\..\lib\vc_lib\mswunivu"/>
<Tool
Name="VCWebServiceProxyGeneratorTool"/>
<Tool
Name="VCXMLDataGeneratorTool"/>
<Tool
Name="VCWebDeploymentTool"/>
<Tool
Name="VCManagedWrapperGeneratorTool"/>
<Tool
Name="VCAuxiliaryManagedWrapperGeneratorTool"/>
</Configuration>
<Configuration
Name="DLL Debug|Win32"
OutputDirectory="..\..\lib\vc_dll"
@@ -349,117 +238,6 @@
<Tool
Name="VCAuxiliaryManagedWrapperGeneratorTool"/>
</Configuration>
<Configuration
Name="DLL Universal Debug|Win32"
OutputDirectory="..\..\lib\vc_dll"
IntermediateDirectory="vc_mswunivuddll\wxregex"
ConfigurationType="4"
UseOfMFC="0"
ATLMinimizesCRunTimeLibraryUsage="FALSE"
CharacterSet="1">
<Tool
Name="VCCLCompilerTool"
Optimization="0"
AdditionalIncludeDirectories="..\..\include;..\..\lib\vc_dll\mswunivud"
PreprocessorDefinitions="WIN32;_LIB;_DEBUG;NDEBUG;_CRT_SECURE_NO_WARNINGS;__WXMSW__;__WXUNIVERSAL__;_UNICODE"
MinimalRebuild="TRUE"
ExceptionHandling="TRUE"
BasicRuntimeChecks="3"
RuntimeLibrary="3"
BufferSecurityCheck="TRUE"
RuntimeTypeInfo="TRUE"
ObjectFile="vc_mswunivuddll\wxregex\"
ProgramDataBaseFileName="..\..\lib\vc_dll\wxregexud.pdb"
WarningLevel="3"
SuppressStartupBanner="TRUE"
Detect64BitPortabilityProblems="TRUE"
DebugInformationFormat="3"/>
<Tool
Name="VCCustomBuildTool"/>
<Tool
Name="VCLibrarianTool"
OutputFile="..\..\lib\vc_dll\wxregexud.lib"
SuppressStartupBanner="TRUE"/>
<Tool
Name="VCMIDLTool"
PreprocessorDefinitions="WIN32;_LIB;_DEBUG;NDEBUG;_CRT_SECURE_NO_WARNINGS;__WXMSW__;__WXUNIVERSAL__;_UNICODE"
AdditionalIncludeDirectories="..\..\include;..\..\lib\vc_dll\mswunivud"/>
<Tool
Name="VCPostBuildEventTool"/>
<Tool
Name="VCPreBuildEventTool"/>
<Tool
Name="VCPreLinkEventTool"/>
<Tool
Name="VCResourceCompilerTool"
PreprocessorDefinitions="_DEBUG;NDEBUG;_CRT_SECURE_NO_WARNINGS;__WXMSW__;__WXUNIVERSAL__;_UNICODE"
Culture="1033"
AdditionalIncludeDirectories="..\..\include;..\..\lib\vc_dll\mswunivud"/>
<Tool
Name="VCWebServiceProxyGeneratorTool"/>
<Tool
Name="VCXMLDataGeneratorTool"/>
<Tool
Name="VCWebDeploymentTool"/>
<Tool
Name="VCManagedWrapperGeneratorTool"/>
<Tool
Name="VCAuxiliaryManagedWrapperGeneratorTool"/>
</Configuration>
<Configuration
Name="DLL Universal Release|Win32"
OutputDirectory="..\..\lib\vc_dll"
IntermediateDirectory="vc_mswunivudll\wxregex"
ConfigurationType="4"
UseOfMFC="0"
ATLMinimizesCRunTimeLibraryUsage="FALSE"
CharacterSet="1">
<Tool
Name="VCCLCompilerTool"
Optimization="2"
AdditionalIncludeDirectories="..\..\include;..\..\lib\vc_dll\mswunivu"
PreprocessorDefinitions="WIN32;_LIB;NDEBUG;_CRT_SECURE_NO_WARNINGS;__WXMSW__;__WXUNIVERSAL__;_UNICODE"
ExceptionHandling="TRUE"
RuntimeLibrary="2"
RuntimeTypeInfo="TRUE"
ObjectFile="vc_mswunivudll\wxregex\"
ProgramDataBaseFileName="..\..\lib\vc_dll\wxregexu.pdb"
WarningLevel="3"
SuppressStartupBanner="TRUE"
Detect64BitPortabilityProblems="TRUE"
DebugInformationFormat="3"/>
<Tool
Name="VCCustomBuildTool"/>
<Tool
Name="VCLibrarianTool"
OutputFile="..\..\lib\vc_dll\wxregexu.lib"
SuppressStartupBanner="TRUE"/>
<Tool
Name="VCMIDLTool"
PreprocessorDefinitions="WIN32;_LIB;NDEBUG;_CRT_SECURE_NO_WARNINGS;__WXMSW__;__WXUNIVERSAL__;_UNICODE"
AdditionalIncludeDirectories="..\..\include;..\..\lib\vc_dll\mswunivu"/>
<Tool
Name="VCPostBuildEventTool"/>
<Tool
Name="VCPreBuildEventTool"/>
<Tool
Name="VCPreLinkEventTool"/>
<Tool
Name="VCResourceCompilerTool"
PreprocessorDefinitions="NDEBUG;_CRT_SECURE_NO_WARNINGS;__WXMSW__;__WXUNIVERSAL__;_UNICODE"
Culture="1033"
AdditionalIncludeDirectories="..\..\include;..\..\lib\vc_dll\mswunivu"/>
<Tool
Name="VCWebServiceProxyGeneratorTool"/>
<Tool
Name="VCXMLDataGeneratorTool"/>
<Tool
Name="VCWebDeploymentTool"/>
<Tool
Name="VCManagedWrapperGeneratorTool"/>
<Tool
Name="VCAuxiliaryManagedWrapperGeneratorTool"/>
</Configuration>
</Configurations>
<References>
@@ -506,24 +284,6 @@
Outputs="..\..\lib\vc_lib\mswu\wx\msw\rcdefs.h"
AdditionalDependencies="&quot;..\..\lib\vc_lib\mswu\wx\msw&quot;"/>
</FileConfiguration>
<FileConfiguration
Name="Universal Debug|Win32">
<Tool
Name="VCCustomBuildTool"
Description="Creating ..\..\lib\vc_lib\mswunivud\wx\msw\rcdefs.h"
CommandLine="cl /EP /nologo &quot;$(InputPath)&quot; &gt; &quot;..\..\lib\vc_lib\mswunivud\wx\msw\rcdefs.h&quot;"
Outputs="..\..\lib\vc_lib\mswunivud\wx\msw\rcdefs.h"
AdditionalDependencies="&quot;..\..\lib\vc_lib\mswunivud\wx\msw&quot;"/>
</FileConfiguration>
<FileConfiguration
Name="Universal Release|Win32">
<Tool
Name="VCCustomBuildTool"
Description="Creating ..\..\lib\vc_lib\mswunivu\wx\msw\rcdefs.h"
CommandLine="cl /EP /nologo &quot;$(InputPath)&quot; &gt; &quot;..\..\lib\vc_lib\mswunivu\wx\msw\rcdefs.h&quot;"
Outputs="..\..\lib\vc_lib\mswunivu\wx\msw\rcdefs.h"
AdditionalDependencies="&quot;..\..\lib\vc_lib\mswunivu\wx\msw&quot;"/>
</FileConfiguration>
<FileConfiguration
Name="DLL Debug|Win32">
<Tool
@@ -542,24 +302,6 @@
Outputs="..\..\lib\vc_dll\mswu\wx\msw\rcdefs.h"
AdditionalDependencies="&quot;..\..\lib\vc_dll\mswu\wx\msw&quot;"/>
</FileConfiguration>
<FileConfiguration
Name="DLL Universal Debug|Win32">
<Tool
Name="VCCustomBuildTool"
Description="Creating ..\..\lib\vc_dll\mswunivud\wx\msw\rcdefs.h"
CommandLine="cl /EP /nologo &quot;$(InputPath)&quot; &gt; &quot;..\..\lib\vc_dll\mswunivud\wx\msw\rcdefs.h&quot;"
Outputs="..\..\lib\vc_dll\mswunivud\wx\msw\rcdefs.h"
AdditionalDependencies="&quot;..\..\lib\vc_dll\mswunivud\wx\msw&quot;"/>
</FileConfiguration>
<FileConfiguration
Name="DLL Universal Release|Win32">
<Tool
Name="VCCustomBuildTool"
Description="Creating ..\..\lib\vc_dll\mswunivu\wx\msw\rcdefs.h"
CommandLine="cl /EP /nologo &quot;$(InputPath)&quot; &gt; &quot;..\..\lib\vc_dll\mswunivu\wx\msw\rcdefs.h&quot;"
Outputs="..\..\lib\vc_dll\mswunivu\wx\msw\rcdefs.h"
AdditionalDependencies="&quot;..\..\lib\vc_dll\mswunivu\wx\msw&quot;"/>
</FileConfiguration>
</File>
<File
RelativePath="..\..\include\wx\msw\setup.h">
@@ -579,10 +321,6 @@
CommandLine="copy &quot;$(InputPath)&quot; ..\..\lib\vc_lib\mswu\wx\setup.h"
Outputs="..\..\lib\vc_lib\mswu\wx\setup.h"/>
</FileConfiguration>
<FileConfiguration
Name="Universal Debug|Win32"/>
<FileConfiguration
Name="Universal Release|Win32"/>
<FileConfiguration
Name="DLL Debug|Win32">
<Tool
@@ -599,10 +337,6 @@
CommandLine="copy &quot;$(InputPath)&quot; ..\..\lib\vc_dll\mswu\wx\setup.h"
Outputs="..\..\lib\vc_dll\mswu\wx\setup.h"/>
</FileConfiguration>
<FileConfiguration
Name="DLL Universal Debug|Win32"/>
<FileConfiguration
Name="DLL Universal Release|Win32"/>
</File>
<File
RelativePath="..\..\include\wx\univ\setup.h">
@@ -610,42 +344,10 @@
Name="Debug|Win32"/>
<FileConfiguration
Name="Release|Win32"/>
<FileConfiguration
Name="Universal Debug|Win32">
<Tool
Name="VCCustomBuildTool"
Description="Creating ..\..\lib\vc_lib\mswunivud\wx\setup.h"
CommandLine="copy &quot;$(InputPath)&quot; ..\..\lib\vc_lib\mswunivud\wx\setup.h"
Outputs="..\..\lib\vc_lib\mswunivud\wx\setup.h"/>
</FileConfiguration>
<FileConfiguration
Name="Universal Release|Win32">
<Tool
Name="VCCustomBuildTool"
Description="Creating ..\..\lib\vc_lib\mswunivu\wx\setup.h"
CommandLine="copy &quot;$(InputPath)&quot; ..\..\lib\vc_lib\mswunivu\wx\setup.h"
Outputs="..\..\lib\vc_lib\mswunivu\wx\setup.h"/>
</FileConfiguration>
<FileConfiguration
Name="DLL Debug|Win32"/>
<FileConfiguration
Name="DLL Release|Win32"/>
<FileConfiguration
Name="DLL Universal Debug|Win32">
<Tool
Name="VCCustomBuildTool"
Description="Creating ..\..\lib\vc_dll\mswunivud\wx\setup.h"
CommandLine="copy &quot;$(InputPath)&quot; ..\..\lib\vc_dll\mswunivud\wx\setup.h"
Outputs="..\..\lib\vc_dll\mswunivud\wx\setup.h"/>
</FileConfiguration>
<FileConfiguration
Name="DLL Universal Release|Win32">
<Tool
Name="VCCustomBuildTool"
Description="Creating ..\..\lib\vc_dll\mswunivu\wx\setup.h"
CommandLine="copy &quot;$(InputPath)&quot; ..\..\lib\vc_dll\mswunivu\wx\setup.h"
Outputs="..\..\lib\vc_dll\mswunivu\wx\setup.h"/>
</FileConfiguration>
</File>
</Filter>
</Files>