Merge branch 'linuxfix' of https://github.com/sephiroth99/xenia into sephiroth99-linuxfix

2015-12-31 14:39:23 -08:00
parent 51271dae08 f5d4941716
commit a95be25e2f
16 changed files with 124 additions and 64 deletions
--- a/src/xenia/base/profiling.cc
+++ b/src/xenia/base/profiling.cc
@@ -261,7 +261,9 @@ void Profiler::OnMouseDown(bool left_button, bool right_button) {}
 void Profiler::OnMouseUp() {}
 void Profiler::OnMouseMove(int x, int y) {}
 void Profiler::OnMouseWheel(int x, int y, int dy) {}
-void Profiler::set_display(std::unique_ptr<ui::MicroprofilerDrawer> display) {}
+void Profiler::ToggleDisplay() {}
+void Profiler::TogglePause() {}
+void Profiler::set_window(ui::Window* window) {}
 void Profiler::Present() {}

 #endif  // XE_OPTION_PROFILING