summaryrefslogtreecommitdiffstats
path: root/src/citra
diff options
context:
space:
mode:
Diffstat (limited to '')
-rw-r--r--src/citra/citra.cpp18
-rw-r--r--src/citra/citra.vcxproj15
-rw-r--r--src/citra/citra.vcxproj.filters25
-rw-r--r--src/citra/emu_window/emu_window_glfw.cpp6
-rw-r--r--src/citra/emu_window/emu_window_glfw.h2
-rw-r--r--src/citra_qt/citra_qt.vcxproj72
-rw-r--r--src/citra_qt/citra_qt.vcxproj.filters112
7 files changed, 138 insertions, 112 deletions
diff --git a/src/citra/citra.cpp b/src/citra/citra.cpp
index 746cf083d..37ea97403 100644
--- a/src/citra/citra.cpp
+++ b/src/citra/citra.cpp
@@ -22,17 +22,17 @@
* http://code.google.com/p/gekko-gc-emu/
*/
-#include "common.h"
-#include "log_manager.h"
-#include "file_util.h"
+#include "common/common.h"
+#include "common/log_manager.h"
+#include "common/file_util.h"
-#include "system.h"
-#include "core.h"
-#include "loader.h"
+#include "core/system.h"
+#include "core/core.h"
+#include "core/loader.h"
-#include "emu_window/emu_window_glfw.h"
+#include "citra/emu_window/emu_window_glfw.h"
-#include "citra.h"
+#include "citra/citra.h"
#define E_ERR -1
@@ -52,7 +52,7 @@ int __cdecl main(int argc, char **argv) {
System::Init(emu_window);
- std::string boot_filename = "homebrew.elf";
+ std::string boot_filename = "C:\\Users\\eric\\Desktop\\3ds\\homebrew\\Mandelbrot3DS.elf";
std::string error_str;
bool res = Loader::LoadFile(boot_filename, &error_str);
diff --git a/src/citra/citra.vcxproj b/src/citra/citra.vcxproj
index 16157ad04..4ea222fcd 100644
--- a/src/citra/citra.vcxproj
+++ b/src/citra/citra.vcxproj
@@ -199,20 +199,17 @@
</ProjectReference>
</ItemGroup>
<ItemGroup>
- <ClCompile Include="src\citra.cpp" />
- <ClCompile Include="src\emu_window\emu_window_glfw.cpp" />
+ <ClCompile Include="citra.cpp" />
+ <ClCompile Include="emu_window\emu_window_glfw.cpp" />
</ItemGroup>
<ItemGroup>
+ <ClInclude Include="citra.h" />
+ <ClInclude Include="emu_window\emu_window_glfw.h" />
<ClInclude Include="resource.h" />
- <ClInclude Include="src\citra.h" />
- <ClInclude Include="src\emu_window\emu_window_glfw.h" />
- <ClInclude Include="src\version.h" />
+ <ClInclude Include="version.h" />
</ItemGroup>
<ItemGroup>
- <ResourceCompile Include="citra.rc" />
- </ItemGroup>
- <ItemGroup>
- <None Include="CMakeLists.txt" />
+ <Text Include="CMakeLists.txt" />
</ItemGroup>
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
<ImportGroup Label="ExtensionTargets">
diff --git a/src/citra/citra.vcxproj.filters b/src/citra/citra.vcxproj.filters
index f0b6906de..b41cdf146 100644
--- a/src/citra/citra.vcxproj.filters
+++ b/src/citra/citra.vcxproj.filters
@@ -1,28 +1,25 @@
<?xml version="1.0" encoding="utf-8"?>
<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<ItemGroup>
- <ClCompile Include="src\citra.cpp" />
- <ClCompile Include="src\emu_window\emu_window_glfw.cpp">
+ <Filter Include="emu_window">
+ <UniqueIdentifier>{e3161526-9f53-4670-8dae-2be81ff01bc2}</UniqueIdentifier>
+ </Filter>
+ </ItemGroup>
+ <ItemGroup>
+ <ClCompile Include="citra.cpp" />
+ <ClCompile Include="emu_window\emu_window_glfw.cpp">
<Filter>emu_window</Filter>
</ClCompile>
</ItemGroup>
<ItemGroup>
+ <ClInclude Include="citra.h" />
<ClInclude Include="resource.h" />
- <ClInclude Include="src\version.h" />
- <ClInclude Include="src\citra.h" />
- <ClInclude Include="src\emu_window\emu_window_glfw.h">
+ <ClInclude Include="version.h" />
+ <ClInclude Include="emu_window\emu_window_glfw.h">
<Filter>emu_window</Filter>
</ClInclude>
</ItemGroup>
<ItemGroup>
- <ResourceCompile Include="citra.rc" />
- </ItemGroup>
- <ItemGroup>
- <Filter Include="emu_window">
- <UniqueIdentifier>{e3161526-9f53-4670-8dae-2be81ff01bc2}</UniqueIdentifier>
- </Filter>
- </ItemGroup>
- <ItemGroup>
- <None Include="CMakeLists.txt" />
+ <Text Include="CMakeLists.txt" />
</ItemGroup>
</Project> \ No newline at end of file
diff --git a/src/citra/emu_window/emu_window_glfw.cpp b/src/citra/emu_window/emu_window_glfw.cpp
index 4cdb7fbb0..0192d8598 100644
--- a/src/citra/emu_window/emu_window_glfw.cpp
+++ b/src/citra/emu_window/emu_window_glfw.cpp
@@ -22,9 +22,9 @@
* http://code.google.com/p/gekko-gc-emu/
*/
-#include "common.h"
-#include "video_core.h"
-#include "emu_window_glfw.h"
+#include "common/common.h"
+#include "video_core/video_core.h"
+#include "citra/emu_window/emu_window_glfw.h"
static void OnKeyEvent(GLFWwindow* win, int key, int action) {
// EmuWindow_GLFW* emuwin = (EmuWindow_GLFW*)glfwGetWindowUserPointer(win);
diff --git a/src/citra/emu_window/emu_window_glfw.h b/src/citra/emu_window/emu_window_glfw.h
index abca9faa8..c3feb6e51 100644
--- a/src/citra/emu_window/emu_window_glfw.h
+++ b/src/citra/emu_window/emu_window_glfw.h
@@ -27,7 +27,7 @@
#include <GL/glew.h>
#include <GLFW/glfw3.h>
-#include "emu_window.h"
+#include "common/emu_window.h"
class EmuWindow_GLFW : public EmuWindow {
public:
diff --git a/src/citra_qt/citra_qt.vcxproj b/src/citra_qt/citra_qt.vcxproj
index 9164b280b..da8740bec 100644
--- a/src/citra_qt/citra_qt.vcxproj
+++ b/src/citra_qt/citra_qt.vcxproj
@@ -127,43 +127,21 @@
<ClCompile Include="..\..\externals\qhexedit\qhexedit.cpp" />
<ClCompile Include="..\..\externals\qhexedit\qhexedit_p.cpp" />
<ClCompile Include="..\..\externals\qhexedit\xbytearray.cpp" />
- <ClCompile Include="src\bootmanager.cpp" />
- <ClCompile Include="src\callstack.cpp" />
- <ClCompile Include="src\config\controller_config.cpp" />
- <ClCompile Include="src\config\controller_config_util.cpp" />
- <ClCompile Include="src\disasm.cpp" />
- <ClCompile Include="src\cpu_regs.cpp" />
- <ClCompile Include="src\hotkeys.cpp" />
- <ClCompile Include="src\main.cpp" />
- <ClCompile Include="src\ramview.cpp" />
- </ItemGroup>
- <ItemGroup>
- <MOC Include="src\bootmanager.hxx" />
- <MOC Include="src\callstack.hxx" />
- <MOC Include="src\config\controller_config.hxx" />
- <MOC Include="src\config\controller_config_util.hxx" />
- <MOC Include="src\disasm.hxx" />
- <MOC Include="src\cpu_regs.hxx" />
- <MOC Include="src\hotkeys.hxx" />
- <MOC Include="src\main.hxx" />
- <MOC Include="src\ramview.hxx" />
- </ItemGroup>
- <ItemGroup>
- <UIC Include="src\callstack.ui" />
- <UIC Include="src\config\controller_config.ui">
- <QtUicPrefix>src/config/ui_</QtUicPrefix>
- </UIC>
- <UIC Include="src\disasm.ui" />
- <UIC Include="src\cpu_regs.ui" />
- <UIC Include="src\hotkeys.ui" />
- <UIC Include="src\main.ui" />
+ <ClCompile Include="bootmanager.cpp" />
+ <ClCompile Include="callstack.cpp" />
+ <ClCompile Include="config\controller_config.cpp" />
+ <ClCompile Include="config\controller_config_util.cpp" />
+ <ClCompile Include="cpu_regs.cpp" />
+ <ClCompile Include="disasm.cpp" />
+ <ClCompile Include="hotkeys.cpp" />
+ <ClCompile Include="main.cpp" />
+ <ClCompile Include="ramview.cpp" />
</ItemGroup>
<ItemGroup>
<MOC Include="..\..\externals\qhexedit\commands.h" />
<MOC Include="..\..\externals\qhexedit\qhexedit.h" />
<MOC Include="..\..\externals\qhexedit\qhexedit_p.h" />
<MOC Include="..\..\externals\qhexedit\xbytearray.h" />
- <ClInclude Include="src\version.h" />
</ItemGroup>
<ItemGroup>
<ProjectReference Include="..\common\common.vcxproj">
@@ -173,6 +151,38 @@
<Project>{8aea7f29-3466-4786-a10d-6a4bd0610977}</Project>
</ProjectReference>
</ItemGroup>
+ <ItemGroup>
+ <ClInclude Include="bootmanager.hxx" />
+ <ClInclude Include="callstack.hxx" />
+ <ClInclude Include="config\controller_config.hxx" />
+ <ClInclude Include="config\controller_config_util.hxx" />
+ <ClInclude Include="config\ui_controller_config.h" />
+ <ClInclude Include="cpu_regs.hxx" />
+ <ClInclude Include="disasm.hxx" />
+ <ClInclude Include="hotkeys.hxx" />
+ <ClInclude Include="main.hxx" />
+ <ClInclude Include="ramview.hxx" />
+ <ClInclude Include="ui_callstack.h" />
+ <ClInclude Include="ui_cpu_regs.h" />
+ <ClInclude Include="ui_disasm.h" />
+ <ClInclude Include="ui_gfx_fifo_player.h" />
+ <ClInclude Include="ui_hotkeys.h" />
+ <ClInclude Include="ui_image_info.h" />
+ <ClInclude Include="ui_main.h" />
+ <ClInclude Include="ui_welcome_wizard.h" />
+ <ClInclude Include="version.h" />
+ </ItemGroup>
+ <ItemGroup>
+ <UIC Include="callstack.ui" />
+ <UIC Include="config\controller_config.ui" />
+ <UIC Include="cpu_regs.ui" />
+ <UIC Include="disasm.ui" />
+ <UIC Include="hotkeys.ui" />
+ <UIC Include="main.ui" />
+ </ItemGroup>
+ <ItemGroup>
+ <Text Include="CMakeLists.txt" />
+ </ItemGroup>
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
<ImportGroup Label="ExtensionTargets">
<Import Project="qt-build.targets" />
diff --git a/src/citra_qt/citra_qt.vcxproj.filters b/src/citra_qt/citra_qt.vcxproj.filters
index 3900cc8e0..5bc29c1d7 100644
--- a/src/citra_qt/citra_qt.vcxproj.filters
+++ b/src/citra_qt/citra_qt.vcxproj.filters
@@ -12,20 +12,6 @@
</Filter>
</ItemGroup>
<ItemGroup>
- <ClCompile Include="src\main.cpp" />
- <ClCompile Include="src\disasm.cpp">
- <Filter>debugger</Filter>
- </ClCompile>
- <ClCompile Include="src\cpu_regs.cpp">
- <Filter>debugger</Filter>
- </ClCompile>
- <ClCompile Include="src\bootmanager.cpp" />
- <ClCompile Include="src\callstack.cpp">
- <Filter>debugger</Filter>
- </ClCompile>
- <ClCompile Include="src\ramview.cpp">
- <Filter>debugger</Filter>
- </ClCompile>
<ClCompile Include="..\..\externals\qhexedit\commands.cpp">
<Filter>qhexedit</Filter>
</ClCompile>
@@ -38,22 +24,29 @@
<ClCompile Include="..\..\externals\qhexedit\xbytearray.cpp">
<Filter>qhexedit</Filter>
</ClCompile>
- <ClCompile Include="src\hotkeys.cpp" />
- <ClCompile Include="src\config\controller_config.cpp">
+ <ClCompile Include="bootmanager.cpp" />
+ <ClCompile Include="hotkeys.cpp" />
+ <ClCompile Include="main.cpp" />
+ <ClCompile Include="config\controller_config.cpp">
<Filter>config</Filter>
</ClCompile>
- <ClCompile Include="src\config\controller_config_util.cpp">
+ <ClCompile Include="config\controller_config_util.cpp">
<Filter>config</Filter>
</ClCompile>
- </ItemGroup>
- <ItemGroup>
- <MOC Include="src\main.hxx" />
- <MOC Include="src\cpu_regs.hxx">
+ <ClCompile Include="cpu_regs.cpp">
<Filter>debugger</Filter>
- </MOC>
- <MOC Include="src\callstack.hxx">
+ </ClCompile>
+ <ClCompile Include="disasm.cpp">
<Filter>debugger</Filter>
- </MOC>
+ </ClCompile>
+ <ClCompile Include="ramview.cpp">
+ <Filter>debugger</Filter>
+ </ClCompile>
+ <ClCompile Include="callstack.cpp">
+ <Filter>debugger</Filter>
+ </ClCompile>
+ </ItemGroup>
+ <ItemGroup>
<MOC Include="..\..\externals\qhexedit\commands.h">
<Filter>qhexedit</Filter>
</MOC>
@@ -66,38 +59,67 @@
<MOC Include="..\..\externals\qhexedit\qhexedit.h">
<Filter>qhexedit</Filter>
</MOC>
- <MOC Include="src\ramview.hxx">
- <Filter>debugger</Filter>
- </MOC>
- <MOC Include="src\disasm.hxx">
- <Filter>debugger</Filter>
- </MOC>
- <MOC Include="src\bootmanager.hxx" />
- <MOC Include="src\hotkeys.hxx" />
- <MOC Include="src\config\controller_config.hxx">
+ </ItemGroup>
+ <ItemGroup>
+ <ClInclude Include="bootmanager.hxx" />
+ <ClInclude Include="hotkeys.hxx" />
+ <ClInclude Include="main.hxx" />
+ <ClInclude Include="ui_hotkeys.h" />
+ <ClInclude Include="ui_image_info.h" />
+ <ClInclude Include="ui_main.h" />
+ <ClInclude Include="ui_welcome_wizard.h" />
+ <ClInclude Include="version.h" />
+ <ClInclude Include="config\controller_config.hxx">
<Filter>config</Filter>
- </MOC>
- <MOC Include="src\config\controller_config_util.hxx">
+ </ClInclude>
+ <ClInclude Include="config\controller_config_util.hxx">
<Filter>config</Filter>
- </MOC>
+ </ClInclude>
+ <ClInclude Include="config\ui_controller_config.h">
+ <Filter>config</Filter>
+ </ClInclude>
+ <ClInclude Include="cpu_regs.hxx">
+ <Filter>debugger</Filter>
+ </ClInclude>
+ <ClInclude Include="disasm.hxx">
+ <Filter>debugger</Filter>
+ </ClInclude>
+ <ClInclude Include="ramview.hxx">
+ <Filter>debugger</Filter>
+ </ClInclude>
+ <ClInclude Include="ui_callstack.h">
+ <Filter>debugger</Filter>
+ </ClInclude>
+ <ClInclude Include="ui_cpu_regs.h">
+ <Filter>debugger</Filter>
+ </ClInclude>
+ <ClInclude Include="ui_disasm.h">
+ <Filter>debugger</Filter>
+ </ClInclude>
+ <ClInclude Include="ui_gfx_fifo_player.h">
+ <Filter>debugger</Filter>
+ </ClInclude>
+ <ClInclude Include="callstack.hxx">
+ <Filter>debugger</Filter>
+ </ClInclude>
</ItemGroup>
<ItemGroup>
- <UIC Include="src\main.ui" />
- <UIC Include="src\cpu_regs.ui">
- <Filter>debugger</Filter>
+ <UIC Include="hotkeys.ui" />
+ <UIC Include="main.ui" />
+ <UIC Include="config\controller_config.ui">
+ <Filter>config</Filter>
</UIC>
- <UIC Include="src\disasm.ui">
+ <UIC Include="callstack.ui">
<Filter>debugger</Filter>
</UIC>
- <UIC Include="src\callstack.ui">
+ <UIC Include="cpu_regs.ui">
<Filter>debugger</Filter>
</UIC>
- <UIC Include="src\hotkeys.ui" />
- <UIC Include="src\config\controller_config.ui">
- <Filter>config</Filter>
+ <UIC Include="disasm.ui">
+ <Filter>debugger</Filter>
</UIC>
</ItemGroup>
<ItemGroup>
- <ClInclude Include="src\version.h" />
+ <Text Include="CMakeLists.txt" />
</ItemGroup>
</Project> \ No newline at end of file
generated by cgit v1.2.3 (git 2.25.1) at 2024-07-17 11:11:50 +0200