diff options
| author | Nathan Letwory <nathan@letworyinteractive.com> | 2009-06-12 19:37:23 +0400 |
|---|---|---|
| committer | Nathan Letwory <nathan@letworyinteractive.com> | 2009-06-12 19:37:23 +0400 |
| commit | dee188df166ed4f5eb5c4bb72793afd5e81142a4 (patch) | |
| tree | 9484b73ee815d720cbf3b6da53a43247ba16c3c1 /release | |
| parent | 1c2ce9535caa7ef0ed70aea5bd25c0f281322cf6 (diff) | |
=== SCons ===
* make the nsis installer script automatically use the Python version we build against
* bump Python version used
Diffstat (limited to 'release')
| -rw-r--r-- | release/windows/installer/00.sconsblender.nsi | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/release/windows/installer/00.sconsblender.nsi b/release/windows/installer/00.sconsblender.nsi index 1cb159050fe..3f7b47aca40 100644 --- a/release/windows/installer/00.sconsblender.nsi +++ b/release/windows/installer/00.sconsblender.nsi @@ -212,7 +212,7 @@ Function DownloadDLL FunctionEnd Function PythonInstall - MessageBox MB_OK "You will need to install python 2.5.2 in order to run blender. Pressing OK will take you to the python.org website." + MessageBox MB_OK "You will need to install python [PYTHON_VERSION] in order to run blender. Pressing OK will take you to the python.org website." StrCpy $0 "http://www.python.org" Call openLinkNewWindow FunctionEnd @@ -346,7 +346,7 @@ Section "Blender-VERSION (required)" SecCopyUI ${Locate} "$1" "/L=F /M=MSVCR90.DLL /S=0B" "LocateCallback_90" StrCmp $DLL_found "false" 0 +2 Call DownloadDLL - ReadRegStr $0 HKLM SOFTWARE\Python\PythonCore\2.5\InstallPath "" + ReadRegStr $0 HKLM SOFTWARE\Python\PythonCore\[PYTHON_VERSION]\InstallPath "" StrCmp $0 "" 0 +2 Call PythonInstall silentdone: |