From 620c2635825f77e441755b79128087785318165b Mon Sep 17 00:00:00 2001 From: "j4ck.fr0st" Date: Wed, 31 Mar 2010 16:41:45 +0000 Subject: [PATCH] stable: Fix game-specific dual-core checkbox, include the fix for scons bundle git-svn-id: https://dolphin-emu.googlecode.com/svn/branches/stable@5257 8ced0084-cf51-0410-be5f-012b33b47a6e --- SConstruct | 8 +++++++- Source/Core/DolphinWX/Src/BootManager.cpp | 2 +- 2 files changed, 8 insertions(+), 2 deletions(-) diff --git a/SConstruct b/SConstruct index 844b0151b1..5509b07366 100644 --- a/SConstruct +++ b/SConstruct @@ -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") diff --git a/Source/Core/DolphinWX/Src/BootManager.cpp b/Source/Core/DolphinWX/Src/BootManager.cpp index a3ae334358..b6d93527ad 100644 --- a/Source/Core/DolphinWX/Src/BootManager.cpp +++ b/Source/Core/DolphinWX/Src/BootManager.cpp @@ -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);