ViewVC Help
View File | Revision Log | Show Annotations | Download File | Root Listing
root/Development/ray/SConstruct
(Generate patch)

Comparing ray/SConstruct (file contents):
Revision 1.18 by schorsch, Mon Mar 28 17:48:43 2016 UTC vs.
Revision 1.19 by schorsch, Tue Apr 19 21:21:23 2016 UTC

# Line 3 | Line 3 | import os
3   import sys
4   import string
5  
6 < PATHFILE = 'raypaths.py'
7 < OPTFILE = 'rayopts.py'
8 < def set_pre_opts(env):
6 > PATHFILE = 'scbuild/raypaths.py'
7 > OPTFILE = 'scbuild/rayopts.py'
8 > def set_pre_opts():
9          vars = Variables(OPTFILE, ARGUMENTS)
10          vars.Add('SKIP', 'Skip Display of License terms', 0)
11 <        vars.Add('RAD_DEBUG',   'Build a debug version',  0)
12 <        vars.Update(env)
13 <        vars.Save(OPTFILE, env)
11 >        vars.Add('RAD_DEBUG',  'Build a debug version',  0)
12 >        vars.Add('MSVC_VERSION', 'Microsoft VC Version',  '12.0')
13 >        vars.Add('TARGET_ARCH',  'Windows only: "x68" or "amd64"',  '')
14 >        return vars
15  
16   def set_opts(env):
17          vars = Variables(PATHFILE, ARGUMENTS)
# Line 31 | Line 32 | def allplats_setup(env):
32          find_libs.find_x11(env)
33          find_libs.find_gl(env) # OpenGL
34          find_libs.find_libtiff(env)
35 +        find_libs.find_pyinstaller(env)
36  
37   def post_common_setup(env):
38          env.Append(CPPPATH = [os.path.join('#src', 'common')])
# Line 46 | Line 48 | def shareinstall_setup(env):
48          if 'install' in sys.argv or 'maninstall' in sys.argv:
49                  install.install_manfiles(env)
50  
49 – _arch = None
50 – for item in sys.argv[1:]:
51 –        if item.startswith('TARGET_ARCH'):
52 –                res = item.split('=')
53 –                if len(res) == 2:
54 –                        _arch = res[1].strip()
51  
52 + # set stuff before loading platforms
53 + prevars = set_pre_opts()
54   # Set up build environment
55 < env = Environment(TARGET_ARCH=_arch)
55 > env = Environment(variables=prevars)
56 > prevars.Save(OPTFILE, env)
57   env.Decider('timestamp-match')
58  
59   from build_utils import install
# Line 64 | Line 63 | if os.name == 'posix':
63          tclscript_b = Builder(action = install.install_tclscript, suffix = '')
64          env.Append(BUILDERS={'InstallTCLScript': tclscript_b})
65  
67 – # set debug before loading platforms
68 – set_pre_opts(env)
66  
67   # configure platform-specific stuff
68   from build_utils import load_plat
69 < load_plat.load_plat(env, vars, arch=_arch)
69 > load_plat.load_plat(env)
70  
71   # override options
72   set_opts(env)

Diff Legend

– Removed lines
+ Added lines
< Changed lines (old)
> Changed lines (new)