Mercurial > hg > easyhg
comparison hgrunner.cpp @ 321:dff8ec43c86d
* We should have a 64-bit Python module now: no longer force to 32
author | Chris Cannam |
---|---|
date | Wed, 02 Mar 2011 16:28:03 +0000 |
parents | 0dbfea0099ca |
children | bb189827f6d1 |
comparison
equal
deleted
inserted
replaced
320:67feb05754ee | 321:dff8ec43c86d |
---|---|
421 env.insert("PATH", m_myDirPath + ";" + env.value("PATH")); | 421 env.insert("PATH", m_myDirPath + ";" + env.value("PATH")); |
422 } | 422 } |
423 #endif | 423 #endif |
424 | 424 |
425 #ifdef Q_OS_MAC | 425 #ifdef Q_OS_MAC |
426 // On OS/X 10.6, Python is 64-bit by default but our Hg extension | 426 if (settings.value("python32", false).toBool()) { |
427 // is only available in 32-bit | |
428 if (settings.value("python32", true).toBool()) { | |
429 env.insert("VERSIONER_PYTHON_PREFER_32_BIT", "1"); | 427 env.insert("VERSIONER_PYTHON_PREFER_32_BIT", "1"); |
430 } | 428 } |
431 #endif | 429 #endif |
432 | 430 |
433 env.insert("LANG", "en_US.utf8"); | 431 env.insert("LANG", "en_US.utf8"); |