diff options
Diffstat (limited to 'source/gameengine/Ketsji/KXNetwork/SConscript')
| -rw-r--r-- | source/gameengine/Ketsji/KXNetwork/SConscript | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/source/gameengine/Ketsji/KXNetwork/SConscript b/source/gameengine/Ketsji/KXNetwork/SConscript index e7f98ff5850..b916530ac8b 100644 --- a/source/gameengine/Ketsji/KXNetwork/SConscript +++ b/source/gameengine/Ketsji/KXNetwork/SConscript @@ -10,8 +10,13 @@ incs += ' #source/gameengine/Network #source/gameengine/SceneGraph' defs = [] if env['WITH_BF_PYTHON']: +<<<<<<< .working incs += ' ' + env['BF_PYTHON_INC'] else: defs.append('DISABLE_PYTHON') +======= + incs += ' ' + env['BF_PYTHON_INC'] + defs.append('WITH_PYTHON') +>>>>>>> .merge-right.r35190 env.BlenderLib ( 'bf_network', Split(sources), Split(incs), defines=defs,libtype=['core','player'], priority=[400,125], cxx_compileflags=env['BGE_CXXFLAGS']) |