diff options
| author | Campbell Barton <ideasman42@gmail.com> | 2011-10-06 06:29:15 +0400 |
|---|---|---|
| committer | Campbell Barton <ideasman42@gmail.com> | 2011-10-06 06:29:15 +0400 |
| commit | ce1ac3412ddf15d4da194df976e99021bbcedc18 (patch) | |
| tree | 6d01df263de1bafed5dea3b0691b4b45e8a1de1a /intern/ghost/SConscript | |
| parent | e1ce98f8ae3dff12608ffd78bc27fc8d9d3a0845 (diff) | |
dont define the ghost PREFIX for scons, since this means our portable downloadable binary would find the system blender files (if installed).
this should stay disabled until scons supports system/portable installs as with cmake.
Diffstat (limited to 'intern/ghost/SConscript')
| -rw-r--r-- | intern/ghost/SConscript | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/intern/ghost/SConscript b/intern/ghost/SConscript index 9977a7927fc..39757c873d8 100644 --- a/intern/ghost/SConscript +++ b/intern/ghost/SConscript @@ -34,7 +34,12 @@ elif window_system in ('linux', 'openbsd3', 'sunos5', 'freebsd7', 'freebsd8', 'f sources.remove('intern' + os.sep + f + 'SDL.cpp') except ValueError: pass - defs += ['PREFIX=\\"/usr/local/\\"'] # XXX, make an option + ## removing because scons does not support system installation + ## if this is used for blender.org builds it means our distrobution + ## will find any locally installed blender and double up its script path. + ## So until this is supported properly as with CMake, + ## just dont use the PREFIX. + # defs += ['PREFIX=\\"/usr/local/\\"'] # XXX, make an option defs += ['WITH_X11_XINPUT'] # XXX, make an option elif window_system in ('win32-vc', 'win32-mingw', 'cygwin', 'linuxcross', 'win64-vc'): |