mirrors/dolphin
1
0
Fork 0
mirror of https://github.com/dolphin-emu/dolphin.git synced 2025-04-20 11:35:54 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

stable: Fix game-specific dual-core checkbox, include the fix for scons bundle

Browse source 
git-svn-id: https://dolphin-emu.googlecode.com/svn/branches/stable@5257 8ced0084-cf51-0410-be5f-012b33b47a6e
This commit is contained in:
j4ck.fr0st 2010-03-31 16:41:45 +00:00
parent 559bfa3112
commit 620c263582
2 changed files with 8 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
SConstruct
View file

@ -512,9 +512,15 @@ else:
env.Alias('install', env['prefix'])
if env['bundle']:
# get the rev anyways, RC != RC between commits
# copied from utils.py, could be solved better...
try:
rev = os.popen('svnversion .').read().strip().split(':')[0]
except:
rev = ""
# Make tar ball (TODO put inside normal dir)
tar_env = env.Clone()
tarball = tar_env.Tar('dolphin-'+rev +'.tar.bz2', env['prefix'])
tarball = tar_env.Tar('dolphin-2.0RC1-'+ rev +'.tar.bz2', env['prefix'])
tar_env.Append(TARFLAGS='-j',
TARCOMSTR="Creating release tarball")

2
Source/Core/DolphinWX/Src/BootManager.cpp
View file

@ -120,7 +120,7 @@ bool BootCore(const std::string& _rFilename)
if (unique_id.size() == 6 && game_ini.Load(StartUp.m_strGameIni.c_str()))
{
// General settings
game_ini.Get("Core", "CPUOnThread", &StartUp.bCPUThread, StartUp.bCPUThread);
game_ini.Get("Core", "CPUThread", &StartUp.bCPUThread, StartUp.bCPUThread);
game_ini.Get("Core", "SkipIdle", &StartUp.bSkipIdle, StartUp.bSkipIdle);
game_ini.Get("Core", "EnableFPRF", &StartUp.bEnableFPRF, StartUp.bEnableFPRF);
game_ini.Get("Core", "TLBHack", &StartUp.iTLBHack, StartUp.iTLBHack);