Merge branch 'master' into d3d12

2018-11-23 19:08:43 +03:00
parent da280347c4 996093e499
commit ff363d85be
8 changed files with 107 additions and 27 deletions
--- a/src/xenia/app/xenia_main.cc
+++ b/src/xenia/app/xenia_main.cc
@@ -176,9 +176,9 @@ int xenia_main(const std::vector<std::wstring>& args) {
 #endif
      content_root = xe::join_paths(content_root, L"content");
    }
-
-    content_root = xe::to_absolute_path(content_root);
  }
+  content_root = xe::to_absolute_path(content_root);
+  XELOGI("Content root: %S", content_root.c_str());

  // Create the emulator but don't initialize so we can setup the window.
  auto emulator = std::make_unique<Emulator>(L"", content_root);