diff --git a/Source/Core/CMakeLists.txt b/Source/Core/CMakeLists.txt index 022eb4c524..eec0afa3e5 100644 --- a/Source/Core/CMakeLists.txt +++ b/Source/Core/CMakeLists.txt @@ -1,13 +1,6 @@ add_subdirectory(AudioCommon) add_subdirectory(Common) add_subdirectory(Core) - -if(wxWidgets_FOUND) - add_subdirectory(DebuggerUICommon) - add_subdirectory(DebuggerWX) - add_subdirectory(VideoUICommon) -endif() - add_subdirectory(DiscIO) add_subdirectory(DolphinWX) add_subdirectory(InputCommon) diff --git a/Source/Core/DebuggerUICommon/CMakeLists.txt b/Source/Core/DebuggerUICommon/CMakeLists.txt deleted file mode 100644 index 64c8828604..0000000000 --- a/Source/Core/DebuggerUICommon/CMakeLists.txt +++ /dev/null @@ -1,6 +0,0 @@ -set(SRCS Src/CodeView.cpp - Src/DebuggerUIUtil.cpp - Src/MemoryView.cpp) - -add_library(debugger_ui_util STATIC ${SRCS}) -target_link_libraries(debugger_ui_util ${wxWidgets_LIBRARIES}) diff --git a/Source/Core/DebuggerUICommon/DebuggerUICommon.vcxproj b/Source/Core/DebuggerUICommon/DebuggerUICommon.vcxproj deleted file mode 100644 index 75c8f6e30b..0000000000 --- a/Source/Core/DebuggerUICommon/DebuggerUICommon.vcxproj +++ /dev/null @@ -1,185 +0,0 @@ - - - - - DebugFast - Win32 - - - DebugFast - x64 - - - Debug - Win32 - - - Debug - x64 - - - Release - Win32 - - - Release - x64 - - - - {C5A30052-1FC7-4A30-B4A2-6B06DA298AB3} - DebuggerUICommon - - - - true - StaticLibrary - Unicode - - - true - StaticLibrary - Unicode - - - false - StaticLibrary - Unicode - true - - - StaticLibrary - false - Unicode - - - false - StaticLibrary - Unicode - true - - - StaticLibrary - false - Unicode - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - ..\Common\Src;..\Core\Src;..\..\..\Externals\wxWidgets\include;%(AdditionalIncludeDirectories) - - - true - - - - - ..\Common\Src;..\Core\Src;..\..\..\Externals\wxWidgets\include;%(AdditionalIncludeDirectories) - - - true - - - - - ..\Common\Src;..\Core\Src;..\..\..\Externals\wxWidgets\include;%(AdditionalIncludeDirectories) - - - true - true - true - - - - - ..\Common\Src;..\Core\Src;..\..\..\Externals\wxWidgets\include;%(AdditionalIncludeDirectories) - - - true - true - true - - - - - ..\Common\Src;..\Core\Src;..\..\..\Externals\wxWidgets\include;%(AdditionalIncludeDirectories) - - - true - true - true - - - - - ..\Common\Src;..\Core\Src;..\..\..\Externals\wxWidgets\include;%(AdditionalIncludeDirectories) - - - true - true - true - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/Source/Core/DebuggerUICommon/Src/SConscript b/Source/Core/DebuggerUICommon/Src/SConscript deleted file mode 100644 index 19ad35c23b..0000000000 --- a/Source/Core/DebuggerUICommon/Src/SConscript +++ /dev/null @@ -1,14 +0,0 @@ -# -*- python -*- - -Import('env') - -if not env['HAVE_WX']: - Return() - -files = [ - 'CodeView.cpp', - 'DebuggerUIUtil.cpp', - 'MemoryView.cpp', - ] - -env['LIBS'] += env.StaticObject(files) diff --git a/Source/Core/DebuggerWX/CMakeLists.txt b/Source/Core/DebuggerWX/CMakeLists.txt deleted file mode 100644 index 36adbd6ff7..0000000000 --- a/Source/Core/DebuggerWX/CMakeLists.txt +++ /dev/null @@ -1,17 +0,0 @@ -set(SRCS Src/BreakpointDlg.cpp - Src/BreakpointView.cpp - Src/BreakpointWindow.cpp - Src/CodeWindow.cpp - Src/CodeWindowFunctions.cpp - Src/DSPDebugWindow.cpp - Src/DSPDebugWindow.h - Src/DSPRegisterView.cpp - Src/DSPRegisterView.h - Src/JitWindow.cpp - Src/MemoryCheckDlg.cpp - Src/MemoryWindow.cpp - Src/RegisterView.cpp - Src/RegisterWindow.cpp) - -add_library(debwx STATIC ${SRCS}) -target_link_libraries(debwx common core debugger_ui_util) diff --git a/Source/Core/DebuggerWX/Debugger.vcxproj b/Source/Core/DebuggerWX/Debugger.vcxproj deleted file mode 100644 index 6943561869..0000000000 --- a/Source/Core/DebuggerWX/Debugger.vcxproj +++ /dev/null @@ -1,257 +0,0 @@ - - - - - DebugFast - Win32 - - - DebugFast - x64 - - - Debug - Win32 - - - Debug - x64 - - - Release - Win32 - - - Release - x64 - - - - - CompileAsCpp - CompileAsCpp - CompileAsCpp - CompileAsCpp - CompileAsCpp - CompileAsCpp - - - CompileAsCpp - CompileAsCpp - CompileAsCpp - CompileAsCpp - CompileAsCpp - CompileAsCpp - - - CompileAsCpp - CompileAsCpp - CompileAsCpp - CompileAsCpp - CompileAsCpp - CompileAsCpp - - - CompileAsCpp - CompileAsCpp - CompileAsCpp - CompileAsCpp - CompileAsCpp - CompileAsCpp - - - CompileAsCpp - CompileAsCpp - CompileAsCpp - CompileAsCpp - CompileAsCpp - CompileAsCpp - - - - - - - - - - - - - - - Create - Create - Create - Create - Create - Create - - - - - - - - - - - - - - - - - - - - - - {518F8625-9BFD-402F-AACB-01CE9A1CED8A} - Debugger - - - - true - StaticLibrary - Unicode - - - true - StaticLibrary - Unicode - - - false - StaticLibrary - Unicode - true - - - StaticLibrary - false - Unicode - - - false - StaticLibrary - Unicode - true - - - StaticLibrary - false - Unicode - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - ..\Common\Src;..\Core\Src;..\DebuggerUICommon\Src;..\VideoCommon\Src;..\VideoUICommon\Src;..\..\..\Externals\wxWidgets\include;..\..\..\Externals\Bochs_disasm;%(AdditionalIncludeDirectories) - - - true - - - - - ..\Common\Src;..\Core\Src;..\DebuggerUICommon\Src;..\VideoCommon\Src;..\VideoUICommon\Src;..\..\..\Externals\wxWidgets\include;..\..\..\Externals\Bochs_disasm;%(AdditionalIncludeDirectories) - - - true - - - - - ..\Common\Src;..\Core\Src;..\DebuggerUICommon\Src;..\VideoCommon\Src;..\VideoUICommon\Src;..\..\..\Externals\wxWidgets\include;..\..\..\Externals\Bochs_disasm;%(AdditionalIncludeDirectories) - - - true - true - true - - - - - ..\Common\Src;..\Core\Src;..\DebuggerUICommon\Src;..\VideoCommon\Src;..\VideoUICommon\Src;..\..\..\Externals\wxWidgets\include;..\..\..\Externals\Bochs_disasm;%(AdditionalIncludeDirectories) - - - true - true - true - - - - - ..\Common\Src;..\Core\Src;..\DebuggerUICommon\Src;..\VideoCommon\Src;..\VideoUICommon\Src;..\..\..\Externals\wxWidgets\include;..\..\..\Externals\Bochs_disasm;%(AdditionalIncludeDirectories) - - - true - true - true - - - - - ..\Common\Src;..\Core\Src;..\DebuggerUICommon\Src;..\VideoCommon\Src;..\VideoUICommon\Src;..\..\..\Externals\wxWidgets\include;..\..\..\Externals\Bochs_disasm;%(AdditionalIncludeDirectories) - - - true - true - true - - - - - - \ No newline at end of file diff --git a/Source/Core/DebuggerWX/Debugger.vcxproj.filters b/Source/Core/DebuggerWX/Debugger.vcxproj.filters deleted file mode 100644 index fa41e2e89b..0000000000 --- a/Source/Core/DebuggerWX/Debugger.vcxproj.filters +++ /dev/null @@ -1,71 +0,0 @@ - - - - - - - - - - - - - - - Resources - - - Resources - - - Resources - - - Resources - - - Resources - - - Controls - - - Controls - - - Controls - - - - - - - - - - - - - - Controls - - - Controls - - - Controls - - - - - - - - - {80816c38-4c67-4aec-96b9-cf09ce472e82} - - - {4a53a021-c650-4790-a108-63b53c8d2a5c} - - - \ No newline at end of file diff --git a/Source/Core/DebuggerWX/Src/SConscript b/Source/Core/DebuggerWX/Src/SConscript deleted file mode 100644 index de272a5105..0000000000 --- a/Source/Core/DebuggerWX/Src/SConscript +++ /dev/null @@ -1,23 +0,0 @@ -# -*- python -*- - -Import('env') - -if not env['HAVE_WX']: - Return() - -files = [ - "BreakpointDlg.cpp", - "BreakpointView.cpp", - "BreakpointWindow.cpp", - "CodeWindow.cpp", - "CodeWindowFunctions.cpp", - "DSPDebugWindow.cpp", - "DSPRegisterView.cpp", - "MemoryCheckDlg.cpp", - "MemoryWindow.cpp", - "RegisterWindow.cpp", - "RegisterView.cpp", - "JitWindow.cpp", - ] - -env['LIBS'] += env.StaticObject(files) diff --git a/Source/Core/DebuggerWX/Src/stdafx.cpp b/Source/Core/DebuggerWX/Src/stdafx.cpp deleted file mode 100644 index 31f734b17a..0000000000 --- a/Source/Core/DebuggerWX/Src/stdafx.cpp +++ /dev/null @@ -1,18 +0,0 @@ -// Copyright (C) 2003 Dolphin Project. - -// This program is free software: you can redistribute it and/or modify -// it under the terms of the GNU General Public License as published by -// the Free Software Foundation, version 2.0. - -// This program is distributed in the hope that it will be useful, -// but WITHOUT ANY WARRANTY; without even the implied warranty of -// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -// GNU General Public License 2.0 for more details. - -// A copy of the GPL 2.0 should have been included with the program. -// If not, see http://www.gnu.org/licenses/ - -// Official SVN repository and contact information can be found at -// http://code.google.com/p/dolphin-emu/ - -#include "stdafx.h" diff --git a/Source/Core/DebuggerWX/Src/stdafx.h b/Source/Core/DebuggerWX/Src/stdafx.h deleted file mode 100644 index 7518bdd104..0000000000 --- a/Source/Core/DebuggerWX/Src/stdafx.h +++ /dev/null @@ -1,33 +0,0 @@ -// Copyright (C) 2003 Dolphin Project. - -// This program is free software: you can redistribute it and/or modify -// it under the terms of the GNU General Public License as published by -// the Free Software Foundation, version 2.0. - -// This program is distributed in the hope that it will be useful, -// but WITHOUT ANY WARRANTY; without even the implied warranty of -// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -// GNU General Public License 2.0 for more details. - -// A copy of the GPL 2.0 should have been included with the program. -// If not, see http://www.gnu.org/licenses/ - -// Official SVN repository and contact information can be found at -// http://code.google.com/p/dolphin-emu/ - -#ifndef __STDAFX_H_ -#define __STDAFX_H_ - -#ifdef _WIN32 - -// Change these values to use different versions -#define WINVER 0x0400 -#define _WIN32_WINNT 0x0501 -#define _WIN32_IE 0x0500 -#define _RICHEDIT_VER 0x0100 - -#include // wxWidgets - -#endif - -#endif // __STDAFX_H__ diff --git a/Source/Core/DolphinWX/CMakeLists.txt b/Source/Core/DolphinWX/CMakeLists.txt index 1a71b4028a..b92ed72e61 100644 --- a/Source/Core/DolphinWX/CMakeLists.txt +++ b/Source/Core/DolphinWX/CMakeLists.txt @@ -41,7 +41,24 @@ if(wxWidgets_FOUND) Src/WiimoteConfigDiag.cpp Src/MemoryCards/WiiSaveCrypted.cpp Src/WXInputBase.cpp - Src/WxUtils.cpp) + Src/WxUtils.cpp + Src/BreakpointDlg.cpp + Src/BreakpointView.cpp + Src/BreakpointWindow.cpp + Src/CodeView.cpp + Src/CodeWindow.cpp + Src/CodeWindowFunctions.cpp + Src/DebuggerPanel.cpp + Src/DebuggerUIUtil.cpp + Src/DSPDebugWindow.cpp + Src/DSPRegisterView.cpp + Src/JitWindow.cpp + Src/MemoryCheckDlg.cpp + Src/MemoryView.cpp + Src/MemoryWindow.cpp + Src/RegisterView.cpp + Src/RegisterWindow.cpp + Src/VideoConfigDiag.cpp) set(WXLIBS debwx debugger_ui_util diff --git a/Source/Core/DolphinWX/Dolphin.vcxproj b/Source/Core/DolphinWX/Dolphin.vcxproj index 2e57aaba78..349b8c8bfc 100644 --- a/Source/Core/DolphinWX/Dolphin.vcxproj +++ b/Source/Core/DolphinWX/Dolphin.vcxproj @@ -131,7 +131,7 @@ - ..\Common\Src;..\AudioCommon\Src;..\Core\Src;..\DebuggerWX\Src;..\DebuggerUICommon\Src;..\InputCommon\Src;..\DiscIO\Src;..\..\..\Externals\SFML\include;..\..\..\Externals\wxWidgets\include;..\..\..\Externals\CLRun\include;%(AdditionalIncludeDirectories) + ..\Common\Src;..\VideoCommon\Src;..\AudioCommon\Src;..\Core\Src;..\Core\Src\PowerPC\JitCommon;..\DebuggerWX\Src;..\..\..\Externals\Bochs_disasm;..\InputCommon\Src;..\DiscIO\Src;..\..\..\Externals\SFML\include;..\..\..\Externals\wxWidgets\include;..\..\..\Externals\CLRun\include;%(AdditionalIncludeDirectories) @@ -145,7 +145,7 @@ xcopy "$(SolutionDir)..\Externals\SDL\$(PlatformName)\*.dll" "$(TargetDir)" /e / - ..\Common\Src;..\AudioCommon\Src;..\Core\Src;..\DebuggerWX\Src;..\DebuggerUICommon\Src;..\InputCommon\Src;..\DiscIO\Src;..\..\..\Externals\SFML\include;..\..\..\Externals\wxWidgets\include;..\..\..\Externals\CLRun\include;%(AdditionalIncludeDirectories) + ..\Common\Src;..\VideoCommon\Src;..\AudioCommon\Src;..\Core\Src;..\Core\Src\PowerPC\JitCommon;..\DebuggerWX\Src;..\..\..\Externals\Bochs_disasm;..\InputCommon\Src;..\DiscIO\Src;..\..\..\Externals\SFML\include;..\..\..\Externals\wxWidgets\include;..\..\..\Externals\CLRun\include;%(AdditionalIncludeDirectories) @@ -159,7 +159,7 @@ xcopy "$(SolutionDir)..\Externals\SDL\$(PlatformName)\*.dll" "$(TargetDir)" /e / - ..\Common\Src;..\AudioCommon\Src;..\Core\Src;..\DebuggerWX\Src;..\DebuggerUICommon\Src;..\InputCommon\Src;..\DiscIO\Src;..\..\..\Externals\SFML\include;..\..\..\Externals\wxWidgets\include;..\..\..\Externals\CLRun\include;%(AdditionalIncludeDirectories) + ..\Common\Src;..\VideoCommon\Src;..\AudioCommon\Src;..\Core\Src;..\Core\Src\PowerPC\JitCommon;..\DebuggerWX\Src;..\..\..\Externals\Bochs_disasm;..\InputCommon\Src;..\DiscIO\Src;..\..\..\Externals\SFML\include;..\..\..\Externals\wxWidgets\include;..\..\..\Externals\CLRun\include;%(AdditionalIncludeDirectories) @@ -173,7 +173,7 @@ xcopy "$(SolutionDir)..\Externals\SDL\$(PlatformName)\*.dll" "$(TargetDir)" /e / - ..\Common\Src;..\AudioCommon\Src;..\Core\Src;..\DebuggerWX\Src;..\DebuggerUICommon\Src;..\InputCommon\Src;..\InputUICommon\Src;..\DiscIO\Src;..\..\..\Externals\SFML\include;..\..\..\Externals\wxWidgets\include;..\..\..\Externals\CLRun\include;%(AdditionalIncludeDirectories) + ..\Common\Src;..\VideoCommon\Src;..\AudioCommon\Src;..\Core\Src;..\Core\Src\PowerPC\JitCommon;..\DebuggerWX\Src;..\..\..\Externals\Bochs_disasm;..\InputCommon\Src;..\InputUICommon\Src;..\DiscIO\Src;..\..\..\Externals\SFML\include;..\..\..\Externals\wxWidgets\include;..\..\..\Externals\CLRun\include;%(AdditionalIncludeDirectories) @@ -187,7 +187,7 @@ xcopy "$(SolutionDir)..\Externals\SDL\$(PlatformName)\*.dll" "$(TargetDir)" /e / - ..\Common\Src;..\AudioCommon\Src;..\Core\Src;..\DebuggerWX\Src;..\DebuggerUICommon\Src;..\InputCommon\Src;..\DiscIO\Src;..\..\..\Externals\SFML\include;..\..\..\Externals\wxWidgets\include;..\..\..\Externals\CLRun\include;%(AdditionalIncludeDirectories) + ..\Common\Src;..\VideoCommon\Src;..\AudioCommon\Src;..\Core\Src;..\Core\Src\PowerPC\JitCommon;..\DebuggerWX\Src;..\..\..\Externals\Bochs_disasm;..\InputCommon\Src;..\DiscIO\Src;..\..\..\Externals\SFML\include;..\..\..\Externals\wxWidgets\include;..\..\..\Externals\CLRun\include;%(AdditionalIncludeDirectories) @@ -201,7 +201,7 @@ xcopy "$(SolutionDir)..\Externals\SDL\$(PlatformName)\*.dll" "$(TargetDir)" /e / - ..\Common\Src;..\AudioCommon\Src;..\Core\Src;..\DebuggerWX\Src;..\DebuggerUICommon\Src;..\InputCommon\Src;..\InputUICommon\Src;..\DiscIO\Src;..\..\..\Externals\SFML\include;..\..\..\Externals\wxWidgets\include;..\..\..\Externals\CLRun\include;%(AdditionalIncludeDirectories) + ..\Common\Src;..\VideoCommon\Src;..\AudioCommon\Src;..\Core\Src;..\Core\Src\PowerPC\JitCommon;..\DebuggerWX\Src;..\..\..\Externals\Bochs_disasm;..\InputCommon\Src;..\InputUICommon\Src;..\DiscIO\Src;..\..\..\Externals\SFML\include;..\..\..\Externals\wxWidgets\include;..\..\..\Externals\CLRun\include;%(AdditionalIncludeDirectories) @@ -217,8 +217,18 @@ xcopy "$(SolutionDir)..\Externals\SDL\$(PlatformName)\*.dll" "$(TargetDir)" /e / + + + + + + + + + + @@ -229,6 +239,7 @@ xcopy "$(SolutionDir)..\Externals\SDL\$(PlatformName)\*.dll" "$(TargetDir)" /e / + @@ -242,9 +253,14 @@ xcopy "$(SolutionDir)..\Externals\SDL\$(PlatformName)\*.dll" "$(TargetDir)" /e / + + + + + Create Create @@ -254,6 +270,7 @@ xcopy "$(SolutionDir)..\Externals\SDL\$(PlatformName)\*.dll" "$(TargetDir)" /e / Create + @@ -263,8 +280,17 @@ xcopy "$(SolutionDir)..\Externals\SDL\$(PlatformName)\*.dll" "$(TargetDir)" /e / + + + + + + + + + @@ -273,16 +299,23 @@ xcopy "$(SolutionDir)..\Externals\SDL\$(PlatformName)\*.dll" "$(TargetDir)" /e / + + + + + + + @@ -335,12 +368,6 @@ xcopy "$(SolutionDir)..\Externals\SDL\$(PlatformName)\*.dll" "$(TargetDir)" /e / {8c60e805-0da5-4e25-8f84-038db504bb0d} - - {c5a30052-1fc7-4a30-b4a2-6b06da298ab3} - - - {518f8625-9bfd-402f-aacb-01ce9a1ced8a} - {b6398059-ebb6-4c34-b547-95f365b71ff4} @@ -350,9 +377,6 @@ xcopy "$(SolutionDir)..\Externals\SDL\$(PlatformName)\*.dll" "$(TargetDir)" /e / {3e5c4e02-1ba9-4776-bdbe-e3f91ffa34cf} - - {281f6001-d032-4c3b-87af-0b00962b4006} - diff --git a/Source/Core/DolphinWX/Dolphin.vcxproj.filters b/Source/Core/DolphinWX/Dolphin.vcxproj.filters index 80c1576baf..5ae6e302bc 100644 --- a/Source/Core/DolphinWX/Dolphin.vcxproj.filters +++ b/Source/Core/DolphinWX/Dolphin.vcxproj.filters @@ -87,6 +87,57 @@ GUI + + GUI\Debugger + + + GUI\Video + + + GUI\Debugger + + + GUI\Debugger + + + GUI\Video + + + GUI\Debugger + + + GUI\Debugger + + + GUI\Debugger + + + GUI\Debugger + + + GUI\Debugger + + + GUI\Debugger + + + GUI\Debugger + + + GUI\Debugger + + + GUI\Debugger + + + GUI\Debugger + + + GUI\Debugger + + + GUI\Debugger + @@ -165,6 +216,54 @@ GUI + + GUI\Debugger + + + GUI\Video + + + GUI\Debugger + + + GUI\Debugger + + + GUI\Video + + + GUI\Debugger + + + GUI\Debugger + + + GUI\Debugger + + + GUI\Debugger + + + GUI\Debugger + + + GUI\Debugger + + + GUI\Debugger + + + GUI\Debugger + + + GUI\Debugger + + + GUI\Debugger + + + GUI\Debugger + @@ -192,6 +291,12 @@ {9dd3ef96-b03a-4c14-9d35-6a4850acd430} + + {8ab1ce40-f5e7-47b8-9706-59c924af4eaa} + + + {ff5180be-244f-4c0e-8a35-bd4bffb6a343} + diff --git a/Source/Core/DebuggerWX/Src/BreakpointDlg.cpp b/Source/Core/DolphinWX/Src/BreakpointDlg.cpp similarity index 100% rename from Source/Core/DebuggerWX/Src/BreakpointDlg.cpp rename to Source/Core/DolphinWX/Src/BreakpointDlg.cpp diff --git a/Source/Core/DebuggerWX/Src/BreakpointDlg.h b/Source/Core/DolphinWX/Src/BreakpointDlg.h similarity index 100% rename from Source/Core/DebuggerWX/Src/BreakpointDlg.h rename to Source/Core/DolphinWX/Src/BreakpointDlg.h diff --git a/Source/Core/DebuggerWX/Src/BreakpointView.cpp b/Source/Core/DolphinWX/Src/BreakpointView.cpp similarity index 100% rename from Source/Core/DebuggerWX/Src/BreakpointView.cpp rename to Source/Core/DolphinWX/Src/BreakpointView.cpp diff --git a/Source/Core/DebuggerWX/Src/BreakpointView.h b/Source/Core/DolphinWX/Src/BreakpointView.h similarity index 100% rename from Source/Core/DebuggerWX/Src/BreakpointView.h rename to Source/Core/DolphinWX/Src/BreakpointView.h diff --git a/Source/Core/DebuggerWX/Src/BreakpointWindow.cpp b/Source/Core/DolphinWX/Src/BreakpointWindow.cpp similarity index 100% rename from Source/Core/DebuggerWX/Src/BreakpointWindow.cpp rename to Source/Core/DolphinWX/Src/BreakpointWindow.cpp diff --git a/Source/Core/DebuggerWX/Src/BreakpointWindow.h b/Source/Core/DolphinWX/Src/BreakpointWindow.h similarity index 100% rename from Source/Core/DebuggerWX/Src/BreakpointWindow.h rename to Source/Core/DolphinWX/Src/BreakpointWindow.h diff --git a/Source/Core/DebuggerUICommon/Src/CodeView.cpp b/Source/Core/DolphinWX/Src/CodeView.cpp similarity index 100% rename from Source/Core/DebuggerUICommon/Src/CodeView.cpp rename to Source/Core/DolphinWX/Src/CodeView.cpp diff --git a/Source/Core/DebuggerUICommon/Src/CodeView.h b/Source/Core/DolphinWX/Src/CodeView.h similarity index 100% rename from Source/Core/DebuggerUICommon/Src/CodeView.h rename to Source/Core/DolphinWX/Src/CodeView.h diff --git a/Source/Core/DebuggerWX/Src/CodeWindow.cpp b/Source/Core/DolphinWX/Src/CodeWindow.cpp similarity index 100% rename from Source/Core/DebuggerWX/Src/CodeWindow.cpp rename to Source/Core/DolphinWX/Src/CodeWindow.cpp diff --git a/Source/Core/DebuggerWX/Src/CodeWindow.h b/Source/Core/DolphinWX/Src/CodeWindow.h similarity index 100% rename from Source/Core/DebuggerWX/Src/CodeWindow.h rename to Source/Core/DolphinWX/Src/CodeWindow.h diff --git a/Source/Core/DebuggerWX/Src/CodeWindowFunctions.cpp b/Source/Core/DolphinWX/Src/CodeWindowFunctions.cpp similarity index 100% rename from Source/Core/DebuggerWX/Src/CodeWindowFunctions.cpp rename to Source/Core/DolphinWX/Src/CodeWindowFunctions.cpp diff --git a/Source/Core/DebuggerWX/Src/DSPDebugWindow.cpp b/Source/Core/DolphinWX/Src/DSPDebugWindow.cpp similarity index 100% rename from Source/Core/DebuggerWX/Src/DSPDebugWindow.cpp rename to Source/Core/DolphinWX/Src/DSPDebugWindow.cpp diff --git a/Source/Core/DebuggerWX/Src/DSPDebugWindow.h b/Source/Core/DolphinWX/Src/DSPDebugWindow.h similarity index 100% rename from Source/Core/DebuggerWX/Src/DSPDebugWindow.h rename to Source/Core/DolphinWX/Src/DSPDebugWindow.h diff --git a/Source/Core/DebuggerWX/Src/DSPRegisterView.cpp b/Source/Core/DolphinWX/Src/DSPRegisterView.cpp similarity index 100% rename from Source/Core/DebuggerWX/Src/DSPRegisterView.cpp rename to Source/Core/DolphinWX/Src/DSPRegisterView.cpp diff --git a/Source/Core/DebuggerWX/Src/DSPRegisterView.h b/Source/Core/DolphinWX/Src/DSPRegisterView.h similarity index 100% rename from Source/Core/DebuggerWX/Src/DSPRegisterView.h rename to Source/Core/DolphinWX/Src/DSPRegisterView.h diff --git a/Source/Core/VideoUICommon/Src/DebuggerPanel.cpp b/Source/Core/DolphinWX/Src/DebuggerPanel.cpp similarity index 100% rename from Source/Core/VideoUICommon/Src/DebuggerPanel.cpp rename to Source/Core/DolphinWX/Src/DebuggerPanel.cpp diff --git a/Source/Core/VideoUICommon/Src/DebuggerPanel.h b/Source/Core/DolphinWX/Src/DebuggerPanel.h similarity index 100% rename from Source/Core/VideoUICommon/Src/DebuggerPanel.h rename to Source/Core/DolphinWX/Src/DebuggerPanel.h diff --git a/Source/Core/DebuggerUICommon/Src/DebuggerUIUtil.cpp b/Source/Core/DolphinWX/Src/DebuggerUIUtil.cpp similarity index 100% rename from Source/Core/DebuggerUICommon/Src/DebuggerUIUtil.cpp rename to Source/Core/DolphinWX/Src/DebuggerUIUtil.cpp diff --git a/Source/Core/DebuggerUICommon/Src/DebuggerUIUtil.h b/Source/Core/DolphinWX/Src/DebuggerUIUtil.h similarity index 100% rename from Source/Core/DebuggerUICommon/Src/DebuggerUIUtil.h rename to Source/Core/DolphinWX/Src/DebuggerUIUtil.h diff --git a/Source/Core/DebuggerWX/Src/JitWindow.cpp b/Source/Core/DolphinWX/Src/JitWindow.cpp similarity index 100% rename from Source/Core/DebuggerWX/Src/JitWindow.cpp rename to Source/Core/DolphinWX/Src/JitWindow.cpp diff --git a/Source/Core/DebuggerWX/Src/JitWindow.h b/Source/Core/DolphinWX/Src/JitWindow.h similarity index 100% rename from Source/Core/DebuggerWX/Src/JitWindow.h rename to Source/Core/DolphinWX/Src/JitWindow.h diff --git a/Source/Core/DebuggerWX/Src/MemoryCheckDlg.cpp b/Source/Core/DolphinWX/Src/MemoryCheckDlg.cpp similarity index 100% rename from Source/Core/DebuggerWX/Src/MemoryCheckDlg.cpp rename to Source/Core/DolphinWX/Src/MemoryCheckDlg.cpp diff --git a/Source/Core/DebuggerWX/Src/MemoryCheckDlg.h b/Source/Core/DolphinWX/Src/MemoryCheckDlg.h similarity index 100% rename from Source/Core/DebuggerWX/Src/MemoryCheckDlg.h rename to Source/Core/DolphinWX/Src/MemoryCheckDlg.h diff --git a/Source/Core/DebuggerUICommon/Src/MemoryView.cpp b/Source/Core/DolphinWX/Src/MemoryView.cpp similarity index 100% rename from Source/Core/DebuggerUICommon/Src/MemoryView.cpp rename to Source/Core/DolphinWX/Src/MemoryView.cpp diff --git a/Source/Core/DebuggerUICommon/Src/MemoryView.h b/Source/Core/DolphinWX/Src/MemoryView.h similarity index 100% rename from Source/Core/DebuggerUICommon/Src/MemoryView.h rename to Source/Core/DolphinWX/Src/MemoryView.h diff --git a/Source/Core/DebuggerWX/Src/MemoryWindow.cpp b/Source/Core/DolphinWX/Src/MemoryWindow.cpp similarity index 100% rename from Source/Core/DebuggerWX/Src/MemoryWindow.cpp rename to Source/Core/DolphinWX/Src/MemoryWindow.cpp diff --git a/Source/Core/DebuggerWX/Src/MemoryWindow.h b/Source/Core/DolphinWX/Src/MemoryWindow.h similarity index 100% rename from Source/Core/DebuggerWX/Src/MemoryWindow.h rename to Source/Core/DolphinWX/Src/MemoryWindow.h diff --git a/Source/Core/DebuggerWX/Src/RegisterView.cpp b/Source/Core/DolphinWX/Src/RegisterView.cpp similarity index 100% rename from Source/Core/DebuggerWX/Src/RegisterView.cpp rename to Source/Core/DolphinWX/Src/RegisterView.cpp diff --git a/Source/Core/DebuggerWX/Src/RegisterView.h b/Source/Core/DolphinWX/Src/RegisterView.h similarity index 100% rename from Source/Core/DebuggerWX/Src/RegisterView.h rename to Source/Core/DolphinWX/Src/RegisterView.h diff --git a/Source/Core/DebuggerWX/Src/RegisterWindow.cpp b/Source/Core/DolphinWX/Src/RegisterWindow.cpp similarity index 100% rename from Source/Core/DebuggerWX/Src/RegisterWindow.cpp rename to Source/Core/DolphinWX/Src/RegisterWindow.cpp diff --git a/Source/Core/DebuggerWX/Src/RegisterWindow.h b/Source/Core/DolphinWX/Src/RegisterWindow.h similarity index 100% rename from Source/Core/DebuggerWX/Src/RegisterWindow.h rename to Source/Core/DolphinWX/Src/RegisterWindow.h diff --git a/Source/Core/DolphinWX/Src/SConscript b/Source/Core/DolphinWX/Src/SConscript index 0f6342826e..8ce249ec03 100644 --- a/Source/Core/DolphinWX/Src/SConscript +++ b/Source/Core/DolphinWX/Src/SConscript @@ -38,6 +38,23 @@ else: 'WiimoteConfigDiag.cpp', 'WXInputBase.cpp', 'WxUtils.cpp', + 'BreakpointDlg.cpp', + 'BreakpointView.cpp', + 'BreakpointWindow.cpp', + 'CodeView.cpp', + 'CodeWindow.cpp', + 'CodeWindowFunctions.cpp', + 'DebuggerPanel.cpp', + 'DebuggerUIUtil.cpp', + 'DSPDebugWindow.cpp', + 'DSPRegisterView.cpp', + 'JitWindow.cpp', + 'MemoryCheckDlg.cpp', + 'MemoryView.cpp', + 'MemoryWindow.cpp', + 'RegisterView.cpp', + 'RegisterWindow.cpp', + 'VideoConfigDiag.cpp', ] if sys.platform == 'win32': diff --git a/Source/Core/VideoUICommon/Src/VideoConfigDiag.cpp b/Source/Core/DolphinWX/Src/VideoConfigDiag.cpp similarity index 100% rename from Source/Core/VideoUICommon/Src/VideoConfigDiag.cpp rename to Source/Core/DolphinWX/Src/VideoConfigDiag.cpp diff --git a/Source/Core/VideoUICommon/Src/VideoConfigDiag.h b/Source/Core/DolphinWX/Src/VideoConfigDiag.h similarity index 100% rename from Source/Core/VideoUICommon/Src/VideoConfigDiag.h rename to Source/Core/DolphinWX/Src/VideoConfigDiag.h diff --git a/Source/Core/DebuggerWX/resources/toolbar_add_breakpoint.c b/Source/Core/DolphinWX/resources/toolbar_add_breakpoint.c similarity index 100% rename from Source/Core/DebuggerWX/resources/toolbar_add_breakpoint.c rename to Source/Core/DolphinWX/resources/toolbar_add_breakpoint.c diff --git a/Source/Core/DebuggerWX/resources/toolbar_add_memorycheck.c b/Source/Core/DolphinWX/resources/toolbar_add_memorycheck.c similarity index 100% rename from Source/Core/DebuggerWX/resources/toolbar_add_memorycheck.c rename to Source/Core/DolphinWX/resources/toolbar_add_memorycheck.c diff --git a/Source/Core/DebuggerWX/resources/toolbar_delete.c b/Source/Core/DolphinWX/resources/toolbar_debugger_delete.c similarity index 100% rename from Source/Core/DebuggerWX/resources/toolbar_delete.c rename to Source/Core/DolphinWX/resources/toolbar_debugger_delete.c diff --git a/Source/Core/DebuggerWX/resources/toolbar_pause.c b/Source/Core/DolphinWX/resources/toolbar_debugger_pause.c similarity index 100% rename from Source/Core/DebuggerWX/resources/toolbar_pause.c rename to Source/Core/DolphinWX/resources/toolbar_debugger_pause.c diff --git a/Source/Core/DebuggerWX/resources/toolbar_play.c b/Source/Core/DolphinWX/resources/toolbar_debugger_play.c similarity index 100% rename from Source/Core/DebuggerWX/resources/toolbar_play.c rename to Source/Core/DolphinWX/resources/toolbar_debugger_play.c diff --git a/Source/Core/VideoUICommon/CMakeLists.txt b/Source/Core/VideoUICommon/CMakeLists.txt deleted file mode 100644 index c03d80540a..0000000000 --- a/Source/Core/VideoUICommon/CMakeLists.txt +++ /dev/null @@ -1,4 +0,0 @@ -set(SRCS Src/VideoConfigDiag.cpp - Src/DebuggerPanel.cpp) - -add_library(videouicommon STATIC ${SRCS}) diff --git a/Source/Core/VideoUICommon/Src/SConscript b/Source/Core/VideoUICommon/Src/SConscript deleted file mode 100644 index 9c1989f2a0..0000000000 --- a/Source/Core/VideoUICommon/Src/SConscript +++ /dev/null @@ -1,13 +0,0 @@ -# -*- python -*- - -Import('env') - -if not env['HAVE_WX']: - Return() - -files = [ - 'VideoConfigDiag.cpp', - 'DebuggerPanel.cpp', - ] - -env['LIBS'] += env.StaticObject(files) diff --git a/Source/Core/VideoUICommon/VideoUICommon.vcxproj b/Source/Core/VideoUICommon/VideoUICommon.vcxproj deleted file mode 100644 index ea09cb81c3..0000000000 --- a/Source/Core/VideoUICommon/VideoUICommon.vcxproj +++ /dev/null @@ -1,217 +0,0 @@ - - - - - DebugFast - Win32 - - - DebugFast - x64 - - - Debug - Win32 - - - Debug - x64 - - - Release - Win32 - - - Release - x64 - - - - {281F6001-D032-4C3B-87AF-0B00962B4006} - VideoUICommon - - - - StaticLibrary - true - Unicode - - - StaticLibrary - true - Unicode - - - StaticLibrary - false - Unicode - true - - - StaticLibrary - false - Unicode - - - StaticLibrary - false - Unicode - true - - - StaticLibrary - false - Unicode - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - $(PlatformName)\$(Configuration)\ - - - - - - - - - - - - - - ..\Common\Src;..\VideoCommon\Src;..\..\..\Externals\wxWidgets\Include;%(AdditionalIncludeDirectories) - - - true - - - - - ..\Common\Src;..\VideoCommon\Src;..\..\..\Externals\wxWidgets\Include;%(AdditionalIncludeDirectories) - - - true - - - - - ..\Common\Src;..\VideoCommon\Src;..\..\..\Externals\wxWidgets\Include;%(AdditionalIncludeDirectories) - - - true - true - true - - - - - ..\Common\Src;..\VideoCommon\Src;..\..\..\Externals\wxWidgets\Include;%(AdditionalIncludeDirectories) - - - true - true - true - - - - - ..\Common\Src;..\VideoCommon\Src;..\..\..\Externals\wxWidgets\Include;%(AdditionalIncludeDirectories) - - - true - true - true - - - - - ..\Common\Src;..\VideoCommon\Src;..\..\..\Externals\wxWidgets\Include;%(AdditionalIncludeDirectories) - - - true - true - true - - - - - - - - - - - - - - - - - {0e231fb1-f3c9-4724-accb-de8bcb3c089e} - true - true - false - false - false - - - {1c8436c9-dbaf-42be-83bc-cf3ec9175abe} - true - true - false - false - false - - - {11f55366-12ec-4c44-a8cb-1d4e315d61ed} - true - true - false - false - false - - - {c5a30052-1fc7-4a30-b4a2-6b06da298ab3} - - - {518f8625-9bfd-402f-aacb-01ce9a1ced8a} - - - - - - \ No newline at end of file diff --git a/Source/Dolphin_2010.sln b/Source/Dolphin_2010.sln index bf654882e0..e80867502c 100644 --- a/Source/Dolphin_2010.sln +++ b/Source/Dolphin_2010.sln @@ -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 diff --git a/Source/Plugins/Plugin_VideoDX11/Plugin_VideoDX11.vcxproj b/Source/Plugins/Plugin_VideoDX11/Plugin_VideoDX11.vcxproj index 656b28d866..a007ac66dd 100644 --- a/Source/Plugins/Plugin_VideoDX11/Plugin_VideoDX11.vcxproj +++ b/Source/Plugins/Plugin_VideoDX11/Plugin_VideoDX11.vcxproj @@ -118,7 +118,7 @@ - ..\..\Core\Common\Src;..\..\Core\Core\Src;..\..\Core\VideoCommon\Src;..\..\Core\VideoUICommon\Src;..\..\..\Externals\wxWidgets\include;%(AdditionalIncludeDirectories) + ..\..\Core\Common\Src;..\..\Core\Core\Src;..\..\Core\VideoCommon\Src;..\..\Core\DolphinWX\Src;..\..\..\Externals\wxWidgets\include;%(AdditionalIncludeDirectories) true @@ -128,7 +128,7 @@ - ..\..\Core\Common\Src;..\..\Core\Core\Src;..\..\Core\VideoCommon\Src;..\..\Core\VideoUICommon\Src;..\..\..\Externals\wxWidgets\include;%(AdditionalIncludeDirectories) + ..\..\Core\Common\Src;..\..\Core\Core\Src;..\..\Core\VideoCommon\Src;..\..\Core\DolphinWX\Src;..\..\..\Externals\wxWidgets\include;%(AdditionalIncludeDirectories) true @@ -138,7 +138,7 @@ - ..\..\Core\Common\Src;..\..\Core\Core\Src;..\..\Core\VideoCommon\Src;..\..\Core\VideoUICommon\Src;..\..\..\Externals\wxWidgets\include;%(AdditionalIncludeDirectories) + ..\..\Core\Common\Src;..\..\Core\Core\Src;..\..\Core\VideoCommon\Src;..\..\Core\DolphinWX\Src;..\..\..\Externals\wxWidgets\include;%(AdditionalIncludeDirectories) true @@ -162,7 +162,7 @@ - ..\..\Core\Common\Src;..\..\Core\Core\Src;..\..\Core\VideoCommon\Src;..\..\Core\VideoUICommon\Src;..\..\..\Externals\wxWidgets\include;%(AdditionalIncludeDirectories) + ..\..\Core\Common\Src;..\..\Core\Core\Src;..\..\Core\VideoCommon\Src;..\..\Core\DolphinWX\Src;..\..\..\Externals\wxWidgets\include;%(AdditionalIncludeDirectories) true @@ -188,9 +188,6 @@ {3e5c4e02-1ba9-4776-bdbe-e3f91ffa34cf} - - {281f6001-d032-4c3b-87af-0b00962b4006} - diff --git a/Source/Plugins/Plugin_VideoDX9/Plugin_VideoDX9.vcxproj b/Source/Plugins/Plugin_VideoDX9/Plugin_VideoDX9.vcxproj index 8866fcb095..d2eb4fa4f5 100644 --- a/Source/Plugins/Plugin_VideoDX9/Plugin_VideoDX9.vcxproj +++ b/Source/Plugins/Plugin_VideoDX9/Plugin_VideoDX9.vcxproj @@ -123,7 +123,7 @@ Disabled - ..\..\Core\Common\Src;..\..\Core\Core\Src;..\..\Core\VideoCommon\Src;..\..\Core\VideoUICommon\Src;..\..\..\Externals\wxWidgets\include;%(AdditionalIncludeDirectories) + ..\..\Core\Common\Src;..\..\Core\Core\Src;..\..\Core\VideoCommon\Src;..\..\Core\DolphinWX\Src;..\..\..\Externals\wxWidgets\include;%(AdditionalIncludeDirectories) _SECURE_SCL=0;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) MultiThreadedDebug stdafx.h @@ -136,7 +136,7 @@ - ..\..\Core\Common\Src;..\..\Core\Core\Src;..\..\Core\VideoCommon\Src;..\..\Core\VideoUICommon\Src;..\..\..\Externals\wxWidgets\include;%(AdditionalIncludeDirectories) + ..\..\Core\Common\Src;..\..\Core\Core\Src;..\..\Core\VideoCommon\Src;..\..\Core\DolphinWX\Src;..\..\..\Externals\wxWidgets\include;%(AdditionalIncludeDirectories) true @@ -145,7 +145,7 @@ - ..\..\Core\Common\Src;..\..\Core\Core\Src;..\..\Core\VideoCommon\Src;..\..\Core\VideoUICommon\Src;..\..\..\Externals\wxWidgets\include;%(AdditionalIncludeDirectories) + ..\..\Core\Common\Src;..\..\Core\Core\Src;..\..\Core\VideoCommon\Src;..\..\Core\DolphinWX\Src;..\..\..\Externals\wxWidgets\include;%(AdditionalIncludeDirectories) true @@ -167,7 +167,7 @@ - ..\..\Core\Common\Src;..\..\Core\Core\Src;..\..\Core\VideoCommon\Src;..\..\Core\VideoUICommon\Src;..\..\..\Externals\wxWidgets\include;%(AdditionalIncludeDirectories) + ..\..\Core\Common\Src;..\..\Core\Core\Src;..\..\Core\VideoCommon\Src;..\..\Core\DolphinWX\Src;..\..\..\Externals\wxWidgets\include;%(AdditionalIncludeDirectories) true @@ -191,9 +191,6 @@ {3e5c4e02-1ba9-4776-bdbe-e3f91ffa34cf} - - {281f6001-d032-4c3b-87af-0b00962b4006} - diff --git a/Source/Plugins/Plugin_VideoOGL/Plugin_VideoOGL.vcxproj b/Source/Plugins/Plugin_VideoOGL/Plugin_VideoOGL.vcxproj index 027124f48f..82b1290968 100644 --- a/Source/Plugins/Plugin_VideoOGL/Plugin_VideoOGL.vcxproj +++ b/Source/Plugins/Plugin_VideoOGL/Plugin_VideoOGL.vcxproj @@ -118,7 +118,7 @@ - ..\..\Core\Common\Src;..\..\Core\Core\Src;..\..\Core\VideoCommon\Src;..\..\Core\VideoUICommon\Src;..\..\..\Externals\wxWidgets\include;..\..\..\Externals\GLew\include;..\..\..\Externals + ..\..\Core\Common\Src;..\..\Core\Core\Src;..\..\Core\VideoCommon\Src;..\..\Core\DolphinWX\Src;..\..\..\Externals\wxWidgets\include;..\..\..\Externals\GLew\include;..\..\..\Externals true @@ -130,7 +130,7 @@ - ..\..\Core\Common\Src;..\..\Core\Core\Src;..\..\Core\VideoCommon\Src;..\..\Core\VideoUICommon\Src;..\..\..\Externals\wxWidgets\include;..\..\..\Externals\GLew\include;..\..\..\Externals + ..\..\Core\Common\Src;..\..\Core\Core\Src;..\..\Core\VideoCommon\Src;..\..\Core\DolphinWX\Src;..\..\..\Externals\wxWidgets\include;..\..\..\Externals\GLew\include;..\..\..\Externals true @@ -142,7 +142,7 @@ - ..\..\Core\Common\Src;..\..\Core\Core\Src;..\..\Core\VideoCommon\Src;..\..\Core\VideoUICommon\Src;..\..\..\Externals\wxWidgets\include;..\..\..\Externals\GLew\include;..\..\..\Externals + ..\..\Core\Common\Src;..\..\Core\Core\Src;..\..\Core\VideoCommon\Src;..\..\Core\DolphinWX\Src;..\..\..\Externals\wxWidgets\include;..\..\..\Externals\GLew\include;..\..\..\Externals true @@ -170,7 +170,7 @@ - ..\..\Core\Common\Src;..\..\Core\Core\Src;..\..\Core\VideoCommon\Src;..\..\Core\VideoUICommon\Src;..\..\..\Externals\wxWidgets\include;..\..\..\Externals\GLew\include;..\..\..\Externals + ..\..\Core\Common\Src;..\..\Core\Core\Src;..\..\Core\VideoCommon\Src;..\..\Core\DolphinWX\Src;..\..\..\Externals\wxWidgets\include;..\..\..\Externals\GLew\include;..\..\..\Externals true @@ -245,9 +245,6 @@ {3e5c4e02-1ba9-4776-bdbe-e3f91ffa34cf} - - {281f6001-d032-4c3b-87af-0b00962b4006} - diff --git a/Source/Plugins/Plugin_VideoSoftware/Plugin_VideoSoftware.vcxproj b/Source/Plugins/Plugin_VideoSoftware/Plugin_VideoSoftware.vcxproj index f08bef459d..729368b879 100644 --- a/Source/Plugins/Plugin_VideoSoftware/Plugin_VideoSoftware.vcxproj +++ b/Source/Plugins/Plugin_VideoSoftware/Plugin_VideoSoftware.vcxproj @@ -116,7 +116,7 @@ - ..\..\Core\Common\Src;..\..\Core\Core\Src;..\..\Core\VideoCommon\Src;..\..\Core\VideoUICommon\Src;..\..\..\Externals\GLew\include;..\..\..\Externals\wxWidgets\Include;..\..\..\Externals;%(AdditionalIncludeDirectories) + ..\..\Core\Common\Src;..\..\Core\Core\Src;..\..\Core\VideoCommon\Src;..\..\Core\DolphinWX\Src;..\..\..\Externals\GLew\include;..\..\..\Externals\wxWidgets\Include;..\..\..\Externals;%(AdditionalIncludeDirectories) true @@ -127,7 +127,7 @@ - ..\..\Core\Common\Src;..\..\Core\Core\Src;..\..\Core\VideoCommon\Src;..\..\Core\VideoUICommon\Src;..\..\..\Externals\GLew\include;..\..\..\Externals\wxWidgets\Include;..\..\..\Externals;%(AdditionalIncludeDirectories) + ..\..\Core\Common\Src;..\..\Core\Core\Src;..\..\Core\VideoCommon\Src;..\..\Core\DolphinWX\Src;..\..\..\Externals\GLew\include;..\..\..\Externals\wxWidgets\Include;..\..\..\Externals;%(AdditionalIncludeDirectories) true @@ -138,7 +138,7 @@ - ..\..\Core\Common\Src;..\..\Core\Core\Src;..\..\Core\VideoCommon\Src;..\..\Core\VideoUICommon\Src;..\..\..\Externals\GLew\include;..\..\..\Externals\wxWidgets\Include;..\..\..\Externals;%(AdditionalIncludeDirectories) + ..\..\Core\Common\Src;..\..\Core\Core\Src;..\..\Core\VideoCommon\Src;..\..\Core\DolphinWX\Src;..\..\..\Externals\GLew\include;..\..\..\Externals\wxWidgets\Include;..\..\..\Externals;%(AdditionalIncludeDirectories) true @@ -151,7 +151,7 @@ - ..\..\Core\Common\Src;..\..\Core\Core\Src;..\..\Core\VideoCommon\Src;..\..\Core\VideoUICommon\Src;..\..\..\Externals\GLew\include;..\..\..\Externals\wxWidgets\Include;..\..\..\Externals;%(AdditionalIncludeDirectories) + ..\..\Core\Common\Src;..\..\Core\Core\Src;..\..\Core\VideoCommon\Src;..\..\Core\DolphinWX\Src;..\..\..\Externals\GLew\include;..\..\..\Externals\wxWidgets\Include;..\..\..\Externals;%(AdditionalIncludeDirectories) true