--- ray/SConstruct	2016/03/05 14:43:36	1.14
+++ ray/SConstruct	2016/03/28 17:48:43	1.18
@@ -3,21 +3,25 @@ import os
 import sys
 import string
 
+PATHFILE = 'raypaths.py'
 OPTFILE = 'rayopts.py'
-def set_opts(env):
-	# XXX add some caching
+def set_pre_opts(env):
 	vars = Variables(OPTFILE, ARGUMENTS)
 	vars.Add('SKIP', 'Skip Display of License terms', 0)
+	vars.Add('RAD_DEBUG',   'Build a debug version',  0)
+	vars.Update(env) 
+	vars.Save(OPTFILE, env)
+
+def set_opts(env):
+	vars = Variables(PATHFILE, ARGUMENTS)
 	vars.Add('RAD_BINDIR',  'Install executables here',   env['RAD_BINDIR'])
 	vars.Add('RAD_RLIBDIR', 'Install support files here', env['RAD_RLIBDIR'])
 	vars.Add('RAD_MANDIR',  'Install man pages here',     env['RAD_MANDIR'])
-	vars.Add('RAD_DEBUG',   'Build a debug version',  0)
 	vars.Update(env) 
-	vars.Save(OPTFILE, env)
+	vars.Save(PATHFILE, env)
 	Help(vars.GenerateHelpText(env, sort=cmp))
 	# where stuff is located in the source tree
-	env['RAD_BUILDLIB']  = '#src/lib'
-	env['RAD_BUILDBIN']  = '#bin'
+	# the binary target libs are configured by platform
 	env['RAD_BUILDRLIB'] = '#lib'
 	env['RAD_BUILDMAN']  = '#doc/man'
 
@@ -30,7 +34,7 @@ def allplats_setup(env):
 
 def post_common_setup(env):
 	env.Append(CPPPATH = [os.path.join('#src', 'common')])
-	env.Append(LIBPATH=['../lib']) # our own libs
+	env.Append(LIBPATH=[env['RAD_BUILDLIB']]) # our own libs
 	if not env.has_key('RAD_MLIB'):
 		env['RAD_MLIB'] = [] #['m'] # no seperate mlib on Win
 
@@ -42,27 +46,37 @@ def shareinstall_setup(env):
 	if 'install' in sys.argv or 'maninstall' in sys.argv:
 		install.install_manfiles(env)
 
+_arch = None
+for item in sys.argv[1:]:
+	if item.startswith('TARGET_ARCH'):
+		res = item.split('=')
+		if len(res) == 2:
+			_arch = res[1].strip()
+
 # Set up build environment
-env = Environment()
+env = Environment(TARGET_ARCH=_arch)
 env.Decider('timestamp-match')
 
+from build_utils import install
+script_b = Builder(action = install.install_script, suffix = '')
+env.Append(BUILDERS={'InstallScript': script_b})
 if os.name == 'posix':
-	from build_utils import install
-	script_b = Builder(action = install.install_script, suffix = '')
-	env.Append(BUILDERS={'InstallScript': script_b})
 	tclscript_b = Builder(action = install.install_tclscript, suffix = '')
 	env.Append(BUILDERS={'InstallTCLScript': tclscript_b})
 
+# set debug before loading platforms
+set_pre_opts(env)
+
 # configure platform-specific stuff
 from build_utils import load_plat
-load_plat.load_plat(env, ARGUMENTS, platform=None)
+load_plat.load_plat(env, vars, arch=_arch)
 
 # override options
 set_opts(env)
 
 # accept license
 if ((not env['SKIP']
-			or env['SKIP'].strip().lower() in (0,'0','no','false'))
+			or env['SKIP'].strip().lower() in (0,'0','n','no','false',None))
 		and not '-c' in sys.argv and not 'test' in sys.argv):
 	from build_utils import copyright
 	copyright.show_license()
@@ -76,11 +90,18 @@ if 'test' in sys.argv:
 	SConscript(os.path.join('test', 'SConscript'))
 	
 else:
-	SConscript(os.path.join('src', 'common', 'SConscript'))
+	SConscript(os.path.join('src', 'common', 'SConscript'),
+			variant_dir=os.path.join(env['RAD_BUILDOBJ'],'common'), duplicate=0)
 	post_common_setup(env)
-	for d in Split('meta cv gen ot rt px hd util cal'):
-		print d
-		SConscript(os.path.join('src', d, 'SConscript'))
+	dirs = Split('''meta cv gen ot rt px hd util cal''')
+	if os.path.isfile('src/winimage/SConscript'):
+		dirs.append('winimage')
+	if os.path.isfile('src/winrview/SConscript'):
+		dirs.append('winrview')
+	for d in dirs:
+		print(d)
+		SConscript(os.path.join('src', d, 'SConscript'),
+				variant_dir=os.path.join(env['RAD_BUILDOBJ'], d), duplicate=0)
 
 	if string.find(string.join(sys.argv[1:]), 'install') > -1:
 		shareinstall_setup(env)
@@ -92,7 +113,7 @@ env.Alias('bininstall',  '$RAD_BINDIR')
 env.Alias('rlibinstall', '$RAD_RLIBDIR')
 env.Alias('maninstall',  '$RAD_MANDIR')
 
-env.Alias('build',   ['#bin'])
+env.Alias('build',   ['$RAD_BUILDBIN', '$RAD_BUILDRLIB'])
 env.Alias('test',    ['#test'])
 env.Alias('install', ['bininstall', 'rlibinstall', 'maninstall'])