Welcome to mirror list, hosted at ThFree Co, Russian Federation.

git.blender.org/blender.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorCampbell Barton <ideasman42@gmail.com>2013-05-30 01:56:55 +0400
committerCampbell Barton <ideasman42@gmail.com>2013-05-30 01:56:55 +0400
commit9cf6e305a90581442d374860d3e4f278624d033c (patch)
tree9d002ad5a5c4e7641c79c10c2e40dcd39aa72db9 /source/gameengine/Network
parent65baf6ca5c92d7e12cedafef7a37b87d3bb37e94 (diff)
split bge includes for scons onto their own lines (for easier merging)
Diffstat (limited to 'source/gameengine/Network')
-rw-r--r--source/gameengine/Network/LoopBackNetwork/SConscript13
-rw-r--r--source/gameengine/Network/SConscript11
2 files changed, 18 insertions, 6 deletions
diff --git a/source/gameengine/Network/LoopBackNetwork/SConscript b/source/gameengine/Network/LoopBackNetwork/SConscript
index b183634d224..01352fbe732 100644
--- a/source/gameengine/Network/LoopBackNetwork/SConscript
+++ b/source/gameengine/Network/LoopBackNetwork/SConscript
@@ -27,8 +27,15 @@
Import ('env')
-sources = 'NG_LoopBackNetworkDeviceInterface.cpp'
+sources = [
+ 'NG_LoopBackNetworkDeviceInterface.cpp',
+ ]
-incs = '. #intern/string #intern/container #source/gameengine/Network'
+incs = [
+ '.',
+ '#intern/container',
+ '#intern/string',
+ '#source/gameengine/Network',
+ ]
-env.BlenderLib ( 'ge_logic_loopbacknetwork', Split(sources), Split(incs), defines=[],libtype=['core','player'], priority=[400,135] )
+env.BlenderLib('ge_logic_loopbacknetwork', sources, incs, defines=[], libtype=['core', 'player'], priority=[400, 135])
diff --git a/source/gameengine/Network/SConscript b/source/gameengine/Network/SConscript
index 7365db5ba99..1d78cdba174 100644
--- a/source/gameengine/Network/SConscript
+++ b/source/gameengine/Network/SConscript
@@ -29,12 +29,17 @@ Import ('env')
sources = env.Glob('*.cpp') #'NG_NetworkMessage.cpp NG_NetworkObject.cpp NG_NetworkScene.cpp'
-incs = '. #intern/string #intern/moto/include #intern/container'
+incs = [
+ '.',
+ '#intern/container',
+ '#intern/string',
+ '#intern/moto/include',
+ ]
defs = []
if env['WITH_BF_CXX_GUARDEDALLOC']:
defs.append('WITH_CXX_GUARDEDALLOC')
- incs += ' #intern/guardedalloc'
+ incs.append('#intern/guardedalloc')
-env.BlenderLib ( 'ge_logic_ngnetwork', sources, Split(incs), defs, libtype=['core','player'], priority=[400,130] )
+env.BlenderLib('ge_logic_ngnetwork', sources, incs, defs, libtype=['core', 'player'], priority=[400, 130])