mirror of
https://github.com/dolphin-emu/dolphin.git
synced 2025-07-21 05:09:34 -06:00
Reverted r4045, it works for me!(R) How about you?
git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@4049 8ced0084-cf51-0410-be5f-012b33b47a6e
This commit is contained in:
144
Externals/Lua/Lua.vcproj
vendored
144
Externals/Lua/Lua.vcproj
vendored
@ -1,7 +1,7 @@
|
||||
<?xml version="1.0" encoding="windows-1255"?>
|
||||
<VisualStudioProject
|
||||
ProjectType="Visual C++"
|
||||
Version="9,00"
|
||||
Version="9.00"
|
||||
Name="Lua"
|
||||
ProjectGUID="{DA4CA030-A741-4DDC-9DA8-B2F351F0F158}"
|
||||
RootNamespace="Lua"
|
||||
@ -22,7 +22,7 @@
|
||||
Name="Debug|Win32"
|
||||
OutputDirectory="$(SolutionDir)$(ConfigurationName)"
|
||||
IntermediateDirectory="$(ConfigurationName)"
|
||||
ConfigurationType="4"
|
||||
ConfigurationType="1"
|
||||
CharacterSet="2"
|
||||
>
|
||||
<Tool
|
||||
@ -60,11 +60,16 @@
|
||||
Name="VCPreLinkEventTool"
|
||||
/>
|
||||
<Tool
|
||||
Name="VCLibrarianTool"
|
||||
Name="VCLinkerTool"
|
||||
GenerateDebugInformation="true"
|
||||
TargetMachine="1"
|
||||
/>
|
||||
<Tool
|
||||
Name="VCALinkTool"
|
||||
/>
|
||||
<Tool
|
||||
Name="VCManifestTool"
|
||||
/>
|
||||
<Tool
|
||||
Name="VCXDCMakeTool"
|
||||
/>
|
||||
@ -74,6 +79,9 @@
|
||||
<Tool
|
||||
Name="VCFxCopTool"
|
||||
/>
|
||||
<Tool
|
||||
Name="VCAppVerifierTool"
|
||||
/>
|
||||
<Tool
|
||||
Name="VCPostBuildEventTool"
|
||||
/>
|
||||
@ -84,67 +92,6 @@
|
||||
IntermediateDirectory="$(PlatformName)\$(ConfigurationName)"
|
||||
ConfigurationType="4"
|
||||
CharacterSet="2"
|
||||
>
|
||||
<Tool
|
||||
Name="VCPreBuildEventTool"
|
||||
/>
|
||||
<Tool
|
||||
Name="VCCustomBuildTool"
|
||||
/>
|
||||
<Tool
|
||||
Name="VCXMLDataGeneratorTool"
|
||||
/>
|
||||
<Tool
|
||||
Name="VCWebServiceProxyGeneratorTool"
|
||||
/>
|
||||
<Tool
|
||||
Name="VCMIDLTool"
|
||||
TargetEnvironment="3"
|
||||
/>
|
||||
<Tool
|
||||
Name="VCCLCompilerTool"
|
||||
Optimization="0"
|
||||
PreprocessorDefinitions="WIN32;DEBUG;_LIB;_SECURE_SCL=0;_CRT_SECURE_NO_WARNINGS;_CRT_SECURE_NO_DEPRECATE"
|
||||
MinimalRebuild="true"
|
||||
BasicRuntimeChecks="3"
|
||||
RuntimeLibrary="3"
|
||||
WarningLevel="3"
|
||||
DebugInformationFormat="3"
|
||||
/>
|
||||
<Tool
|
||||
Name="VCManagedResourceCompilerTool"
|
||||
/>
|
||||
<Tool
|
||||
Name="VCResourceCompilerTool"
|
||||
/>
|
||||
<Tool
|
||||
Name="VCPreLinkEventTool"
|
||||
/>
|
||||
<Tool
|
||||
Name="VCLibrarianTool"
|
||||
/>
|
||||
<Tool
|
||||
Name="VCALinkTool"
|
||||
/>
|
||||
<Tool
|
||||
Name="VCXDCMakeTool"
|
||||
/>
|
||||
<Tool
|
||||
Name="VCBscMakeTool"
|
||||
/>
|
||||
<Tool
|
||||
Name="VCFxCopTool"
|
||||
/>
|
||||
<Tool
|
||||
Name="VCPostBuildEventTool"
|
||||
/>
|
||||
</Configuration>
|
||||
<Configuration
|
||||
Name="Release|Win32"
|
||||
OutputDirectory="$(SolutionDir)$(ConfigurationName)"
|
||||
IntermediateDirectory="$(ConfigurationName)"
|
||||
ConfigurationType="4"
|
||||
CharacterSet="2"
|
||||
WholeProgramOptimization="1"
|
||||
>
|
||||
<Tool
|
||||
@ -200,6 +147,75 @@
|
||||
Name="VCPostBuildEventTool"
|
||||
/>
|
||||
</Configuration>
|
||||
<Configuration
|
||||
Name="Debug|x64"
|
||||
OutputDirectory="$(SolutionDir)$(PlatformName)\$(ConfigurationName)"
|
||||
IntermediateDirectory="$(PlatformName)\$(ConfigurationName)"
|
||||
ConfigurationType="1"
|
||||
CharacterSet="2"
|
||||
>
|
||||
<Tool
|
||||
Name="VCPreBuildEventTool"
|
||||
/>
|
||||
<Tool
|
||||
Name="VCCustomBuildTool"
|
||||
/>
|
||||
<Tool
|
||||
Name="VCXMLDataGeneratorTool"
|
||||
/>
|
||||
<Tool
|
||||
Name="VCWebServiceProxyGeneratorTool"
|
||||
/>
|
||||
<Tool
|
||||
Name="VCMIDLTool"
|
||||
TargetEnvironment="3"
|
||||
/>
|
||||
<Tool
|
||||
Name="VCCLCompilerTool"
|
||||
Optimization="0"
|
||||
PreprocessorDefinitions="WIN32;DEBUG;_LIB;_SECURE_SCL=0;_CRT_SECURE_NO_WARNINGS;_CRT_SECURE_NO_DEPRECATE"
|
||||
MinimalRebuild="true"
|
||||
BasicRuntimeChecks="3"
|
||||
RuntimeLibrary="3"
|
||||
WarningLevel="3"
|
||||
DebugInformationFormat="3"
|
||||
/>
|
||||
<Tool
|
||||
Name="VCManagedResourceCompilerTool"
|
||||
/>
|
||||
<Tool
|
||||
Name="VCResourceCompilerTool"
|
||||
/>
|
||||
<Tool
|
||||
Name="VCPreLinkEventTool"
|
||||
/>
|
||||
<Tool
|
||||
Name="VCLinkerTool"
|
||||
GenerateDebugInformation="true"
|
||||
TargetMachine="17"
|
||||
/>
|
||||
<Tool
|
||||
Name="VCALinkTool"
|
||||
/>
|
||||
<Tool
|
||||
Name="VCManifestTool"
|
||||
/>
|
||||
<Tool
|
||||
Name="VCXDCMakeTool"
|
||||
/>
|
||||
<Tool
|
||||
Name="VCBscMakeTool"
|
||||
/>
|
||||
<Tool
|
||||
Name="VCFxCopTool"
|
||||
/>
|
||||
<Tool
|
||||
Name="VCAppVerifierTool"
|
||||
/>
|
||||
<Tool
|
||||
Name="VCPostBuildEventTool"
|
||||
/>
|
||||
</Configuration>
|
||||
<Configuration
|
||||
Name="Release|x64"
|
||||
OutputDirectory="$(SolutionDir)$(PlatformName)\$(ConfigurationName)"
|
||||
|
22
Externals/wxWidgets/build/msw/wx_adv.vcproj
vendored
22
Externals/wxWidgets/build/msw/wx_adv.vcproj
vendored
@ -1,8 +1,8 @@
|
||||
<?xml version="1.0" encoding="Windows-1252"?>
|
||||
<VisualStudioProject
|
||||
ProjectType="Visual C++"
|
||||
Version="9,00"
|
||||
Name="adv"
|
||||
Version="9.00"
|
||||
Name="wxAdv28"
|
||||
ProjectGUID="{0E231FB1-F3C9-4724-ACCB-DE8BCB3C089E}"
|
||||
RootNamespace="wxAdv28"
|
||||
TargetFrameworkVersion="0"
|
||||
@ -151,7 +151,7 @@
|
||||
/>
|
||||
<Tool
|
||||
Name="VCLibrarianTool"
|
||||
OutputFile="$(OutDir)\wxmsw28u_adv.lib"
|
||||
OutputFile="$(OutDir)/wxAdv28.lib"
|
||||
SuppressStartupBanner="true"
|
||||
/>
|
||||
<Tool
|
||||
@ -174,7 +174,7 @@
|
||||
</Configuration>
|
||||
<Configuration
|
||||
Name="Debug|Win32"
|
||||
OutputDirectory="wxAdv28_$(PlatformName)\..\..\..\lib\vc_lib\Win32"
|
||||
OutputDirectory="wxAdv28_$(PlatformName)\$(ConfigurationName)"
|
||||
IntermediateDirectory="wxAdv28_$(PlatformName)\$(ConfigurationName)"
|
||||
ConfigurationType="4"
|
||||
InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC60.vsprops"
|
||||
@ -227,7 +227,7 @@
|
||||
/>
|
||||
<Tool
|
||||
Name="VCLibrarianTool"
|
||||
OutputFile="$(OutDir)\wxmsw28ud_adv.lib"
|
||||
OutputFile="$(OutDir)/wxAdv28.lib"
|
||||
SuppressStartupBanner="true"
|
||||
/>
|
||||
<Tool
|
||||
@ -250,7 +250,7 @@
|
||||
</Configuration>
|
||||
<Configuration
|
||||
Name="Debug|x64"
|
||||
OutputDirectory="wxAdv28_$(PlatformName)\..\..\..\lib\vc_lib\x64"
|
||||
OutputDirectory="wxAdv28_$(PlatformName)\$(ConfigurationName)"
|
||||
IntermediateDirectory="wxAdv28_$(PlatformName)\$(ConfigurationName)"
|
||||
ConfigurationType="4"
|
||||
InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC60.vsprops"
|
||||
@ -307,7 +307,7 @@
|
||||
/>
|
||||
<Tool
|
||||
Name="VCLibrarianTool"
|
||||
OutputFile="$(OutDir)\wxmsw28ud_adv.lib"
|
||||
OutputFile="$(OutDir)/wxAdv28.lib"
|
||||
SuppressStartupBanner="true"
|
||||
/>
|
||||
<Tool
|
||||
@ -330,7 +330,7 @@
|
||||
</Configuration>
|
||||
<Configuration
|
||||
Name="Release|Win32"
|
||||
OutputDirectory="wxAdv28_$(PlatformName)\..\..\..\lib\vc_lib\Win32"
|
||||
OutputDirectory="wxAdv28_$(PlatformName)\$(ConfigurationName)"
|
||||
IntermediateDirectory="wxAdv28_$(PlatformName)\$(ConfigurationName)"
|
||||
ConfigurationType="4"
|
||||
InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC60.vsprops"
|
||||
@ -384,7 +384,7 @@
|
||||
/>
|
||||
<Tool
|
||||
Name="VCLibrarianTool"
|
||||
OutputFile="$(OutDir)\wxmsw28u_adv.lib"
|
||||
OutputFile="$(OutDir)/wxAdv28.lib"
|
||||
SuppressStartupBanner="true"
|
||||
/>
|
||||
<Tool
|
||||
@ -407,7 +407,7 @@
|
||||
</Configuration>
|
||||
<Configuration
|
||||
Name="Release|x64"
|
||||
OutputDirectory="wxAdv28_$(PlatformName)\..\..\..\lib\vc_lib\x64"
|
||||
OutputDirectory="wxAdv28_$(PlatformName)\$(ConfigurationName)"
|
||||
IntermediateDirectory="wxAdv28_$(PlatformName)\$(ConfigurationName)"
|
||||
ConfigurationType="4"
|
||||
InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC60.vsprops"
|
||||
@ -463,7 +463,7 @@
|
||||
/>
|
||||
<Tool
|
||||
Name="VCLibrarianTool"
|
||||
OutputFile="$(OutDir)\wxmsw28u_adv.lib"
|
||||
OutputFile="$(OutDir)/wxAdv28.lib"
|
||||
SuppressStartupBanner="true"
|
||||
/>
|
||||
<Tool
|
||||
|
24
Externals/wxWidgets/build/msw/wx_base.vcproj
vendored
24
Externals/wxWidgets/build/msw/wx_base.vcproj
vendored
@ -1,8 +1,8 @@
|
||||
<?xml version="1.0" encoding="Windows-1252"?>
|
||||
<VisualStudioProject
|
||||
ProjectType="Visual C++"
|
||||
Version="9,00"
|
||||
Name="base"
|
||||
Version="9.00"
|
||||
Name="wxBase28"
|
||||
ProjectGUID="{1C8436C9-DBAF-42BE-83BC-CF3EC9175ABE}"
|
||||
RootNamespace="wxBase28"
|
||||
TargetFrameworkVersion="131072"
|
||||
@ -20,7 +20,7 @@
|
||||
<Configurations>
|
||||
<Configuration
|
||||
Name="Release|Win32"
|
||||
OutputDirectory="wxBase28_$(PlatformName)\..\..\..\lib\vc_lib\Win32"
|
||||
OutputDirectory="wxBase28_$(PlatformName)\$(ConfigurationName)"
|
||||
IntermediateDirectory="wxBase28_$(PlatformName)\$(ConfigurationName)"
|
||||
ConfigurationType="4"
|
||||
InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC60.vsprops"
|
||||
@ -75,7 +75,7 @@
|
||||
/>
|
||||
<Tool
|
||||
Name="VCLibrarianTool"
|
||||
OutputFile="$(OutDir)\wxbase28u.lib"
|
||||
OutputFile="$(OutDir)/wxBase28.lib"
|
||||
SuppressStartupBanner="true"
|
||||
/>
|
||||
<Tool
|
||||
@ -98,7 +98,7 @@
|
||||
</Configuration>
|
||||
<Configuration
|
||||
Name="Release|x64"
|
||||
OutputDirectory="wxBase28_$(PlatformName)\..\..\..\lib\vc_lib\x64"
|
||||
OutputDirectory="wxBase28_$(PlatformName)\$(ConfigurationName)"
|
||||
IntermediateDirectory="wxBase28_$(PlatformName)\$(ConfigurationName)"
|
||||
ConfigurationType="4"
|
||||
InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC60.vsprops"
|
||||
@ -155,7 +155,7 @@
|
||||
/>
|
||||
<Tool
|
||||
Name="VCLibrarianTool"
|
||||
OutputFile="$(OutDir)\wxbase28u.lib"
|
||||
OutputFile="$(OutDir)/wxBase28.lib"
|
||||
SuppressStartupBanner="true"
|
||||
/>
|
||||
<Tool
|
||||
@ -178,7 +178,7 @@
|
||||
</Configuration>
|
||||
<Configuration
|
||||
Name="Debug|Win32"
|
||||
OutputDirectory="wxBase28_$(PlatformName)\..\..\..\lib\vc_lib\Win32"
|
||||
OutputDirectory="wxBase28_$(PlatformName)\$(ConfigurationName)"
|
||||
IntermediateDirectory="wxBase28_$(PlatformName)\$(ConfigurationName)"
|
||||
ConfigurationType="4"
|
||||
InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC60.vsprops"
|
||||
@ -232,7 +232,7 @@
|
||||
/>
|
||||
<Tool
|
||||
Name="VCLibrarianTool"
|
||||
OutputFile="$(OutDir)\wxbase28ud.lib"
|
||||
OutputFile="$(OutDir)/wxBase28.lib"
|
||||
SuppressStartupBanner="true"
|
||||
/>
|
||||
<Tool
|
||||
@ -255,7 +255,7 @@
|
||||
</Configuration>
|
||||
<Configuration
|
||||
Name="Debug|x64"
|
||||
OutputDirectory="wxBase28_$(PlatformName)\..\..\..\lib\vc_lib\x64"
|
||||
OutputDirectory="wxBase28_$(PlatformName)\$(ConfigurationName)"
|
||||
IntermediateDirectory="wxBase28_$(PlatformName)\$(ConfigurationName)"
|
||||
ConfigurationType="4"
|
||||
InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC60.vsprops"
|
||||
@ -312,7 +312,7 @@
|
||||
/>
|
||||
<Tool
|
||||
Name="VCLibrarianTool"
|
||||
OutputFile="$(OutDir)\wxbase28ud.lib"
|
||||
OutputFile="$(OutDir)/wxBase28.lib"
|
||||
SuppressStartupBanner="true"
|
||||
/>
|
||||
<Tool
|
||||
@ -412,7 +412,7 @@
|
||||
</Configuration>
|
||||
<Configuration
|
||||
Name="DebugFast|x64"
|
||||
OutputDirectory="wxBase28_$(PlatformName)\..\..\..\lib\vc_lib\x64"
|
||||
OutputDirectory="wxBase28_$(PlatformName)\$(ConfigurationName)"
|
||||
IntermediateDirectory="wxBase28_$(PlatformName)\$(ConfigurationName)"
|
||||
ConfigurationType="4"
|
||||
InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC60.vsprops"
|
||||
@ -468,7 +468,7 @@
|
||||
/>
|
||||
<Tool
|
||||
Name="VCLibrarianTool"
|
||||
OutputFile="$(OutDir)\wxbase28u.lib"
|
||||
OutputFile="$(OutDir)/wxBase28.lib"
|
||||
SuppressStartupBanner="true"
|
||||
/>
|
||||
<Tool
|
||||
|
26
Externals/wxWidgets/build/msw/wx_core.vcproj
vendored
26
Externals/wxWidgets/build/msw/wx_core.vcproj
vendored
@ -1,8 +1,8 @@
|
||||
<?xml version="1.0" encoding="Windows-1252"?>
|
||||
<VisualStudioProject
|
||||
ProjectType="Visual C++"
|
||||
Version="9,00"
|
||||
Name="core"
|
||||
Version="9.00"
|
||||
Name="wxCore28"
|
||||
ProjectGUID="{11F55366-12EC-4C44-A8CB-1D4E315D61ED}"
|
||||
RootNamespace="wxCore"
|
||||
TargetFrameworkVersion="131072"
|
||||
@ -20,7 +20,7 @@
|
||||
<Configurations>
|
||||
<Configuration
|
||||
Name="Debug|Win32"
|
||||
OutputDirectory="wxCore28_$(PlatformName)\..\..\..\lib\vc_lib\Win32"
|
||||
OutputDirectory="wxCore28_$(PlatformName)\$(ConfigurationName)"
|
||||
IntermediateDirectory="wxCore28_$(PlatformName)\$(ConfigurationName)"
|
||||
ConfigurationType="4"
|
||||
InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC60.vsprops"
|
||||
@ -75,7 +75,7 @@
|
||||
/>
|
||||
<Tool
|
||||
Name="VCLibrarianTool"
|
||||
OutputFile="$(OutDir)\wxmsw28ud_core.lib"
|
||||
OutputFile="$(OutDir)/wxCore28.lib"
|
||||
SuppressStartupBanner="true"
|
||||
/>
|
||||
<Tool
|
||||
@ -98,7 +98,7 @@
|
||||
</Configuration>
|
||||
<Configuration
|
||||
Name="Debug|x64"
|
||||
OutputDirectory="wxCore28_$(PlatformName)\..\..\..\lib\vc_lib\x64"
|
||||
OutputDirectory="wxCore28_$(PlatformName)\$(ConfigurationName)"
|
||||
IntermediateDirectory="wxCore28_$(PlatformName)\$(ConfigurationName)"
|
||||
ConfigurationType="4"
|
||||
InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC60.vsprops"
|
||||
@ -155,7 +155,7 @@
|
||||
/>
|
||||
<Tool
|
||||
Name="VCLibrarianTool"
|
||||
OutputFile="$(OutDir)\wxmsw28ud_core.lib"
|
||||
OutputFile="$(OutDir)/wxCore28.lib"
|
||||
SuppressStartupBanner="true"
|
||||
/>
|
||||
<Tool
|
||||
@ -178,7 +178,7 @@
|
||||
</Configuration>
|
||||
<Configuration
|
||||
Name="Release|Win32"
|
||||
OutputDirectory="wxCore28_$(PlatformName)\..\..\..\lib\vc_lib\Win32"
|
||||
OutputDirectory="wxCore28_$(PlatformName)\$(ConfigurationName)"
|
||||
IntermediateDirectory="wxCore28_$(PlatformName)\$(ConfigurationName)"
|
||||
ConfigurationType="4"
|
||||
InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC60.vsprops"
|
||||
@ -233,7 +233,7 @@
|
||||
/>
|
||||
<Tool
|
||||
Name="VCLibrarianTool"
|
||||
OutputFile="$(OutDir)\wxmsw28u_core.lib"
|
||||
OutputFile="$(OutDir)/wxCore28.lib"
|
||||
SuppressStartupBanner="true"
|
||||
/>
|
||||
<Tool
|
||||
@ -256,7 +256,7 @@
|
||||
</Configuration>
|
||||
<Configuration
|
||||
Name="Release|x64"
|
||||
OutputDirectory="wxCore28_$(PlatformName)\..\..\..\lib\vc_lib\x64"
|
||||
OutputDirectory="wxCore28_$(PlatformName)\$(ConfigurationName)"
|
||||
IntermediateDirectory="wxCore28_$(PlatformName)\$(ConfigurationName)"
|
||||
ConfigurationType="4"
|
||||
InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC60.vsprops"
|
||||
@ -312,7 +312,7 @@
|
||||
/>
|
||||
<Tool
|
||||
Name="VCLibrarianTool"
|
||||
OutputFile="$(OutDir)\wxmsw28u_core.lib"
|
||||
OutputFile="$(OutDir)/wxCore28.lib"
|
||||
SuppressStartupBanner="true"
|
||||
/>
|
||||
<Tool
|
||||
@ -335,7 +335,7 @@
|
||||
</Configuration>
|
||||
<Configuration
|
||||
Name="DebugFast|Win32"
|
||||
OutputDirectory="wxCore28_$(PlatformName)\..\..\..\lib\vc_lib\x86"
|
||||
OutputDirectory="wxCore28_$(PlatformName)\$(ConfigurationName)"
|
||||
IntermediateDirectory="wxCore28_$(PlatformName)\$(ConfigurationName)"
|
||||
ConfigurationType="4"
|
||||
InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC60.vsprops"
|
||||
@ -390,7 +390,7 @@
|
||||
/>
|
||||
<Tool
|
||||
Name="VCLibrarianTool"
|
||||
OutputFile="$(OutDir)\wxmsw28u_core.lib"
|
||||
OutputFile="$(OutDir)/wxCore28.lib"
|
||||
SuppressStartupBanner="true"
|
||||
/>
|
||||
<Tool
|
||||
@ -469,7 +469,7 @@
|
||||
/>
|
||||
<Tool
|
||||
Name="VCLibrarianTool"
|
||||
OutputFile="$(OutDir)\wxmsw28u_core.lib"
|
||||
OutputFile="$(OutDir)/wxCore28.lib"
|
||||
SuppressStartupBanner="true"
|
||||
/>
|
||||
<Tool
|
||||
|
Reference in New Issue
Block a user