Externals: Fixed the wx lib builds

git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@4073 8ced0084-cf51-0410-be5f-012b33b47a6e
This commit is contained in:
John Peterson 2009-08-27 05:58:32 +00:00
parent c25f073d13
commit 217e0da0e6
4 changed files with 22 additions and 4117 deletions

View File

@ -18,82 +18,6 @@
<ToolFiles>
</ToolFiles>
<Configurations>
<Configuration
Name="DebugFast|Win32"
OutputDirectory="wxAdv28_$(PlatformName)\$(ConfigurationName)"
IntermediateDirectory="wxAdv28_$(PlatformName)\$(ConfigurationName)"
ConfigurationType="4"
InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC60.vsprops"
UseOfMFC="0"
ATLMinimizesCRunTimeLibraryUsage="false"
CharacterSet="1"
>
<Tool
Name="VCPreBuildEventTool"
/>
<Tool
Name="VCCustomBuildTool"
/>
<Tool
Name="VCXMLDataGeneratorTool"
/>
<Tool
Name="VCWebServiceProxyGeneratorTool"
/>
<Tool
Name="VCMIDLTool"
/>
<Tool
Name="VCCLCompilerTool"
Optimization="0"
AdditionalIncludeDirectories="..\..\Include;..\..\Include\msvc;..\..\..\zlib;..\..\src\png"
PreprocessorDefinitions="WIN32;_LIB;__WXMSW__;_CRT_SECURE_NO_DEPRECATE;_SECURE_SCL=0"
MinimalRebuild="true"
RuntimeLibrary="0"
RuntimeTypeInfo="true"
UsePrecompiledHeader="2"
PrecompiledHeaderThrough="wx/wxprec.h"
PrecompiledHeaderFile="$(IntDir)\$(TargetName).pch"
AssemblerListingLocation="$(IntDir)\"
ObjectFile="$(IntDir)\"
ProgramDataBaseFileName="$(IntDir)\vc80.pdb"
WarningLevel="4"
SuppressStartupBanner="true"
DebugInformationFormat="3"
/>
<Tool
Name="VCManagedResourceCompilerTool"
/>
<Tool
Name="VCResourceCompilerTool"
Culture="1033"
/>
<Tool
Name="VCPreLinkEventTool"
/>
<Tool
Name="VCLibrarianTool"
OutputFile="$(OutDir)/wxAdv28.lib"
SuppressStartupBanner="true"
/>
<Tool
Name="VCALinkTool"
/>
<Tool
Name="VCXDCMakeTool"
/>
<Tool
Name="VCBscMakeTool"
SuppressStartupBanner="true"
OutputFile=".\..\..\lib\vc_lib/wx_adv.bsc"
/>
<Tool
Name="VCFxCopTool"
/>
<Tool
Name="VCPostBuildEventTool"
/>
</Configuration>
<Configuration
Name="DebugFast|x64"
OutputDirectory="wxAdv28_$(PlatformName)\$(ConfigurationName)"
@ -494,15 +418,6 @@
<File
RelativePath="..\..\src\common\animatecmn.cpp"
>
<FileConfiguration
Name="DebugFast|Win32"
>
<Tool
Name="VCCLCompilerTool"
AdditionalIncludeDirectories=""
PreprocessorDefinitions=""
/>
</FileConfiguration>
<FileConfiguration
Name="DebugFast|x64"
>
@ -552,15 +467,6 @@
<File
RelativePath="..\..\src\common\datavcmn.cpp"
>
<FileConfiguration
Name="DebugFast|Win32"
>
<Tool
Name="VCCLCompilerTool"
AdditionalIncludeDirectories=""
PreprocessorDefinitions=""
/>
</FileConfiguration>
<FileConfiguration
Name="DebugFast|x64"
>
@ -610,16 +516,6 @@
<File
RelativePath="..\..\src\common\dummy.cpp"
>
<FileConfiguration
Name="DebugFast|Win32"
>
<Tool
Name="VCCLCompilerTool"
AdditionalIncludeDirectories=""
PreprocessorDefinitions=""
UsePrecompiledHeader="1"
/>
</FileConfiguration>
<FileConfiguration
Name="DebugFast|x64"
>
@ -674,15 +570,6 @@
<File
RelativePath="..\..\src\common\taskbarcmn.cpp"
>
<FileConfiguration
Name="DebugFast|Win32"
>
<Tool
Name="VCCLCompilerTool"
AdditionalIncludeDirectories=""
PreprocessorDefinitions=""
/>
</FileConfiguration>
<FileConfiguration
Name="DebugFast|x64"
>
@ -736,15 +623,6 @@
<File
RelativePath="..\..\src\msw\aboutdlg.cpp"
>
<FileConfiguration
Name="DebugFast|Win32"
>
<Tool
Name="VCCLCompilerTool"
AdditionalIncludeDirectories=""
PreprocessorDefinitions=""
/>
</FileConfiguration>
<FileConfiguration
Name="DebugFast|x64"
>
@ -794,15 +672,6 @@
<File
RelativePath="..\..\src\msw\datectrl.cpp"
>
<FileConfiguration
Name="DebugFast|Win32"
>
<Tool
Name="VCCLCompilerTool"
AdditionalIncludeDirectories=""
PreprocessorDefinitions=""
/>
</FileConfiguration>
<FileConfiguration
Name="DebugFast|x64"
>
@ -852,15 +721,6 @@
<File
RelativePath="..\..\src\msw\joystick.cpp"
>
<FileConfiguration
Name="DebugFast|Win32"
>
<Tool
Name="VCCLCompilerTool"
AdditionalIncludeDirectories=""
PreprocessorDefinitions=""
/>
</FileConfiguration>
<FileConfiguration
Name="DebugFast|x64"
>
@ -910,15 +770,6 @@
<File
RelativePath="..\..\src\msw\sound.cpp"
>
<FileConfiguration
Name="DebugFast|Win32"
>
<Tool
Name="VCCLCompilerTool"
AdditionalIncludeDirectories=""
PreprocessorDefinitions=""
/>
</FileConfiguration>
<FileConfiguration
Name="DebugFast|x64"
>
@ -968,15 +819,6 @@
<File
RelativePath="..\..\src\msw\taskbar.cpp"
>
<FileConfiguration
Name="DebugFast|Win32"
>
<Tool
Name="VCCLCompilerTool"
AdditionalIncludeDirectories=""
PreprocessorDefinitions=""
/>
</FileConfiguration>
<FileConfiguration
Name="DebugFast|x64"
>
@ -1026,15 +868,6 @@
<File
RelativePath="..\..\src\msw\version.rc"
>
<FileConfiguration
Name="DebugFast|Win32"
ExcludedFromBuild="true"
>
<Tool
Name="VCResourceCompilerTool"
AdditionalIncludeDirectories="\Emulation\SCMs\dolphin\Externals\wxWidgets\src\msw"
/>
</FileConfiguration>
<FileConfiguration
Name="DebugFast|x64"
ExcludedFromBuild="true"
@ -1088,15 +921,6 @@
<File
RelativePath="..\..\src\generic\aboutdlgg.cpp"
>
<FileConfiguration
Name="DebugFast|Win32"
>
<Tool
Name="VCCLCompilerTool"
AdditionalIncludeDirectories=""
PreprocessorDefinitions=""
/>
</FileConfiguration>
<FileConfiguration
Name="DebugFast|x64"
>
@ -1146,15 +970,6 @@
<File
RelativePath="..\..\src\generic\animateg.cpp"
>
<FileConfiguration
Name="DebugFast|Win32"
>
<Tool
Name="VCCLCompilerTool"
AdditionalIncludeDirectories=""
PreprocessorDefinitions=""
/>
</FileConfiguration>
<FileConfiguration
Name="DebugFast|x64"
>
@ -1204,15 +1019,6 @@
<File
RelativePath="..\..\src\generic\bmpcboxg.cpp"
>
<FileConfiguration
Name="DebugFast|Win32"
>
<Tool
Name="VCCLCompilerTool"
AdditionalIncludeDirectories=""
PreprocessorDefinitions=""
/>
</FileConfiguration>
<FileConfiguration
Name="DebugFast|x64"
>
@ -1262,15 +1068,6 @@
<File
RelativePath="..\..\src\generic\calctrl.cpp"
>
<FileConfiguration
Name="DebugFast|Win32"
>
<Tool
Name="VCCLCompilerTool"
AdditionalIncludeDirectories=""
PreprocessorDefinitions=""
/>
</FileConfiguration>
<FileConfiguration
Name="DebugFast|x64"
>
@ -1320,15 +1117,6 @@
<File
RelativePath="..\..\src\generic\datavgen.cpp"
>
<FileConfiguration
Name="DebugFast|Win32"
>
<Tool
Name="VCCLCompilerTool"
AdditionalIncludeDirectories=""
PreprocessorDefinitions=""
/>
</FileConfiguration>
<FileConfiguration
Name="DebugFast|x64"
>
@ -1378,15 +1166,6 @@
<File
RelativePath="..\..\src\generic\datectlg.cpp"
>
<FileConfiguration
Name="DebugFast|Win32"
>
<Tool
Name="VCCLCompilerTool"
AdditionalIncludeDirectories=""
PreprocessorDefinitions=""
/>
</FileConfiguration>
<FileConfiguration
Name="DebugFast|x64"
>
@ -1436,15 +1215,6 @@
<File
RelativePath="..\..\src\generic\grid.cpp"
>
<FileConfiguration
Name="DebugFast|Win32"
>
<Tool
Name="VCCLCompilerTool"
AdditionalIncludeDirectories=""
PreprocessorDefinitions=""
/>
</FileConfiguration>
<FileConfiguration
Name="DebugFast|x64"
>
@ -1494,15 +1264,6 @@
<File
RelativePath="..\..\src\generic\gridctrl.cpp"
>
<FileConfiguration
Name="DebugFast|Win32"
>
<Tool
Name="VCCLCompilerTool"
AdditionalIncludeDirectories=""
PreprocessorDefinitions=""
/>
</FileConfiguration>
<FileConfiguration
Name="DebugFast|x64"
>
@ -1552,15 +1313,6 @@
<File
RelativePath="..\..\src\generic\gridsel.cpp"
>
<FileConfiguration
Name="DebugFast|Win32"
>
<Tool
Name="VCCLCompilerTool"
AdditionalIncludeDirectories=""
PreprocessorDefinitions=""
/>
</FileConfiguration>
<FileConfiguration
Name="DebugFast|x64"
>
@ -1610,15 +1362,6 @@
<File
RelativePath="..\..\src\generic\helpext.cpp"
>
<FileConfiguration
Name="DebugFast|Win32"
>
<Tool
Name="VCCLCompilerTool"
AdditionalIncludeDirectories=""
PreprocessorDefinitions=""
/>
</FileConfiguration>
<FileConfiguration
Name="DebugFast|x64"
>
@ -1668,15 +1411,6 @@
<File
RelativePath="..\..\src\generic\hyperlink.cpp"
>
<FileConfiguration
Name="DebugFast|Win32"
>
<Tool
Name="VCCLCompilerTool"
AdditionalIncludeDirectories=""
PreprocessorDefinitions=""
/>
</FileConfiguration>
<FileConfiguration
Name="DebugFast|x64"
>
@ -1726,15 +1460,6 @@
<File
RelativePath="..\..\src\generic\laywin.cpp"
>
<FileConfiguration
Name="DebugFast|Win32"
>
<Tool
Name="VCCLCompilerTool"
AdditionalIncludeDirectories=""
PreprocessorDefinitions=""
/>
</FileConfiguration>
<FileConfiguration
Name="DebugFast|x64"
>
@ -1784,15 +1509,6 @@
<File
RelativePath="..\..\src\generic\odcombo.cpp"
>
<FileConfiguration
Name="DebugFast|Win32"
>
<Tool
Name="VCCLCompilerTool"
AdditionalIncludeDirectories=""
PreprocessorDefinitions=""
/>
</FileConfiguration>
<FileConfiguration
Name="DebugFast|x64"
>
@ -1842,15 +1558,6 @@
<File
RelativePath="..\..\src\generic\propdlg.cpp"
>
<FileConfiguration
Name="DebugFast|Win32"
>
<Tool
Name="VCCLCompilerTool"
AdditionalIncludeDirectories=""
PreprocessorDefinitions=""
/>
</FileConfiguration>
<FileConfiguration
Name="DebugFast|x64"
>
@ -1900,15 +1607,6 @@
<File
RelativePath="..\..\src\generic\sashwin.cpp"
>
<FileConfiguration
Name="DebugFast|Win32"
>
<Tool
Name="VCCLCompilerTool"
AdditionalIncludeDirectories=""
PreprocessorDefinitions=""
/>
</FileConfiguration>
<FileConfiguration
Name="DebugFast|x64"
>
@ -1958,15 +1656,6 @@
<File
RelativePath="..\..\src\generic\splash.cpp"
>
<FileConfiguration
Name="DebugFast|Win32"
>
<Tool
Name="VCCLCompilerTool"
AdditionalIncludeDirectories=""
PreprocessorDefinitions=""
/>
</FileConfiguration>
<FileConfiguration
Name="DebugFast|x64"
>
@ -2016,15 +1705,6 @@
<File
RelativePath="..\..\src\generic\tipdlg.cpp"
>
<FileConfiguration
Name="DebugFast|Win32"
>
<Tool
Name="VCCLCompilerTool"
AdditionalIncludeDirectories=""
PreprocessorDefinitions=""
/>
</FileConfiguration>
<FileConfiguration
Name="DebugFast|x64"
>
@ -2074,15 +1754,6 @@
<File
RelativePath="..\..\src\generic\wizard.cpp"
>
<FileConfiguration
Name="DebugFast|Win32"
>
<Tool
Name="VCCLCompilerTool"
AdditionalIncludeDirectories=""
PreprocessorDefinitions=""
/>
</FileConfiguration>
<FileConfiguration
Name="DebugFast|x64"
>
@ -2133,23 +1804,9 @@
<Filter
Name="Setup Headers"
>
<File
RelativePath="..\..\include\wx\univ\setup.h"
>
</File>
<File
RelativePath="..\..\include\wx\msw\setup.h"
>
<FileConfiguration
Name="DebugFast|Win32"
>
<Tool
Name="VCCustomBuildTool"
Description="Creating ..\..\lib\vc_lib\mswd\wx\setup.h"
CommandLine="copy &quot;$(InputPath)&quot; ..\..\lib\vc_lib\mswd\wx\setup.h&#x0D;&#x0A;"
Outputs="..\..\lib\vc_lib\mswd\wx\setup.h"
/>
</FileConfiguration>
<FileConfiguration
Name="DebugFast|x64"
>
@ -2201,6 +1858,10 @@
/>
</FileConfiguration>
</File>
<File
RelativePath="..\..\include\wx\univ\setup.h"
>
</File>
</Filter>
<Filter
Name="MSW Headers"
@ -2212,16 +1873,6 @@
<File
RelativePath="..\..\include\wx\msw\genrcdefs.h"
>
<FileConfiguration
Name="DebugFast|Win32"
>
<Tool
Name="VCCustomBuildTool"
Description="Creating ..\..\lib\vc_lib\mswd\wx\msw\rcdefs.h"
CommandLine="cl /EP /nologo &quot;$(InputPath)&quot; &gt; &quot;..\..\lib\vc_lib\mswd\wx\msw\rcdefs.h&quot;&#x0D;&#x0A;"
Outputs="..\..\lib\vc_lib\mswd\wx\msw\rcdefs.h"
/>
</FileConfiguration>
<FileConfiguration
Name="DebugFast|x64"
>

File diff suppressed because it is too large Load Diff

File diff suppressed because it is too large Load Diff

View File

@ -45,10 +45,8 @@ Global
{1C8436C9-DBAF-42BE-83BC-CF3EC9175ABE}.Debug|Win32.Build.0 = Debug|Win32
{1C8436C9-DBAF-42BE-83BC-CF3EC9175ABE}.Debug|x64.ActiveCfg = Debug|x64
{1C8436C9-DBAF-42BE-83BC-CF3EC9175ABE}.Debug|x64.Build.0 = Debug|x64
{1C8436C9-DBAF-42BE-83BC-CF3EC9175ABE}.DebugFast|Win32.ActiveCfg = DebugFast|Win32
{1C8436C9-DBAF-42BE-83BC-CF3EC9175ABE}.DebugFast|Win32.Build.0 = DebugFast|Win32
{1C8436C9-DBAF-42BE-83BC-CF3EC9175ABE}.DebugFast|x64.ActiveCfg = DebugFast|x64
{1C8436C9-DBAF-42BE-83BC-CF3EC9175ABE}.DebugFast|x64.Build.0 = DebugFast|x64
{1C8436C9-DBAF-42BE-83BC-CF3EC9175ABE}.DebugFast|Win32.ActiveCfg = Release|Win32
{1C8436C9-DBAF-42BE-83BC-CF3EC9175ABE}.DebugFast|x64.ActiveCfg = Release|x64
{1C8436C9-DBAF-42BE-83BC-CF3EC9175ABE}.Release|Win32.ActiveCfg = Release|Win32
{1C8436C9-DBAF-42BE-83BC-CF3EC9175ABE}.Release|Win32.Build.0 = Release|Win32
{1C8436C9-DBAF-42BE-83BC-CF3EC9175ABE}.Release|x64.ActiveCfg = Release|x64
@ -57,10 +55,8 @@ Global
{0E231FB1-F3C9-4724-ACCB-DE8BCB3C089E}.Debug|Win32.Build.0 = Debug|Win32
{0E231FB1-F3C9-4724-ACCB-DE8BCB3C089E}.Debug|x64.ActiveCfg = Debug|x64
{0E231FB1-F3C9-4724-ACCB-DE8BCB3C089E}.Debug|x64.Build.0 = Debug|x64
{0E231FB1-F3C9-4724-ACCB-DE8BCB3C089E}.DebugFast|Win32.ActiveCfg = DebugFast|Win32
{0E231FB1-F3C9-4724-ACCB-DE8BCB3C089E}.DebugFast|Win32.Build.0 = DebugFast|Win32
{0E231FB1-F3C9-4724-ACCB-DE8BCB3C089E}.DebugFast|x64.ActiveCfg = DebugFast|x64
{0E231FB1-F3C9-4724-ACCB-DE8BCB3C089E}.DebugFast|x64.Build.0 = DebugFast|x64
{0E231FB1-F3C9-4724-ACCB-DE8BCB3C089E}.DebugFast|Win32.ActiveCfg = Release|Win32
{0E231FB1-F3C9-4724-ACCB-DE8BCB3C089E}.DebugFast|x64.ActiveCfg = Release|x64
{0E231FB1-F3C9-4724-ACCB-DE8BCB3C089E}.Release|Win32.ActiveCfg = Release|Win32
{0E231FB1-F3C9-4724-ACCB-DE8BCB3C089E}.Release|Win32.Build.0 = Release|Win32
{0E231FB1-F3C9-4724-ACCB-DE8BCB3C089E}.Release|x64.ActiveCfg = Release|x64
@ -69,10 +65,8 @@ Global
{11F55366-12EC-4C44-A8CB-1D4E315D61ED}.Debug|Win32.Build.0 = Debug|Win32
{11F55366-12EC-4C44-A8CB-1D4E315D61ED}.Debug|x64.ActiveCfg = Debug|x64
{11F55366-12EC-4C44-A8CB-1D4E315D61ED}.Debug|x64.Build.0 = Debug|x64
{11F55366-12EC-4C44-A8CB-1D4E315D61ED}.DebugFast|Win32.ActiveCfg = DebugFast|Win32
{11F55366-12EC-4C44-A8CB-1D4E315D61ED}.DebugFast|Win32.Build.0 = DebugFast|Win32
{11F55366-12EC-4C44-A8CB-1D4E315D61ED}.DebugFast|x64.ActiveCfg = DebugFast|x64
{11F55366-12EC-4C44-A8CB-1D4E315D61ED}.DebugFast|x64.Build.0 = DebugFast|x64
{11F55366-12EC-4C44-A8CB-1D4E315D61ED}.DebugFast|Win32.ActiveCfg = Release|Win32
{11F55366-12EC-4C44-A8CB-1D4E315D61ED}.DebugFast|x64.ActiveCfg = Release|x64
{11F55366-12EC-4C44-A8CB-1D4E315D61ED}.Release|Win32.ActiveCfg = Release|Win32
{11F55366-12EC-4C44-A8CB-1D4E315D61ED}.Release|Win32.Build.0 = Release|Win32
{11F55366-12EC-4C44-A8CB-1D4E315D61ED}.Release|x64.ActiveCfg = Release|x64
@ -105,7 +99,8 @@ Global
{823DDC98-42D5-4A38-88CF-9DC06C788AE4}.Debug|Win32.Build.0 = Debug|Win32
{823DDC98-42D5-4A38-88CF-9DC06C788AE4}.Debug|x64.ActiveCfg = Debug|x64
{823DDC98-42D5-4A38-88CF-9DC06C788AE4}.Debug|x64.Build.0 = Debug|x64
{823DDC98-42D5-4A38-88CF-9DC06C788AE4}.DebugFast|Win32.ActiveCfg = Debug|x64
{823DDC98-42D5-4A38-88CF-9DC06C788AE4}.DebugFast|Win32.ActiveCfg = Debug|Win32
{823DDC98-42D5-4A38-88CF-9DC06C788AE4}.DebugFast|Win32.Build.0 = Debug|Win32
{823DDC98-42D5-4A38-88CF-9DC06C788AE4}.DebugFast|x64.ActiveCfg = Debug|x64
{823DDC98-42D5-4A38-88CF-9DC06C788AE4}.DebugFast|x64.Build.0 = Debug|x64
{823DDC98-42D5-4A38-88CF-9DC06C788AE4}.Release|Win32.ActiveCfg = Release|Win32
@ -140,9 +135,8 @@ Global
{05C75041-D67D-4903-A362-8395A7B35C75}.Debug|Win32.Build.0 = Debug|Win32
{05C75041-D67D-4903-A362-8395A7B35C75}.Debug|x64.ActiveCfg = Debug|x64
{05C75041-D67D-4903-A362-8395A7B35C75}.Debug|x64.Build.0 = Debug|x64
{05C75041-D67D-4903-A362-8395A7B35C75}.DebugFast|Win32.ActiveCfg = Debug|Win32
{05C75041-D67D-4903-A362-8395A7B35C75}.DebugFast|Win32.Build.0 = Debug|Win32
{05C75041-D67D-4903-A362-8395A7B35C75}.DebugFast|x64.ActiveCfg = Release|Win32
{05C75041-D67D-4903-A362-8395A7B35C75}.DebugFast|Win32.ActiveCfg = Release|Win32
{05C75041-D67D-4903-A362-8395A7B35C75}.DebugFast|x64.ActiveCfg = Release|x64
{05C75041-D67D-4903-A362-8395A7B35C75}.Release|Win32.ActiveCfg = Release|Win32
{05C75041-D67D-4903-A362-8395A7B35C75}.Release|Win32.Build.0 = Release|Win32
{05C75041-D67D-4903-A362-8395A7B35C75}.Release|x64.ActiveCfg = Release|x64