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:
authorArystanbek Dyussenov <arystan.d@gmail.com>2009-09-11 22:09:58 +0400
committerArystanbek Dyussenov <arystan.d@gmail.com>2009-09-11 22:09:58 +0400
commit3b2ad838e8c628a468ee19ac77fb1336dd6072cf (patch)
treebc1e229f3055e4114086775122c7a47facb42679 /source/gameengine/Ketsji/KXNetwork/SConscript
parent7220792f187f91a2ef3eb0c930a13674b2a8a80a (diff)
parent15d77f17a40398a63f95e16607deb81257c02698 (diff)
Merge with -r 22620:23107.
Next: update scripts and merge in 2.5.
Diffstat (limited to 'source/gameengine/Ketsji/KXNetwork/SConscript')
-rw-r--r--source/gameengine/Ketsji/KXNetwork/SConscript9
1 files changed, 1 insertions, 8 deletions
diff --git a/source/gameengine/Ketsji/KXNetwork/SConscript b/source/gameengine/Ketsji/KXNetwork/SConscript
index e6584b55ed2..8f88511acca 100644
--- a/source/gameengine/Ketsji/KXNetwork/SConscript
+++ b/source/gameengine/Ketsji/KXNetwork/SConscript
@@ -9,11 +9,4 @@ incs += ' #source/gameengine/Network #source/gameengine/SceneGraph'
incs += ' ' + env['BF_PYTHON_INC']
-cxxflags = []
-if env['OURPLATFORM'] in ('win32-vc', 'win64-vc'):
- cxxflags.append ('/GR')
- cxxflags.append ('/O2')
- cxxflags.append ('/EHsc')
-
-
-env.BlenderLib ( 'kx_network', Split(sources), Split(incs), defines=[],libtype=['core', 'player'], priority=[400, 145], cxx_compileflags=cxxflags )
+env.BlenderLib ( 'bf_network', Split(sources), Split(incs), defines=[],libtype=['core','player'], priority=[400,125], cxx_compileflags=env['BGE_CXXFLAGS'])