diff options
Diffstat (limited to 'Source')
| -rw-r--r-- | Source/Core/Common/SConscript | 11 | ||||
| -rw-r--r-- | Source/Core/Common/SVNRevGen.vcxproj | 63 | ||||
| -rw-r--r-- | Source/Core/Common/Src/Version.cpp | 6 | ||||
| -rw-r--r-- | Source/Core/Common/Src/svnrev.h | 1 | ||||
| -rw-r--r-- | Source/Core/Common/Src/svnrev_template.h | 1 | ||||
| -rw-r--r-- | Source/Core/Common/SubWCRev.exe | bin | 552960 -> 0 bytes | |||
| -rw-r--r-- | Source/Core/Common/make_svnrev.h.js | 79 | ||||
| -rw-r--r-- | Source/Core/DolphinWX/SConscript | 2 | ||||
| -rw-r--r-- | Source/Core/DolphinWX/Src/ConfigMain.cpp | 30 | ||||
| -rw-r--r-- | Source/Dolphin_2010.sln | 50 |
10 files changed, 5 insertions, 238 deletions
diff --git a/Source/Core/Common/SConscript b/Source/Core/Common/SConscript index 74eebdd611..0706fb9439 100644 --- a/Source/Core/Common/SConscript +++ b/Source/Core/Common/SConscript @@ -4,17 +4,6 @@ Import('env') import os import sys -def createVersion(env, target, source): - tmpstr = open(source[0].path, 'r').read().\ - replace("$WCMODS?$WCREV$M:$WCREV$$", env['svnrev']) - outfile = open(target[0].path, 'w') - outfile.write(tmpstr + '\n') - outfile.close() - -Execute(Delete('Src/svnrev.h')) -env.Command('Src/svnrev.h', 'Src/svnrev_template.h', - [Delete('${TARGET.srcpath}'), createVersion]) - files = [ 'Src/ABI.cpp', 'Src/BreakPoints.cpp', diff --git a/Source/Core/Common/SVNRevGen.vcxproj b/Source/Core/Common/SVNRevGen.vcxproj deleted file mode 100644 index 45d6d10368..0000000000 --- a/Source/Core/Common/SVNRevGen.vcxproj +++ /dev/null @@ -1,63 +0,0 @@ -<?xml version="1.0" encoding="utf-8"?> -<Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> - <ItemGroup Label="ProjectConfigurations"> - <ProjectConfiguration Include="Release|x64"> - <Configuration>Release</Configuration> - <Platform>x64</Platform> - </ProjectConfiguration> - </ItemGroup> - <ItemGroup> - <CustomBuild Include="make_svnrev.h.js"> - <Command Condition="'$(Configuration)|$(Platform)'=='Release|x64'">cscript /nologo /E:JScript "make_svnrev.h.js"</Command> - <Message Condition="'$(Configuration)|$(Platform)'=='Release|x64'">Updating svnrev.h</Message> - <Outputs Condition="'$(Configuration)|$(Platform)'=='Release|x64'">dummy</Outputs> - </CustomBuild> - </ItemGroup> - <ItemGroup> - <ClInclude Include="Src\svnrev.h" /> - <ClInclude Include="Src\svnrev_template.h" /> - </ItemGroup> - <PropertyGroup Label="Globals"> - <ProjectGuid>{69F00340-5C3D-449F-9A80-958435C6CF06}</ProjectGuid> - <RootNamespace>SVNRevGen</RootNamespace> - </PropertyGroup> - <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" /> - <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration"> - <ConfigurationType>Utility</ConfigurationType> - <UseDebugLibraries>false</UseDebugLibraries> - <CharacterSet>Unicode</CharacterSet> - </PropertyGroup> - <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" /> - <ImportGroup Label="ExtensionSettings"> - </ImportGroup> - <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="PropertySheets"> - <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" /> - </ImportGroup> - <PropertyGroup Label="UserMacros" /> - <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" /> - <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" /> - <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'"> - <ClCompile> - <WarningLevel>Level3</WarningLevel> - <Optimization>MaxSpeed</Optimization> - <FunctionLevelLinking>true</FunctionLevelLinking> - <IntrinsicFunctions>true</IntrinsicFunctions> - </ClCompile> - <Link> - <GenerateDebugInformation>true</GenerateDebugInformation> - <EnableCOMDATFolding>true</EnableCOMDATFolding> - <OptimizeReferences>true</OptimizeReferences> - </Link> - <PreBuildEvent> - <Command> - </Command> - </PreBuildEvent> - <CustomBuild> - <Outputs> - </Outputs> - </CustomBuild> - </ItemDefinitionGroup> - <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" /> - <ImportGroup Label="ExtensionTargets"> - </ImportGroup> -</Project>
\ No newline at end of file diff --git a/Source/Core/Common/Src/Version.cpp b/Source/Core/Common/Src/Version.cpp index 4f2f0b1d77..83531e2bc8 100644 --- a/Source/Core/Common/Src/Version.cpp +++ b/Source/Core/Common/Src/Version.cpp @@ -19,11 +19,11 @@ #include "svnrev.h" #ifdef _DEBUG -const char *svn_rev_str = "Dolphin Debug r" SVN_REV_STR; +const char *svn_rev_str = "Dolphin Debug " SVN_REV_STR; #elif defined DEBUGFAST -const char *svn_rev_str = "Dolphin Debugfast r" SVN_REV_STR; +const char *svn_rev_str = "Dolphin Debugfast " SVN_REV_STR; #else -const char *svn_rev_str = "Dolphin r" SVN_REV_STR; +const char *svn_rev_str = "Dolphin " SVN_REV_STR; #endif #ifdef _M_X64 diff --git a/Source/Core/Common/Src/svnrev.h b/Source/Core/Common/Src/svnrev.h new file mode 100644 index 0000000000..fa15eb308c --- /dev/null +++ b/Source/Core/Common/Src/svnrev.h @@ -0,0 +1 @@ +#define SVN_REV_STR "3.0"
diff --git a/Source/Core/Common/Src/svnrev_template.h b/Source/Core/Common/Src/svnrev_template.h deleted file mode 100644 index 0d3e482e1b..0000000000 --- a/Source/Core/Common/Src/svnrev_template.h +++ /dev/null @@ -1 +0,0 @@ -#define SVN_REV_STR "$WCMODS?$WCREV$M:$WCREV$$" diff --git a/Source/Core/Common/SubWCRev.exe b/Source/Core/Common/SubWCRev.exe Binary files differdeleted file mode 100644 index 32a252b58b..0000000000 --- a/Source/Core/Common/SubWCRev.exe +++ /dev/null diff --git a/Source/Core/Common/make_svnrev.h.js b/Source/Core/Common/make_svnrev.h.js deleted file mode 100644 index 38bcda312a..0000000000 --- a/Source/Core/Common/make_svnrev.h.js +++ /dev/null @@ -1,79 +0,0 @@ -var wshShell = new ActiveXObject("WScript.Shell") -var oFS = new ActiveXObject("Scripting.FileSystemObject"); - -var outfile = "./Src/svnrev.h"; -var svncmd = "SubWCRev ../../.. ./Src/svnrev_template.h " + outfile; -var svntestcmd = "SubWCRev ../../.."; -var hgcmd = "hg svn info"; - -var SVN = 1, HG = 2; -var file_rev = 0, cur_rev = 0, cur_cms = 0; - -function RunCmdGetMatch(cmd, regex) -{ - // run the command - try - { - var cmdexec = wshShell.Exec(cmd); - } - catch (e) - { - // catch "the system cannot find the file specified" error - return 0; - } - // ReadLine is synchronous - while (!cmdexec.StdOut.AtEndOfStream) - { - var reg_exec = regex.exec(cmdexec.StdOut.ReadLine()) - if (reg_exec) - return reg_exec[1]; // return first capture group - } - // failed - return 0; -} - -if (oFS.FileExists(outfile)) -{ - // file exists, read the value of SVN_REV_STR - file_rev = oFS.OpenTextFile(outfile).ReadLine().match(/\d+/); -} -else -{ - // file doesn't exist, create it - oFS.CreateTextFile(outfile); -} - -// get the "Last commited at revision" from SubWCRev's output -cur_rev = RunCmdGetMatch(svntestcmd, /^Last .*?(\d+)/); -if (cur_rev) - cur_cms = SVN; -else -{ - // SubWCRev failed, so use hg - cur_rev = RunCmdGetMatch(hgcmd, /Revision.*?(\d+)/); - if (cur_rev) - cur_cms = HG; - else - { - WScript.Echo("Neither SVN or Hg revision info found!"); - WScript.Quit(1); - } -} - -// check if svnrev.h needs updating -if (cur_rev == file_rev) -{ - WScript.Echo("svnrev.h doesn't need updating (already at " + cur_rev + ")"); - WScript.Quit(0); -} -else if (cur_cms == SVN) -{ - // update using SubWCRev and template file - var ret = wshShell.run(svncmd, 0, true); -} -else -{ - // manually create the file - oFS.CreateTextFile(outfile, true).WriteLine("#define SVN_REV_STR \"" + cur_rev + "\""); -} -WScript.Echo("svnrev.h updated (" + cur_rev + ")");
\ No newline at end of file diff --git a/Source/Core/DolphinWX/SConscript b/Source/Core/DolphinWX/SConscript index a5a62bb558..143255503d 100644 --- a/Source/Core/DolphinWX/SConscript +++ b/Source/Core/DolphinWX/SConscript @@ -113,7 +113,7 @@ elif sys.platform == 'darwin': CFBundleIdentifier = 'com.dolphin-emulator.dolphin', CFBundleLocalizations = languages, CFBundlePackageType = 'APPL', - CFBundleShortVersionString = env['svnrev'], + CFBundleShortVersionString = '0', CFBundleVersion = '3.0', LSMinimumSystemVersion = '10.5.4', LSRequiresCarbon = True, diff --git a/Source/Core/DolphinWX/Src/ConfigMain.cpp b/Source/Core/DolphinWX/Src/ConfigMain.cpp index 19554b4de3..c11dcf7e59 100644 --- a/Source/Core/DolphinWX/Src/ConfigMain.cpp +++ b/Source/Core/DolphinWX/Src/ConfigMain.cpp @@ -49,27 +49,12 @@ static const wxLanguage langIds[] = { wxLANGUAGE_DEFAULT, wxLANGUAGE_ARABIC, - wxLANGUAGE_CATALAN, - wxLANGUAGE_CHINESE_SIMPLIFIED, - wxLANGUAGE_CHINESE_TRADITIONAL, - wxLANGUAGE_CZECH, - wxLANGUAGE_DANISH, - wxLANGUAGE_DUTCH, wxLANGUAGE_ENGLISH, wxLANGUAGE_FRENCH, - wxLANGUAGE_GERMAN, wxLANGUAGE_GREEK, - wxLANGUAGE_HEBREW, wxLANGUAGE_HUNGARIAN, - wxLANGUAGE_ITALIAN, - wxLANGUAGE_JAPANESE, - wxLANGUAGE_KOREAN, - wxLANGUAGE_NORWEGIAN_BOKMAL, - wxLANGUAGE_POLISH, wxLANGUAGE_PORTUGUESE, wxLANGUAGE_PORTUGUESE_BRAZILIAN, - wxLANGUAGE_RUSSIAN, - wxLANGUAGE_SERBIAN, wxLANGUAGE_SPANISH, wxLANGUAGE_TURKISH, }; @@ -288,27 +273,12 @@ void CConfigMain::InitializeGUILists() // keep these in sync with the langIds array at the beginning of this file arrayStringFor_InterfaceLang.Add(_("<System>")); arrayStringFor_InterfaceLang.Add(_("Arabic")); - arrayStringFor_InterfaceLang.Add(_("Catalan")); - arrayStringFor_InterfaceLang.Add(_("Chinese (Simplified)")); - arrayStringFor_InterfaceLang.Add(_("Chinese (Traditional)")); - arrayStringFor_InterfaceLang.Add(_("Czech")); - arrayStringFor_InterfaceLang.Add(_("Danish")); - arrayStringFor_InterfaceLang.Add(_("Dutch")); arrayStringFor_InterfaceLang.Add(_("English")); arrayStringFor_InterfaceLang.Add(_("French")); - arrayStringFor_InterfaceLang.Add(_("German")); arrayStringFor_InterfaceLang.Add(_("Greek")); - arrayStringFor_InterfaceLang.Add(_("Hebrew")); arrayStringFor_InterfaceLang.Add(_("Hungarian")); - arrayStringFor_InterfaceLang.Add(_("Italian")); - arrayStringFor_InterfaceLang.Add(_("Japanese")); - arrayStringFor_InterfaceLang.Add(_("Korean")); - arrayStringFor_InterfaceLang.Add(_("Norwegian Bokmaal")); - arrayStringFor_InterfaceLang.Add(_("Polish")); arrayStringFor_InterfaceLang.Add(_("Portuguese")); arrayStringFor_InterfaceLang.Add(_("Portuguese (Brazilian)")); - arrayStringFor_InterfaceLang.Add(_("Russian")); - arrayStringFor_InterfaceLang.Add(_("Serbian")); arrayStringFor_InterfaceLang.Add(_("Spanish")); arrayStringFor_InterfaceLang.Add(_("Turkish")); } diff --git a/Source/Dolphin_2010.sln b/Source/Dolphin_2010.sln index e0c9592338..ee6b972231 100644 --- a/Source/Dolphin_2010.sln +++ b/Source/Dolphin_2010.sln @@ -13,80 +13,53 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Dolphin", "Core\DolphinWX\D EndProjectSection EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Common", "Core\Common\Common.vcxproj", "{C87A4178-44F6-49B2-B7AA-C79AF1B8C534}" - ProjectSection(ProjectDependencies) = postProject - {69F00340-5C3D-449F-9A80-958435C6CF06} = {69F00340-5C3D-449F-9A80-958435C6CF06} - EndProjectSection -EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "SVNRevGen", "Core\Common\SVNRevGen.vcxproj", "{69F00340-5C3D-449F-9A80-958435C6CF06}" EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "AudioCommon", "Core\AudioCommon\AudioCommon.vcxproj", "{37D007BD-D66C-4EAF-B56C-BD1AAC340A05}" ProjectSection(ProjectDependencies) = postProject - {69F00340-5C3D-449F-9A80-958435C6CF06} = {69F00340-5C3D-449F-9A80-958435C6CF06} {C87A4178-44F6-49B2-B7AA-C79AF1B8C534} = {C87A4178-44F6-49B2-B7AA-C79AF1B8C534} EndProjectSection EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "SOIL", "..\Externals\SOIL\SOIL.vcxproj", "{8544F1FF-F2A5-42D8-A568-C56B5D3B4181}" - ProjectSection(ProjectDependencies) = postProject - {69F00340-5C3D-449F-9A80-958435C6CF06} = {69F00340-5C3D-449F-9A80-958435C6CF06} - EndProjectSection EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "SFML_Network", "..\Externals\SFML\build\vc2010\SFML_Network.vcxproj", "{93D73454-2512-424E-9CDA-4BB357FE13DD}" - ProjectSection(ProjectDependencies) = postProject - {69F00340-5C3D-449F-9A80-958435C6CF06} = {69F00340-5C3D-449F-9A80-958435C6CF06} - EndProjectSection EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "LZO", "..\Externals\LZO\LZO.vcxproj", "{D8890B98-26F7-4CFF-BBFB-B95F371B5F20}" - ProjectSection(ProjectDependencies) = postProject - {69F00340-5C3D-449F-9A80-958435C6CF06} = {69F00340-5C3D-449F-9A80-958435C6CF06} - EndProjectSection EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "zlib", "..\Externals\zlib\zlib.vcxproj", "{3E1339F5-9311-4122-9442-369702E8FCAD}" - ProjectSection(ProjectDependencies) = postProject - {69F00340-5C3D-449F-9A80-958435C6CF06} = {69F00340-5C3D-449F-9A80-958435C6CF06} - EndProjectSection EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "wxAdv28", "..\Externals\wxWidgets\build\msw\wx_adv.vcxproj", "{0E231FB1-F3C9-4724-ACCB-DE8BCB3C089E}" ProjectSection(ProjectDependencies) = postProject - {69F00340-5C3D-449F-9A80-958435C6CF06} = {69F00340-5C3D-449F-9A80-958435C6CF06} {11F55366-12EC-4C44-A8CB-1D4E315D61ED} = {11F55366-12EC-4C44-A8CB-1D4E315D61ED} EndProjectSection EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "wxAui", "..\Externals\wxWidgets\build\msw\wx_aui.vcxproj", "{05C75041-D67D-4903-A362-8395A7B35C75}" ProjectSection(ProjectDependencies) = postProject - {69F00340-5C3D-449F-9A80-958435C6CF06} = {69F00340-5C3D-449F-9A80-958435C6CF06} {11F55366-12EC-4C44-A8CB-1D4E315D61ED} = {11F55366-12EC-4C44-A8CB-1D4E315D61ED} {0E231FB1-F3C9-4724-ACCB-DE8BCB3C089E} = {0E231FB1-F3C9-4724-ACCB-DE8BCB3C089E} EndProjectSection EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "wxBase28", "..\Externals\wxWidgets\build\msw\wx_base.vcxproj", "{1C8436C9-DBAF-42BE-83BC-CF3EC9175ABE}" ProjectSection(ProjectDependencies) = postProject - {69F00340-5C3D-449F-9A80-958435C6CF06} = {69F00340-5C3D-449F-9A80-958435C6CF06} {3E1339F5-9311-4122-9442-369702E8FCAD} = {3E1339F5-9311-4122-9442-369702E8FCAD} EndProjectSection EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "wxCore28", "..\Externals\wxWidgets\build\msw\wx_core.vcxproj", "{11F55366-12EC-4C44-A8CB-1D4E315D61ED}" ProjectSection(ProjectDependencies) = postProject - {69F00340-5C3D-449F-9A80-958435C6CF06} = {69F00340-5C3D-449F-9A80-958435C6CF06} {1C8436C9-DBAF-42BE-83BC-CF3EC9175ABE} = {1C8436C9-DBAF-42BE-83BC-CF3EC9175ABE} EndProjectSection EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "VideoCommon", "Core\VideoCommon\VideoCommon.vcxproj", "{3E5C4E02-1BA9-4776-BDBE-E3F91FFA34CF}" ProjectSection(ProjectDependencies) = postProject - {69F00340-5C3D-449F-9A80-958435C6CF06} = {69F00340-5C3D-449F-9A80-958435C6CF06} {AA862E5E-A993-497A-B6A0-0E8E94B10050} = {AA862E5E-A993-497A-B6A0-0E8E94B10050} {C87A4178-44F6-49B2-B7AA-C79AF1B8C534} = {C87A4178-44F6-49B2-B7AA-C79AF1B8C534} {8544F1FF-F2A5-42D8-A568-C56B5D3B4181} = {8544F1FF-F2A5-42D8-A568-C56B5D3B4181} EndProjectSection EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "CLRun", "..\Externals\CLRun\clrun\CLRun.vcxproj", "{AA862E5E-A993-497A-B6A0-0E8E94B10050}" - ProjectSection(ProjectDependencies) = postProject - {69F00340-5C3D-449F-9A80-958435C6CF06} = {69F00340-5C3D-449F-9A80-958435C6CF06} - EndProjectSection EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Core", "Core\Core\Core.vcxproj", "{8C60E805-0DA5-4E25-8F84-038DB504BB0D}" ProjectSection(ProjectDependencies) = postProject {CD3D4C3C-1027-4D33-B047-AEC7B56D0BF6} = {CD3D4C3C-1027-4D33-B047-AEC7B56D0BF6} - {69F00340-5C3D-449F-9A80-958435C6CF06} = {69F00340-5C3D-449F-9A80-958435C6CF06} {93D73454-2512-424E-9CDA-4BB357FE13DD} = {93D73454-2512-424E-9CDA-4BB357FE13DD} {B6398059-EBB6-4C34-B547-95F365B71FF4} = {B6398059-EBB6-4C34-B547-95F365B71FF4} {C87A4178-44F6-49B2-B7AA-C79AF1B8C534} = {C87A4178-44F6-49B2-B7AA-C79AF1B8C534} @@ -95,13 +68,9 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Core", "Core\Core\Core.vcxp EndProjectSection EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Bochs_disasm", "..\Externals\Bochs_disasm\Bochs_disasm.vcxproj", "{CD3D4C3C-1027-4D33-B047-AEC7B56D0BF6}" - ProjectSection(ProjectDependencies) = postProject - {69F00340-5C3D-449F-9A80-958435C6CF06} = {69F00340-5C3D-449F-9A80-958435C6CF06} - EndProjectSection EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "DiscIO", "Core\DiscIO\DiscIO.vcxproj", "{B6398059-EBB6-4C34-B547-95F365B71FF4}" ProjectSection(ProjectDependencies) = postProject - {69F00340-5C3D-449F-9A80-958435C6CF06} = {69F00340-5C3D-449F-9A80-958435C6CF06} {C87A4178-44F6-49B2-B7AA-C79AF1B8C534} = {C87A4178-44F6-49B2-B7AA-C79AF1B8C534} {3E1339F5-9311-4122-9442-369702E8FCAD} = {3E1339F5-9311-4122-9442-369702E8FCAD} EndProjectSection @@ -109,7 +78,6 @@ EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "VideoDX9", "Plugins\Plugin_VideoDX9\Plugin_VideoDX9.vcxproj", "{DC7D7AF4-CE47-49E8-8B63-265CB6233A49}" ProjectSection(ProjectDependencies) = postProject {3E5C4E02-1BA9-4776-BDBE-E3F91FFA34CF} = {3E5C4E02-1BA9-4776-BDBE-E3F91FFA34CF} - {69F00340-5C3D-449F-9A80-958435C6CF06} = {69F00340-5C3D-449F-9A80-958435C6CF06} {05C75041-D67D-4903-A362-8395A7B35C75} = {05C75041-D67D-4903-A362-8395A7B35C75} {0E231FB1-F3C9-4724-ACCB-DE8BCB3C089E} = {0E231FB1-F3C9-4724-ACCB-DE8BCB3C089E} EndProjectSection @@ -117,7 +85,6 @@ EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "VideoDX11", "Plugins\Plugin_VideoDX11\Plugin_VideoDX11.vcxproj", "{9A4C733C-BADE-4AC6-B58A-6E274395E90E}" ProjectSection(ProjectDependencies) = postProject {3E5C4E02-1BA9-4776-BDBE-E3F91FFA34CF} = {3E5C4E02-1BA9-4776-BDBE-E3F91FFA34CF} - {69F00340-5C3D-449F-9A80-958435C6CF06} = {69F00340-5C3D-449F-9A80-958435C6CF06} {05C75041-D67D-4903-A362-8395A7B35C75} = {05C75041-D67D-4903-A362-8395A7B35C75} {0E231FB1-F3C9-4724-ACCB-DE8BCB3C089E} = {0E231FB1-F3C9-4724-ACCB-DE8BCB3C089E} EndProjectSection @@ -125,19 +92,14 @@ EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "VideoOGL", "Plugins\Plugin_VideoOGL\Plugin_VideoOGL.vcxproj", "{1909CD2D-1707-456F-86CA-0DF42A727C99}" ProjectSection(ProjectDependencies) = postProject {3E5C4E02-1BA9-4776-BDBE-E3F91FFA34CF} = {3E5C4E02-1BA9-4776-BDBE-E3F91FFA34CF} - {69F00340-5C3D-449F-9A80-958435C6CF06} = {69F00340-5C3D-449F-9A80-958435C6CF06} {05C75041-D67D-4903-A362-8395A7B35C75} = {05C75041-D67D-4903-A362-8395A7B35C75} {0E231FB1-F3C9-4724-ACCB-DE8BCB3C089E} = {0E231FB1-F3C9-4724-ACCB-DE8BCB3C089E} EndProjectSection EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "VideoSoftware", "Plugins\Plugin_VideoSoftware\Plugin_VideoSoftware.vcxproj", "{9E9DA440-E9AD-413C-B648-91030E792211}" - ProjectSection(ProjectDependencies) = postProject - {69F00340-5C3D-449F-9A80-958435C6CF06} = {69F00340-5C3D-449F-9A80-958435C6CF06} - EndProjectSection EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "InputCommon", "Core\InputCommon\InputCommon.vcxproj", "{B39AC394-5DB5-4DA9-9D98-09D46CA3701F}" ProjectSection(ProjectDependencies) = postProject - {69F00340-5C3D-449F-9A80-958435C6CF06} = {69F00340-5C3D-449F-9A80-958435C6CF06} {C87A4178-44F6-49B2-B7AA-C79AF1B8C534} = {C87A4178-44F6-49B2-B7AA-C79AF1B8C534} EndProjectSection EndProject @@ -177,18 +139,6 @@ Global {C87A4178-44F6-49B2-B7AA-C79AF1B8C534}.Release|Win32.Build.0 = Release|Win32 {C87A4178-44F6-49B2-B7AA-C79AF1B8C534}.Release|x64.ActiveCfg = Release|x64 {C87A4178-44F6-49B2-B7AA-C79AF1B8C534}.Release|x64.Build.0 = Release|x64 - {69F00340-5C3D-449F-9A80-958435C6CF06}.Debug|Win32.ActiveCfg = Release|x64 - {69F00340-5C3D-449F-9A80-958435C6CF06}.Debug|Win32.Build.0 = Release|x64 - {69F00340-5C3D-449F-9A80-958435C6CF06}.Debug|x64.ActiveCfg = Release|x64 - {69F00340-5C3D-449F-9A80-958435C6CF06}.Debug|x64.Build.0 = Release|x64 - {69F00340-5C3D-449F-9A80-958435C6CF06}.DebugFast|Win32.ActiveCfg = Release|x64 - {69F00340-5C3D-449F-9A80-958435C6CF06}.DebugFast|Win32.Build.0 = Release|x64 - {69F00340-5C3D-449F-9A80-958435C6CF06}.DebugFast|x64.ActiveCfg = Release|x64 - {69F00340-5C3D-449F-9A80-958435C6CF06}.DebugFast|x64.Build.0 = Release|x64 - {69F00340-5C3D-449F-9A80-958435C6CF06}.Release|Win32.ActiveCfg = Release|x64 - {69F00340-5C3D-449F-9A80-958435C6CF06}.Release|Win32.Build.0 = Release|x64 - {69F00340-5C3D-449F-9A80-958435C6CF06}.Release|x64.ActiveCfg = Release|x64 - {69F00340-5C3D-449F-9A80-958435C6CF06}.Release|x64.Build.0 = Release|x64 {37D007BD-D66C-4EAF-B56C-BD1AAC340A05}.Debug|Win32.ActiveCfg = Debug|Win32 {37D007BD-D66C-4EAF-B56C-BD1AAC340A05}.Debug|Win32.Build.0 = Debug|Win32 {37D007BD-D66C-4EAF-B56C-BD1AAC340A05}.Debug|x64.ActiveCfg = Debug|x64 |