Commit: 8b5d86dfbad928cd56c02e718951a59e8133e00a Author: Sergey Sharybin Date: Mon Nov 3 15:24:53 2014 +0500 Branches: master https://developer.blender.org/rB8b5d86dfbad928cd56c02e718951a59e8133e00a
Compilation error fix for buildbot Ghost depends on glew-mx, so glew-mx should be passed to linker after the ghost. We're also using spaces for indentation in python, including scons rules. =================================================================== M intern/glew-mx/SConscript =================================================================== diff --git a/intern/glew-mx/SConscript b/intern/glew-mx/SConscript index 1f050f0..5c70958 100644 --- a/intern/glew-mx/SConscript +++ b/intern/glew-mx/SConscript @@ -9,8 +9,8 @@ sources = ['intern/glew-mx.c'] defs = env['BF_GL_DEFINITIONS'] incs = [ - '.', - env['BF_GLEW_INC'], - ] + '.', + env['BF_GLEW_INC'], + ] -env.BlenderLib ( 'extern_glew_mx', sources, incs, defs, libtype=['intern','player'], priority=[10, 185] ) +env.BlenderLib('intern_glew_mx', sources, incs, defs, libtype=['intern','player'], priority=[50, 185]) _______________________________________________ Bf-blender-cvs mailing list Bf-blender-cvs@blender.org http://lists.blender.org/mailman/listinfo/bf-blender-cvs