piwalker/dolphin
1
0
Fork 0
mirror of https://github.com/dolphin-emu/dolphin.git synced 2025-07-29 09:09:52 -06:00
Code Issues Packages Projects Releases Wiki Activity

Merge UI related projects into the main DolphinWX project.

Browse Source 
git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@7136 8ced0084-cf51-0410-be5f-012b33b47a6e
This commit is contained in:
Jordan Woyak
2011-02-11 21:37:52 +00:00
parent cb832f2298
commit efd22d234f
60 changed files with 195 additions and 974 deletions
Download Patch File Download Diff File Expand all files Collapse all files

68
Source/Dolphin_2010.sln
View File

@ -3,7 +3,6 @@ Microsoft Visual Studio Solution File, Format Version 11.00
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Dolphin", "Core\DolphinWX\Dolphin.vcxproj", "{1B099EF8-6F87-47A2-A3E7-898A24584F49}"
ProjectSection(ProjectDependencies) = postProject
{8C60E805-0DA5-4E25-8F84-038DB504BB0D} = {8C60E805-0DA5-4E25-8F84-038DB504BB0D}
{518F8625-9BFD-402F-AACB-01CE9A1CED8A} = {518F8625-9BFD-402F-AACB-01CE9A1CED8A}
{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}
@ -70,15 +69,6 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "wxCore28", "..\Externals\wx
{1C8436C9-DBAF-42BE-83BC-CF3EC9175ABE} = {1C8436C9-DBAF-42BE-83BC-CF3EC9175ABE}
EndProjectSection
EndProject
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "VideoUICommon", "Core\VideoUICommon\VideoUICommon.vcxproj", "{281F6001-D032-4C3B-87AF-0B00962B4006}"
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}
{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}") = "VideoCommon", "Core\VideoCommon\VideoCommon.vcxproj", "{3E5C4E02-1BA9-4776-BDBE-E3F91FFA34CF}"
ProjectSection(ProjectDependencies) = postProject
{69F00340-5C3D-449F-9A80-958435C6CF06} = {69F00340-5C3D-449F-9A80-958435C6CF06}
@ -92,24 +82,6 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "CLRun", "..\Externals\CLRun
{69F00340-5C3D-449F-9A80-958435C6CF06} = {69F00340-5C3D-449F-9A80-958435C6CF06}
EndProjectSection
EndProject
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "DebuggerUICommon", "Core\DebuggerUICommon\DebuggerUICommon.vcxproj", "{C5A30052-1FC7-4A30-B4A2-6B06DA298AB3}"
ProjectSection(ProjectDependencies) = postProject
{69F00340-5C3D-449F-9A80-958435C6CF06} = {69F00340-5C3D-449F-9A80-958435C6CF06}
{05C75041-D67D-4903-A362-8395A7B35C75} = {05C75041-D67D-4903-A362-8395A7B35C75}
{11F55366-12EC-4C44-A8CB-1D4E315D61ED} = {11F55366-12EC-4C44-A8CB-1D4E315D61ED}
{0E231FB1-F3C9-4724-ACCB-DE8BCB3C089E} = {0E231FB1-F3C9-4724-ACCB-DE8BCB3C089E}
{1C8436C9-DBAF-42BE-83BC-CF3EC9175ABE} = {1C8436C9-DBAF-42BE-83BC-CF3EC9175ABE}
EndProjectSection
EndProject
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Debugger", "Core\DebuggerWX\Debugger.vcxproj", "{518F8625-9BFD-402F-AACB-01CE9A1CED8A}"
ProjectSection(ProjectDependencies) = postProject
{8C60E805-0DA5-4E25-8F84-038DB504BB0D} = {8C60E805-0DA5-4E25-8F84-038DB504BB0D}
{CD3D4C3C-1027-4D33-B047-AEC7B56D0BF6} = {CD3D4C3C-1027-4D33-B047-AEC7B56D0BF6}
{69F00340-5C3D-449F-9A80-958435C6CF06} = {69F00340-5C3D-449F-9A80-958435C6CF06}
{C5A30052-1FC7-4A30-B4A2-6B06DA298AB3} = {C5A30052-1FC7-4A30-B4A2-6B06DA298AB3}
{C87A4178-44F6-49B2-B7AA-C79AF1B8C534} = {C87A4178-44F6-49B2-B7AA-C79AF1B8C534}
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}
@ -135,7 +107,6 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "DiscIO", "Core\DiscIO\DiscI
EndProject
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "VideoDX9", "Plugins\Plugin_VideoDX9\Plugin_VideoDX9.vcxproj", "{DC7D7AF4-CE47-49E8-8B63-265CB6233A49}"
ProjectSection(ProjectDependencies) = postProject
{281F6001-D032-4C3B-87AF-0B00962B4006} = {281F6001-D032-4C3B-87AF-0B00962B4006}
{3E5C4E02-1BA9-4776-BDBE-E3F91FFA34CF} = {3E5C4E02-1BA9-4776-BDBE-E3F91FFA34CF}
{69F00340-5C3D-449F-9A80-958435C6CF06} = {69F00340-5C3D-449F-9A80-958435C6CF06}
{11F55366-12EC-4C44-A8CB-1D4E315D61ED} = {11F55366-12EC-4C44-A8CB-1D4E315D61ED}
@ -145,21 +116,18 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "VideoDX9", "Plugins\Plugin_
EndProject
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "VideoDX11", "Plugins\Plugin_VideoDX11\Plugin_VideoDX11.vcxproj", "{9A4C733C-BADE-4AC6-B58A-6E274395E90E}"
ProjectSection(ProjectDependencies) = postProject
{281F6001-D032-4C3B-87AF-0B00962B4006} = {281F6001-D032-4C3B-87AF-0B00962B4006}
{3E5C4E02-1BA9-4776-BDBE-E3F91FFA34CF} = {3E5C4E02-1BA9-4776-BDBE-E3F91FFA34CF}
{69F00340-5C3D-449F-9A80-958435C6CF06} = {69F00340-5C3D-449F-9A80-958435C6CF06}
EndProjectSection
EndProject
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "VideoOGL", "Plugins\Plugin_VideoOGL\Plugin_VideoOGL.vcxproj", "{1909CD2D-1707-456F-86CA-0DF42A727C99}"
ProjectSection(ProjectDependencies) = postProject
{281F6001-D032-4C3B-87AF-0B00962B4006} = {281F6001-D032-4C3B-87AF-0B00962B4006}
{3E5C4E02-1BA9-4776-BDBE-E3F91FFA34CF} = {3E5C4E02-1BA9-4776-BDBE-E3F91FFA34CF}
{69F00340-5C3D-449F-9A80-958435C6CF06} = {69F00340-5C3D-449F-9A80-958435C6CF06}
EndProjectSection
EndProject
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "VideoSoftware", "Plugins\Plugin_VideoSoftware\Plugin_VideoSoftware.vcxproj", "{9E9DA440-E9AD-413C-B648-91030E792211}"
ProjectSection(ProjectDependencies) = postProject
{281F6001-D032-4C3B-87AF-0B00962B4006} = {281F6001-D032-4C3B-87AF-0B00962B4006}
{3E5C4E02-1BA9-4776-BDBE-E3F91FFA34CF} = {3E5C4E02-1BA9-4776-BDBE-E3F91FFA34CF}
{69F00340-5C3D-449F-9A80-958435C6CF06} = {69F00340-5C3D-449F-9A80-958435C6CF06}
EndProjectSection
@ -326,18 +294,6 @@ Global
{11F55366-12EC-4C44-A8CB-1D4E315D61ED}.Release|Win32.Build.0 = Release|Win32
{11F55366-12EC-4C44-A8CB-1D4E315D61ED}.Release|x64.ActiveCfg = Release|x64
{11F55366-12EC-4C44-A8CB-1D4E315D61ED}.Release|x64.Build.0 = Release|x64
{281F6001-D032-4C3B-87AF-0B00962B4006}.Debug|Win32.ActiveCfg = Debug|Win32
{281F6001-D032-4C3B-87AF-0B00962B4006}.Debug|Win32.Build.0 = Debug|Win32
{281F6001-D032-4C3B-87AF-0B00962B4006}.Debug|x64.ActiveCfg = Debug|x64
{281F6001-D032-4C3B-87AF-0B00962B4006}.Debug|x64.Build.0 = Debug|x64
{281F6001-D032-4C3B-87AF-0B00962B4006}.DebugFast|Win32.ActiveCfg = DebugFast|Win32
{281F6001-D032-4C3B-87AF-0B00962B4006}.DebugFast|Win32.Build.0 = DebugFast|Win32
{281F6001-D032-4C3B-87AF-0B00962B4006}.DebugFast|x64.ActiveCfg = DebugFast|x64
{281F6001-D032-4C3B-87AF-0B00962B4006}.DebugFast|x64.Build.0 = DebugFast|x64
{281F6001-D032-4C3B-87AF-0B00962B4006}.Release|Win32.ActiveCfg = Release|Win32
{281F6001-D032-4C3B-87AF-0B00962B4006}.Release|Win32.Build.0 = Release|Win32
{281F6001-D032-4C3B-87AF-0B00962B4006}.Release|x64.ActiveCfg = Release|x64
{281F6001-D032-4C3B-87AF-0B00962B4006}.Release|x64.Build.0 = Release|x64
{3E5C4E02-1BA9-4776-BDBE-E3F91FFA34CF}.Debug|Win32.ActiveCfg = Debug|Win32
{3E5C4E02-1BA9-4776-BDBE-E3F91FFA34CF}.Debug|Win32.Build.0 = Debug|Win32
{3E5C4E02-1BA9-4776-BDBE-E3F91FFA34CF}.Debug|x64.ActiveCfg = Debug|x64
@ -362,30 +318,6 @@ Global
{AA862E5E-A993-497A-B6A0-0E8E94B10050}.Release|Win32.Build.0 = Release|Win32
{AA862E5E-A993-497A-B6A0-0E8E94B10050}.Release|x64.ActiveCfg = Release|x64
{AA862E5E-A993-497A-B6A0-0E8E94B10050}.Release|x64.Build.0 = Release|x64
{C5A30052-1FC7-4A30-B4A2-6B06DA298AB3}.Debug|Win32.ActiveCfg = Debug|Win32
{C5A30052-1FC7-4A30-B4A2-6B06DA298AB3}.Debug|Win32.Build.0 = Debug|Win32
{C5A30052-1FC7-4A30-B4A2-6B06DA298AB3}.Debug|x64.ActiveCfg = Debug|x64
{C5A30052-1FC7-4A30-B4A2-6B06DA298AB3}.Debug|x64.Build.0 = Debug|x64
{C5A30052-1FC7-4A30-B4A2-6B06DA298AB3}.DebugFast|Win32.ActiveCfg = DebugFast|Win32
{C5A30052-1FC7-4A30-B4A2-6B06DA298AB3}.DebugFast|Win32.Build.0 = DebugFast|Win32
{C5A30052-1FC7-4A30-B4A2-6B06DA298AB3}.DebugFast|x64.ActiveCfg = DebugFast|x64
{C5A30052-1FC7-4A30-B4A2-6B06DA298AB3}.DebugFast|x64.Build.0 = DebugFast|x64
{C5A30052-1FC7-4A30-B4A2-6B06DA298AB3}.Release|Win32.ActiveCfg = Release|Win32
{C5A30052-1FC7-4A30-B4A2-6B06DA298AB3}.Release|Win32.Build.0 = Release|Win32
{C5A30052-1FC7-4A30-B4A2-6B06DA298AB3}.Release|x64.ActiveCfg = Release|x64
{C5A30052-1FC7-4A30-B4A2-6B06DA298AB3}.Release|x64.Build.0 = Release|x64
{518F8625-9BFD-402F-AACB-01CE9A1CED8A}.Debug|Win32.ActiveCfg = Debug|Win32
{518F8625-9BFD-402F-AACB-01CE9A1CED8A}.Debug|Win32.Build.0 = Debug|Win32
{518F8625-9BFD-402F-AACB-01CE9A1CED8A}.Debug|x64.ActiveCfg = Debug|x64
{518F8625-9BFD-402F-AACB-01CE9A1CED8A}.Debug|x64.Build.0 = Debug|x64
{518F8625-9BFD-402F-AACB-01CE9A1CED8A}.DebugFast|Win32.ActiveCfg = DebugFast|Win32
{518F8625-9BFD-402F-AACB-01CE9A1CED8A}.DebugFast|Win32.Build.0 = DebugFast|Win32
{518F8625-9BFD-402F-AACB-01CE9A1CED8A}.DebugFast|x64.ActiveCfg = DebugFast|x64
{518F8625-9BFD-402F-AACB-01CE9A1CED8A}.DebugFast|x64.Build.0 = DebugFast|x64
{518F8625-9BFD-402F-AACB-01CE9A1CED8A}.Release|Win32.ActiveCfg = Release|Win32
{518F8625-9BFD-402F-AACB-01CE9A1CED8A}.Release|Win32.Build.0 = Release|Win32
{518F8625-9BFD-402F-AACB-01CE9A1CED8A}.Release|x64.ActiveCfg = Release|x64
{518F8625-9BFD-402F-AACB-01CE9A1CED8A}.Release|x64.Build.0 = Release|x64
{8C60E805-0DA5-4E25-8F84-038DB504BB0D}.Debug|Win32.ActiveCfg = Debug|Win32
{8C60E805-0DA5-4E25-8F84-038DB504BB0D}.Debug|Win32.Build.0 = Debug|Win32
{8C60E805-0DA5-4E25-8F84-038DB504BB0D}.Debug|x64.ActiveCfg = Debug|x64