ShuriZma
/
xenia-canary
mirror of https://github.com/xenia-canary/xenia-canary.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #105 from Bo98/canary_burnout5_pr2 

xb & build improvements, store recent.toml in storage root
This commit is contained in:
Radosław Gliński 2022-12-18 11:07:16 +01:00 committed by GitHub
parent da2710f18c 24e7e5429a
commit f55defc1ab
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 8 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
src/xenia/app/emulator_window.cc
View File

@ -1137,7 +1137,7 @@ void EmulatorWindow::FillRecentlyLaunchedTitlesMenu(
} }
void EmulatorWindow::ReadRecentlyLaunchedTitles() { void EmulatorWindow::ReadRecentlyLaunchedTitles() {
std::ifstream file("recent.toml"); std::ifstream file(emulator()->storage_root() / "recent.toml");
if (!file.is_open()) { if (!file.is_open()) {
return; return;
} }
@ -1198,7 +1198,8 @@ void EmulatorWindow::AddRecentlyLaunchedTitle(
toml_table->end(); toml_table->end();
// Open and write serialized data. // Open and write serialized data.
std::ofstream file("recent.toml", std::ofstream::trunc); std::ofstream file(emulator()->storage_root() / "recent.toml",
std::ofstream::trunc);
file << *toml_table; file << *toml_table;
file.close(); file.close();
} }

3
xb.bat
View File

@ -40,7 +40,8 @@ SET "CANDIDATE_PATHS[1]=C:\python39\python.exe"
SET "CANDIDATE_PATHS[2]=C:\python38\python.exe" SET "CANDIDATE_PATHS[2]=C:\python38\python.exe"
SET "CANDIDATE_PATHS[3]=C:\python37\python.exe" SET "CANDIDATE_PATHS[3]=C:\python37\python.exe"
SET "CANDIDATE_PATHS[4]=C:\python%PYTHON_MINIMUM_VERSION[0]%%PYTHON_MINIMUM_VERSION[1]%\python.exe" SET "CANDIDATE_PATHS[4]=C:\python%PYTHON_MINIMUM_VERSION[0]%%PYTHON_MINIMUM_VERSION[1]%\python.exe"
SET OUTPUT_INDEX=5 SET "CANDIDATE_PATHS[5]=C:\Windows\py.exe"
SET OUTPUT_INDEX=6
FOR /F "usebackq delims=" %%L IN (`2^>NUL where python3`) DO ( FOR /F "usebackq delims=" %%L IN (`2^>NUL where python3`) DO (
IF %%~zL NEQ 0 ( IF %%~zL NEQ 0 (

3
xenia-build
View File

@ -47,6 +47,7 @@ def import_subprocess_environment(args):
'systemroot', 'systemroot',
'temp', 'temp',
'tmp', 'tmp',
'vcinstalldir',
'windowssdkdir', 'windowssdkdir',
) )
for line in variables.splitlines(): for line in variables.splitlines():
@ -436,6 +437,8 @@ def get_clang_format_binary():
'clang-format-13', 'clang-format-13',
'clang-format', 'clang-format',
] ]
if 'VCINSTALLDIR' in os.environ:
attempts.append(os.path.join(os.environ['VCINSTALLDIR'], 'Tools', 'Llvm', 'bin', 'clang-format.exe'))
for binary in attempts: for binary in attempts:
if has_bin(binary): if has_bin(binary):
return binary return binary