fabi/Xenia-Canary
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Removing dependencies on MainWindow.

Browse Source
This commit is contained in:
Ben Vanik
2015-07-01 08:02:22 -07:00
parent 4732378ba9
commit 9efccc5f4a
17 changed files with 123 additions and 98 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/xenia/emulator.h
View File

@@ -15,7 +15,7 @@
#include "xenia/debug/debugger.h"
#include "xenia/kernel/kernel_state.h"
#include "xenia/memory.h"
#include "xenia/ui/main_window.h"
#include "xenia/ui/platform.h"
#include "xenia/vfs/virtual_file_system.h"
#include "xenia/xbox.h"
@@ -49,7 +49,7 @@ class Emulator {
const std::wstring& command_line() const { return command_line_; }
ui::MainWindow* main_window() const { return main_window_.get(); }
ui::PlatformWindow* display_window() const { return display_window_.get(); }
Memory* memory() const { return memory_.get(); }
@@ -83,7 +83,7 @@ class Emulator {
std::wstring command_line_;
std::unique_ptr<ui::MainWindow> main_window_;
std::unique_ptr<ui::PlatformWindow> display_window_;
std::unique_ptr<Memory> memory_;