diff --git a/drivers/SCsub b/drivers/SCsub index 8e241830f89..e52d6538e51 100644 --- a/drivers/SCsub +++ b/drivers/SCsub @@ -61,39 +61,42 @@ import string if env['vsproj']=="yes": env.AddToVSProject(env.drivers_sources) -for f in env.drivers_sources: - fname = "" - if type(f) == type(""): - fname = env.File(f).path - else: - fname = env.File(f)[0].path - fname = fname.replace("\\", "/") - base = string.join(fname.split("/")[:2], "/") - if base != cur_base and len(list) > max_src: - if num > 0: - lib = env.Library("drivers"+str(num), list) - lib_list.append(lib) - list = [] - num = num+1 - cur_base = base - list.append(f) +if (False): #split drivers, this used to be needed for windows until separate builders for windows were created -lib = env.Library("drivers"+str(num), list) -lib_list.append(lib) + for f in env.drivers_sources: + fname = "" + if type(f) == type(""): + fname = env.File(f).path + else: + fname = env.File(f)[0].path + fname = fname.replace("\\", "/") + base = string.join(fname.split("/")[:2], "/") + if base != cur_base and len(list) > max_src: + if num > 0: + lib = env.Library("drivers"+str(num), list) + lib_list.append(lib) + list = [] + num = num+1 + cur_base = base + list.append(f) -if len(lib_list) > 0: - import os, sys - if os.name=='posix' and sys.platform=='msys': - env.Replace(ARFLAGS=['rcsT']) + lib = env.Library("drivers"+str(num), list) + lib_list.append(lib) - lib = env.Library("drivers_collated", lib_list) - lib_list = [lib] + if len(lib_list) > 0: + import os, sys + if os.name=='posix' and sys.platform=='msys': + env.Replace(ARFLAGS=['rcsT']) -drivers_base=[] -env.add_source_files(drivers_base,"*.cpp") -lib_list.insert(0, env.Library("drivers", drivers_base)) + lib = env.Library("drivers_collated", lib_list) + lib_list = [lib] -env.Prepend(LIBS=lib_list) + drivers_base=[] + env.add_source_files(drivers_base,"*.cpp") + lib_list.insert(0, env.Library("drivers", drivers_base)) -#lib = env.Library("drivers",env.drivers_sources) -#env.Prepend(LIBS=[lib]) + env.Prepend(LIBS=lib_list) +else: + env.add_source_files(env.drivers_sources,"*.cpp") + lib = env.Library("drivers",env.drivers_sources) + env.Prepend(LIBS=[lib])