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:
authorAntony Riakiotakis <kalast@gmail.com>2012-02-22 07:16:34 +0400
committerAntony Riakiotakis <kalast@gmail.com>2012-02-22 07:16:34 +0400
commit9ca3084d4dc8efabc72e1970725c396b59f78cdf (patch)
treec9a88dd88fa9bd1517bd914343c832640efc6603 /source/blender/bmesh/SConscript
parentc7185d26527ef1ef56e0fe54cdef0d54578ae1b1 (diff)
Attempt to fix scons compilation of blenderplayer.
Added bmesh to player libraries and changed the priority of blenlib so as to avoid duplicate definitions (looks like there are actually functions defined twice that cause conflicts if one changes the order of linking...figures). Only tested this on mingw-windows, I hope it works elsewhere too.
Diffstat (limited to 'source/blender/bmesh/SConscript')
-rw-r--r--source/blender/bmesh/SConscript2
1 files changed, 1 insertions, 1 deletions
diff --git a/source/blender/bmesh/SConscript b/source/blender/bmesh/SConscript
index 91b7a72bb1f..76496dfdb7b 100644
--- a/source/blender/bmesh/SConscript
+++ b/source/blender/bmesh/SConscript
@@ -37,4 +37,4 @@ incs.append('../editors/mesh')
incs.append('../editors/include')
defs = []
-env.BlenderLib ( libname = 'bf_bmesh', sources = sources, includes = Split(incs), libtype = 'core', defines=defs, priority=100, compileflags=cflags )
+env.BlenderLib ( libname = 'bf_bmesh', sources = sources, includes = Split(incs), libtype = ['core','player'], defines=defs, priority=[100, 100], compileflags=cflags )