Merge branch 'master' into d3d12

2019-05-04 13:09:08 -05:00
parent fac37e7c50 00e061c4e4
commit f54dddee90
13 changed files with 480 additions and 190 deletions
--- a/src/xenia/app/xenia_main.cc
+++ b/src/xenia/app/xenia_main.cc
@@ -169,7 +169,7 @@ int xenia_main(const std::vector<std::wstring>& args) {
 #if defined(XE_PLATFORM_WIN32)
      content_root = xe::join_paths(content_root, L"Xenia");
 #elif defined(XE_PLATFORM_LINUX)
-      content_root = xe::join_paths(content_root, L".xenia");
+      content_root = xe::join_paths(content_root, L"Xenia");
 #else
 #warning Unhandled platform for content root.
      content_root = xe::join_paths(content_root, L"Xenia");