mirror of
https://github.com/yuzu-emu/yuzu.git
synced 2024-08-21 14:43:23 +02:00
Merge pull request #282 from N00byKing/patch-2
Change comments from citra to yuzu
This commit is contained in:
commit
1a28f4fa8c
@ -1,6 +1,6 @@
|
|||||||
#!/bin/sh
|
#!/bin/sh
|
||||||
|
|
||||||
# Enforce citra's whitespace policy
|
# Enforce yuzu's whitespace policy
|
||||||
git config --local core.whitespace tab-in-indent,trailing-space
|
git config --local core.whitespace tab-in-indent,trailing-space
|
||||||
|
|
||||||
paths_to_check="src/ CMakeLists.txt"
|
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
|
// Set the current directory to given directory
|
||||||
bool SetCurrentDir(const std::string& 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).
|
// directory. To be used in "multi-user" mode (that is, installed).
|
||||||
const std::string& GetUserPath(const unsigned int DirIDX, const std::string& newPath = "");
|
const std::string& GetUserPath(const unsigned int DirIDX, const std::string& newPath = "");
|
||||||
|
|
||||||
|
@ -85,7 +85,7 @@ enum class Class : ClassType {
|
|||||||
Loader, ///< ROM loader
|
Loader, ///< ROM loader
|
||||||
Input, ///< Input emulation
|
Input, ///< Input emulation
|
||||||
Network, ///< Network emulation
|
Network, ///< Network emulation
|
||||||
WebService, ///< Interface to Citra Web Services
|
WebService, ///< Interface to yuzu Web Services
|
||||||
Count ///< Total number of logging classes
|
Count ///< Total number of logging classes
|
||||||
};
|
};
|
||||||
|
|
||||||
|
@ -54,7 +54,7 @@ static CPUCaps Detect() {
|
|||||||
caps.num_cores = std::thread::hardware_concurrency();
|
caps.num_cores = std::thread::hardware_concurrency();
|
||||||
|
|
||||||
// Assumes the CPU supports the CPUID instruction. Those that don't would likely not support
|
// 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];
|
int cpu_id[4];
|
||||||
memset(caps.brand_string, 0, sizeof(caps.brand_string));
|
memset(caps.brand_string, 0, sizeof(caps.brand_string));
|
||||||
|
Loading…
Reference in New Issue
Block a user