--- ray/build_utils/load_plat.py 2003/10/27 10:35:41 1.2 +++ ray/build_utils/load_plat.py 2005/09/14 09:28:35 1.6 @@ -17,7 +17,8 @@ def read_plat(env, args, fn): cfig = ConfigParser.ConfigParser(env.Dictionary()) cfig.read(fn) buildvars = [['CC'], # replace - ['CPPPATH','CPPFLAGS','CCFLAGS','LIBPATH','LINKFLAGS']] # append + ['CPPPATH', 'CPPDEFINES', 'CPPFLAGS', 'CCFLAGS', + 'LIBPATH', 'LINKFLAGS']] # append vars = [ ['install', ['RAD_BASEDIR', 'RAD_BINDIR', 'RAD_RLIBDIR', 'RAD_MANDIR'], @@ -25,7 +26,7 @@ def read_plat(env, args, fn): ['code', ['RAD_SPEED'], ['RAD_COMPAT', 'RAD_MEMCOMPAT', 'RAD_MATHCOMPAT', 'RAD_ARGSCOMPAT', - 'RAD_MLIB', 'RAD_PROCESS']], + 'RAD_MLIB', 'RAD_SOCKETLIB', 'RAD_PROCESS']], ] if args.get('RAD_DEBUG',0): vars.insert(0, ['debug'] + buildvars) @@ -55,6 +56,8 @@ 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']: + p = 'mingw' pl = [] print 'Detected platform "%s" (%s).' % (sys.platform, os.name) for i in [len(p), -1, -2]: