Browse Source
Merge pull request #282 from N00byKing/patch-2
Change comments from citra to yuzu
pull/15/merge
bunnei
8 years ago
committed by
GitHub
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with
4 additions and
4 deletions
-
hooks/pre-commit
-
src/common/file_util.h
-
src/common/logging/log.h
-
src/common/x64/cpu_detect.cpp
|
|
|
@ -1,6 +1,6 @@ |
|
|
|
#!/bin/sh |
|
|
|
|
|
|
|
# Enforce citra's whitespace policy |
|
|
|
# Enforce yuzu's whitespace policy |
|
|
|
git config --local core.whitespace tab-in-indent,trailing-space |
|
|
|
|
|
|
|
paths_to_check="src/ CMakeLists.txt" |
|
|
|
|
|
|
|
@ -121,7 +121,7 @@ void CopyDir(const std::string& source_path, const std::string& dest_path); |
|
|
|
// Set the current directory to given directory |
|
|
|
bool SetCurrentDir(const std::string& directory); |
|
|
|
|
|
|
|
// Returns a pointer to a string with a Citra data dir in the user's home |
|
|
|
// Returns a pointer to a string with a yuzu data dir in the user's home |
|
|
|
// directory. To be used in "multi-user" mode (that is, installed). |
|
|
|
const std::string& GetUserPath(const unsigned int DirIDX, const std::string& newPath = ""); |
|
|
|
|
|
|
|
|
|
|
|
@ -85,7 +85,7 @@ enum class Class : ClassType { |
|
|
|
Loader, ///< ROM loader |
|
|
|
Input, ///< Input emulation |
|
|
|
Network, ///< Network emulation |
|
|
|
WebService, ///< Interface to Citra Web Services |
|
|
|
WebService, ///< Interface to yuzu Web Services |
|
|
|
Count ///< Total number of logging classes |
|
|
|
}; |
|
|
|
|
|
|
|
|
|
|
|
@ -54,7 +54,7 @@ static CPUCaps Detect() { |
|
|
|
caps.num_cores = std::thread::hardware_concurrency(); |
|
|
|
|
|
|
|
// Assumes the CPU supports the CPUID instruction. Those that don't would likely not support
|
|
|
|
// Citra at all anyway
|
|
|
|
// yuzu at all anyway
|
|
|
|
|
|
|
|
int cpu_id[4]; |
|
|
|
memset(caps.brand_string, 0, sizeof(caps.brand_string)); |
|
|
|
|