small fixes
git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@1369 8ced0084-cf51-0410-be5f-012b33b47a6e
This commit is contained in:
parent
159d33a251
commit
751124bb68
|
@ -168,9 +168,7 @@ bool CreateDirectoryStructure(const std::string& _rFullPath)
|
|||
{
|
||||
// Find next sub path, support both \ and / directory separators
|
||||
{
|
||||
size_t nextPosition = _rFullPath.find('/', Position);
|
||||
if (nextPosition == std::string::npos)
|
||||
nextPosition = _rFullPath.find('\\', Position);
|
||||
size_t nextPosition = _rFullPath.find(DIR_SEP_CHR, Position);
|
||||
Position = nextPosition;
|
||||
|
||||
if (Position == std::string::npos)
|
||||
|
|
|
@ -5,10 +5,12 @@
|
|||
#define PLUGIN_PREFIX ""
|
||||
#define PLUGIN_SUFFIX ".dll"
|
||||
#define DIR_SEP "\\"
|
||||
#define DIR_SEP_CHR '\\'
|
||||
#else
|
||||
#define PLUGIN_PREFIX "lib"
|
||||
#define PLUGIN_SUFFIX ".so"
|
||||
#define DIR_SEP "/"
|
||||
#define DIR_SEP_CHR '/'
|
||||
#endif
|
||||
|
||||
#define PLUGINS_DIR "Plugins"
|
||||
|
|
|
@ -234,13 +234,13 @@ bool AckCommand(u32 _Address)
|
|||
// Let the game read the setting.txt file
|
||||
void CopySettingsFile(std::string DeviceName)
|
||||
{
|
||||
std::string Source;
|
||||
std::string Source = FULL_WII_SYS_DIR;
|
||||
if(Core::GetStartupParameter().bNTSC)
|
||||
Source = "Sys/Wii/setting-usa.txt";
|
||||
Source += "setting-usa.txt";
|
||||
else
|
||||
Source = "Sys/Wii/setting-eur.txt";
|
||||
Source += "setting-eur.txt";
|
||||
|
||||
std::string Target = "User/Wii" + DeviceName;
|
||||
std::string Target = FULL_WII_USER_DIR + DeviceName;
|
||||
|
||||
// Check if the target dir exists, otherwise create it
|
||||
std::string TargetDir = Target.substr(0, Target.find_last_of("/"));
|
||||
|
|
Loading…
Reference in New Issue