godotengine
/
godot
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

remove editor driver split 

fixes #3001
This commit is contained in:
Juan Linietsky 2015-12-11 09:01:03 -03:00
parent 9e000f12a1
commit 0f57bbb8e9
1 changed files with 33 additions and 30 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
drivers/SCsub
View File

@ -61,7 +61,9 @@ import string
if env['vsproj']=="yes":
env.AddToVSProject(env.drivers_sources)
for f in env.drivers_sources:
if (False): #split drivers, this used to be needed for windows until separate builders for windows were created
for f in env.drivers_sources:
fname = ""
if type(f) == type(""):
fname = env.File(f).path
@ -78,10 +80,10 @@ for f in env.drivers_sources:
cur_base = base
list.append(f)
lib = env.Library("drivers"+str(num), list)
lib_list.append(lib)
lib = env.Library("drivers"+str(num), list)
lib_list.append(lib)
if len(lib_list) > 0:
if len(lib_list) > 0:
import os, sys
if os.name=='posix' and sys.platform=='msys':
env.Replace(ARFLAGS=['rcsT'])
@ -89,11 +91,12 @@ if len(lib_list) > 0:
lib = env.Library("drivers_collated", lib_list)
lib_list = [lib]
drivers_base=[]
env.add_source_files(drivers_base,"*.cpp")
lib_list.insert(0, env.Library("drivers", drivers_base))
drivers_base=[]
env.add_source_files(drivers_base,"*.cpp")
lib_list.insert(0, env.Library("drivers", drivers_base))
env.Prepend(LIBS=lib_list)
#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])