--- ray/build_utils/load_plat.py	2003/10/21 19:27:28	1.1
+++ ray/build_utils/load_plat.py	2006/06/06 22:32:05	1.8
@@ -1,43 +1,47 @@
 
 import os
 import sys
-import string
 import ConfigParser
 
 
 _platdir = 'platform'
 
 
-def POSIX_setup(env):
-    # common stuff for all posix systems
-    env['RAD_PROCESS'] = string.split('unix_process.c')
-
-
-def read_plat(env, fn):
+def read_plat(env, args, fn):
 	cfig = ConfigParser.ConfigParser(env.Dictionary())
 	cfig.read(fn)
+	buildvars = [['CC'], # replace
+			['CPPPATH', 'CPPDEFINES', 'CPPFLAGS', 'CCFLAGS',
+			'LIBPATH', 'LINKFLAGS']] # append
 	vars = [
-		['build',
-			['CC'], # replace
-			['CPPFLAGS', 'CCFLAGS', 'CPPPATH', 'LIBPATH']], # append
 		['install',
 			['RAD_BASEDIR', 'RAD_BINDIR', 'RAD_RLIBDIR', 'RAD_MANDIR'],
 			[]],
 		['code',
-			['RAD_SPEED'],
-			['RAD_COMPAT', 'RAD_MLIB', 'RAD_PROCESS']],
+			[], # replace
+			[   # append
+			'RAD_COMPAT',    # currently obsolete
+			'RAD_MATHCOMPAT', # erf.c floating point error function
+			'RAD_ARGSCOMPAT', # fixargv0.c for Windows
+			'RAD_NETCOMPAT',  # [win_]netproc.c for ranimate
+			'RAD_MLIB',       # usually 'm', or any fastlib available
+			'RAD_SOCKETLIB',  # ws_2_32 on Windows (VC links it automatically)
+			'RAD_PROCESS']],  # our process abstraction and win_popen()
 	]
+	if args.get('RAD_DEBUG',0):
+		vars.insert(0, ['debug'] + buildvars)
+	else: vars.insert(0, ['build'] + buildvars)
 	for section in vars:
 		if cfig.has_section(section[0]):
-			for p in section[1]:
+			for p in section[1]: # single items to replace
 				try: v = cfig.get(section[0], p)
 				except ConfigParser.NoOptionError: continue
 				env[p] = v
 				#print '%s: %s' % (p, env[p])
-			for p in section[2]:
+			for p in section[2]: # multiple items to append
 				try: v = cfig.get(section[0], p)
 				except ConfigParser.NoOptionError: continue
-				apply(env.Append,[],{p:string.split(v)})
+				apply(env.Append,[],{p:`v`.split()})
 				#print '%s: %s' % (p, env[p])
 	# XXX Check that basedir exists.
 	for k in ['RAD_BINDIR', 'RAD_RLIBDIR', 'RAD_MANDIR']:
@@ -46,31 +50,32 @@ def read_plat(env, fn):
 			env[k] = os.path.join(env['RAD_BASEDIR'],env[k])
 
 
-def load_plat(env, platform=None):
-	if os.name == 'posix':
-		POSIX_setup(env)
+def load_plat(env, args, platform=None):
 	if platform == None: # override
 		p = sys.platform
 	else: p = platform
+	if p == 'win32' and 'gcc' in env['TOOLS']:
+		# we don't really want to know this here...
+		p = 'mingw'
 	pl = []
 	print 'Detected platform "%s" (%s).' % (sys.platform, os.name)
 	for i in [len(p), -1, -2]:
 		pfn = os.path.join(_platdir, p[:i] + '_custom.cfg')
 		if os.path.isfile(pfn):
 			print 'Reading configuration "%s"' % pfn
-			read_plat(env, pfn)
+			read_plat(env, args, pfn)
 			return 1
 		pfn = os.path.join(_platdir, p[:i] + '.cfg')
 		if os.path.isfile(pfn):
 			print 'Reading configuration "%s"' % pfn
-			read_plat(env, pfn)
+			read_plat(env, args, pfn)
 			return 1
 		
 	if os.name == 'posix':
 		pfn = os.path.join(_platdir, 'posix.cfg')
 		if os.path.isfile(pfn):
 			print 'Reading generic configuration "%s".' % pfn
-			read_plat(env, pfn)
+			read_plat(env, args, pfn)
 			return 1
 
 	print 'Platform "%s/%s" not supported yet' % (os.name, sys.platform)