[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [35601] branches/bmesh/blender: scons fix
Joseph Eagar
joeedh at gmail.com
Fri Mar 18 00:30:30 CET 2011
Revision: 35601
http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=35601
Author: joeedh
Date: 2011-03-17 23:30:29 +0000 (Thu, 17 Mar 2011)
Log Message:
-----------
scons fix
Modified Paths:
--------------
branches/bmesh/blender/SConstruct
branches/bmesh/blender/intern/decimation/SConscript
branches/bmesh/blender/intern/guardedalloc/SConscript
branches/bmesh/blender/intern/string/SConscript
branches/bmesh/blender/source/blender/blenlib/SConscript
branches/bmesh/blender/source/blender/editors/animation/SConscript
branches/bmesh/blender/source/blender/editors/curve/SConscript
branches/bmesh/blender/source/blender/editors/gpencil/SConscript
branches/bmesh/blender/source/blender/editors/interface/SConscript
branches/bmesh/blender/source/blender/editors/physics/SConscript
branches/bmesh/blender/source/blender/editors/sculpt_paint/SConscript
branches/bmesh/blender/source/blender/editors/space_buttons/SConscript
branches/bmesh/blender/source/blender/editors/space_image/SConscript
branches/bmesh/blender/source/blender/editors/space_info/SConscript
branches/bmesh/blender/source/blender/editors/transform/SConscript
branches/bmesh/blender/source/blender/editors/uvedit/SConscript
branches/bmesh/blender/source/blender/makesdna/intern/SConscript
branches/bmesh/blender/source/blender/makesrna/intern/SConscript
branches/bmesh/blender/source/blender/modifiers/SConscript
branches/bmesh/blender/source/blender/render/SConscript
branches/bmesh/blender/source/gameengine/BlenderRoutines/SConscript
branches/bmesh/blender/source/gameengine/Converter/SConscript
branches/bmesh/blender/source/gameengine/Expressions/SConscript
branches/bmesh/blender/source/gameengine/GameLogic/SConscript
branches/bmesh/blender/source/gameengine/GamePlayer/common/SConscript
branches/bmesh/blender/source/gameengine/GamePlayer/ghost/SConscript
branches/bmesh/blender/source/gameengine/Ketsji/KXNetwork/SConscript
branches/bmesh/blender/source/gameengine/Ketsji/SConscript
branches/bmesh/blender/source/gameengine/Physics/Bullet/SConscript
branches/bmesh/blender/source/gameengine/Rasterizer/SConscript
branches/bmesh/blender/source/gameengine/VideoTexture/SConscript
Modified: branches/bmesh/blender/SConstruct
===================================================================
--- branches/bmesh/blender/SConstruct 2011-03-17 23:10:05 UTC (rev 35600)
+++ branches/bmesh/blender/SConstruct 2011-03-17 23:30:29 UTC (rev 35601)
@@ -413,18 +413,11 @@
if 'blender' in B.targets or not env['WITH_BF_NOBLENDER']:
env.BlenderProg(B.root_build_dir, "blender", mainlist + thestatlibs + dobj, thesyslibs, [B.root_build_dir+'/lib'] + thelibincs, 'blender')
if env['WITH_BF_PLAYER']:
-<<<<<<< .working
- playerlist = B.create_blender_liblist(env, 'player')
- playerlist += B.create_blender_liblist(env, 'intern')
- playerlist += B.create_blender_liblist(env, 'extern')
- env.BlenderProg(B.root_build_dir, "blenderplayer", playerlist, thestatlibs + dobj + thesyslibs, [B.root_build_dir+'/lib'] + thelibincs, 'blenderplayer')
-=======
playerlist = B.create_blender_liblist(env, 'player')
playerlist += B.create_blender_liblist(env, 'player2')
playerlist += B.create_blender_liblist(env, 'intern')
playerlist += B.create_blender_liblist(env, 'extern')
env.BlenderProg(B.root_build_dir, "blenderplayer", playerlist + thestatlibs + dobj, thesyslibs, [B.root_build_dir+'/lib'] + thelibincs, 'blenderplayer')
->>>>>>> .merge-right.r35190
##### Now define some targets
@@ -622,19 +615,11 @@
else:
dllsources.append('${BF_SDL_LIBPATH}/SDL.dll')
-<<<<<<< .working
- if env['WITH_BF_PYTHON']:
- if env['BF_DEBUG'] and not env["BF_NO_PYDEBUG"]:
- dllsources.append('${BF_PYTHON_LIBPATH}/${BF_PYTHON_DLL}_d.dll')
- else:
- dllsources.append('${BF_PYTHON_LIBPATH}/${BF_PYTHON_DLL}.dll')
-=======
if env['WITH_BF_PYTHON']:
if env['BF_DEBUG']:
dllsources.append('${BF_PYTHON_LIBPATH}/${BF_PYTHON_DLL}_d.dll')
else:
dllsources.append('${BF_PYTHON_LIBPATH}/${BF_PYTHON_DLL}.dll')
->>>>>>> .merge-right.r35190
if env['WITH_BF_ICONV']:
if env['OURPLATFORM'] == 'win64-vc':
Modified: branches/bmesh/blender/intern/decimation/SConscript
===================================================================
--- branches/bmesh/blender/intern/decimation/SConscript 2011-03-17 23:10:05 UTC (rev 35600)
+++ branches/bmesh/blender/intern/decimation/SConscript 2011-03-17 23:30:29 UTC (rev 35601)
@@ -5,8 +5,5 @@
incs = '. ../moto/include ../container ../memutil'
-<<<<<<< .working
-env.BlenderLib ('bf_intern_decimate', sources, Split(incs) , [], libtype=['core'], priority = [200] )
-=======
env.BlenderLib ('bf_intern_decimate', sources, Split(incs) , [], libtype=['core', 'player'], priority = [200, 100] )
->>>>>>> .merge-right.r35190
+
Modified: branches/bmesh/blender/intern/guardedalloc/SConscript
===================================================================
--- branches/bmesh/blender/intern/guardedalloc/SConscript 2011-03-17 23:10:05 UTC (rev 35600)
+++ branches/bmesh/blender/intern/guardedalloc/SConscript 2011-03-17 23:30:29 UTC (rev 35601)
@@ -12,8 +12,5 @@
incs = '.'
-<<<<<<< .working
-env.BlenderLib ('bf_intern_guardedalloc', sources, Split(incs), defines=[], libtype=['intern','player'], priority = [5,150] )
-=======
env.BlenderLib ('bf_intern_guardedalloc', sources, Split(incs), defs, libtype=['intern','player'], priority = [5,150] )
->>>>>>> .merge-right.r35190
+
Modified: branches/bmesh/blender/intern/string/SConscript
===================================================================
--- branches/bmesh/blender/intern/string/SConscript 2011-03-17 23:10:05 UTC (rev 35600)
+++ branches/bmesh/blender/intern/string/SConscript 2011-03-17 23:30:29 UTC (rev 35601)
@@ -4,9 +4,6 @@
sources = env.Glob('intern/*.cpp')
incs = '.'
-<<<<<<< .working
-env.BlenderLib ('bf_intern_string', sources, Split(incs), [], libtype=['intern','player'], priority = [50,10] )
-=======
defs = []
if env['WITH_BF_CXX_GUARDEDALLOC']:
@@ -14,4 +11,4 @@
incs += ' #intern/guardedalloc'
env.BlenderLib ('bf_intern_string', sources, Split(incs), defs, libtype=['intern','player'], priority = [50,10] )
->>>>>>> .merge-right.r35190
+
Modified: branches/bmesh/blender/source/blender/blenlib/SConscript
===================================================================
--- branches/bmesh/blender/source/blender/blenlib/SConscript 2011-03-17 23:10:05 UTC (rev 35600)
+++ branches/bmesh/blender/source/blender/blenlib/SConscript 2011-03-17 23:30:29 UTC (rev 35601)
@@ -9,11 +9,7 @@
incs += ' ' + env['BF_FREETYPE_INC']
incs += ' ' + env['BF_ZLIB_INC']
-<<<<<<< .working
-defs = 'GLEW_STATIC'
-=======
defs = []
->>>>>>> .merge-right.r35190
if env['WITH_BF_BINRELOC']:
cflags='-pthread'
Modified: branches/bmesh/blender/source/blender/editors/animation/SConscript
===================================================================
--- branches/bmesh/blender/source/blender/editors/animation/SConscript 2011-03-17 23:10:05 UTC (rev 35600)
+++ branches/bmesh/blender/source/blender/editors/animation/SConscript 2011-03-17 23:30:29 UTC (rev 35601)
@@ -4,11 +4,6 @@
sources = env.Glob('*.c')
incs = '../include ../../blenlib ../../blenkernel ../../makesdna ../../makesrna ../../imbuf'
-<<<<<<< .working
-incs += ' ../../windowmanager ../../bmesh'
-incs += ' #/intern/guardedalloc #/extern/glew/include'
-=======
-incs += ' ../../windowmanager #/intern/guardedalloc #/extern/glew/include ../../blenloader'
->>>>>>> .merge-right.r35190
+incs += ' ../../bmesh ../../windowmanager #/intern/guardedalloc #/extern/glew/include ../../blenloader'
env.BlenderLib ( 'bf_editors_animation', sources, Split(incs), [], libtype=['core'], priority=[125] )
Modified: branches/bmesh/blender/source/blender/editors/curve/SConscript
===================================================================
--- branches/bmesh/blender/source/blender/editors/curve/SConscript 2011-03-17 23:10:05 UTC (rev 35600)
+++ branches/bmesh/blender/source/blender/editors/curve/SConscript 2011-03-17 23:30:29 UTC (rev 35601)
@@ -5,11 +5,7 @@
incs = '../include ../../blenlib ../../blenkernel ../../makesdna ../../imbuf'
incs += ' ../../windowmanager #/intern/guardedalloc #/extern/glew/include'
-<<<<<<< .working
-incs += ' ../../gpu ../../bmesh'
-=======
-incs += ' ../../gpu ../../blenloader'
->>>>>>> .merge-right.r35190
+incs += ' ../../bmesh ../../gpu ../../blenloader'
incs += ' ../../makesrna ../../render/extern/include #/intern/elbeem/extern'
env.BlenderLib ( 'bf_editors_curve', sources, Split(incs), [], libtype=['core'], priority=[45] )
Modified: branches/bmesh/blender/source/blender/editors/gpencil/SConscript
===================================================================
--- branches/bmesh/blender/source/blender/editors/gpencil/SConscript 2011-03-17 23:10:05 UTC (rev 35600)
+++ branches/bmesh/blender/source/blender/editors/gpencil/SConscript 2011-03-17 23:30:29 UTC (rev 35601)
@@ -5,11 +5,7 @@
incs = '../include ../../blenlib ../../blenkernel ../../makesdna ../../imbuf'
incs += ' ../../windowmanager #/intern/guardedalloc #/extern/glew/include'
-<<<<<<< .working
-incs += ' ../../gpu ../../bmesh'
-=======
-incs += ' ../../gpu ../../blenloader'
->>>>>>> .merge-right.r35190
+incs += ' ../../gpu ../../blenloader ../../bmesh'
incs += ' ../../makesrna ../../render/extern/include #/intern/elbeem/extern'
env.BlenderLib ( 'bf_editors_gpencil', sources, Split(incs), [], libtype=['core'], priority=[45] )
Modified: branches/bmesh/blender/source/blender/editors/interface/SConscript
===================================================================
--- branches/bmesh/blender/source/blender/editors/interface/SConscript 2011-03-17 23:10:05 UTC (rev 35600)
+++ branches/bmesh/blender/source/blender/editors/interface/SConscript 2011-03-17 23:30:29 UTC (rev 35601)
@@ -7,13 +7,8 @@
sources.remove(source)
incs = '../include ../../blenlib ../../blenfont ../../blenkernel ../../makesdna ../../imbuf'
-<<<<<<< .working
-incs += ' ../../makesrna ../../windowmanager ../../gpu ../../bmesh'
-incs += ' #/intern/guardedalloc #/extern/glew/include'
-=======
incs += ' ../../makesrna ../../windowmanager #/intern/guardedalloc ../../gpu'
-incs += ' #/extern/glew/include ../../blenloader'
->>>>>>> .merge-right.r35190
+incs += ' #/extern/glew/include ../../blenloader ../../bmesh'
incs += ' ../../python/' # python button eval
defs = []
Modified: branches/bmesh/blender/source/blender/editors/physics/SConscript
===================================================================
--- branches/bmesh/blender/source/blender/editors/physics/SConscript 2011-03-17 23:10:05 UTC (rev 35600)
+++ branches/bmesh/blender/source/blender/editors/physics/SConscript 2011-03-17 23:30:29 UTC (rev 35601)
@@ -5,11 +5,7 @@
incs = '../include ../../blenlib ../../blenkernel ../../makesdna ../../imbuf'
incs += ' ../../windowmanager #/intern/guardedalloc #/extern/glew/include'
-<<<<<<< .working
-incs += ' ../../gpu ../../bmesh'
-=======
-incs += ' ../../gpu ../../blenloader'
->>>>>>> .merge-right.r35190
+incs += ' ../../gpu ../../blenloader ../../bmesh'
incs += ' ../../makesrna ../../render/extern/include #/intern/elbeem/extern'
defs = ''
Modified: branches/bmesh/blender/source/blender/editors/sculpt_paint/SConscript
===================================================================
--- branches/bmesh/blender/source/blender/editors/sculpt_paint/SConscript 2011-03-17 23:10:05 UTC (rev 35600)
+++ branches/bmesh/blender/source/blender/editors/sculpt_paint/SConscript 2011-03-17 23:30:29 UTC (rev 35601)
@@ -8,11 +8,7 @@
incs = '../include ../../blenlib ../../blenkernel ../../makesdna ../../imbuf'
incs += ' ../../windowmanager #/intern/guardedalloc #/extern/glew/include'
incs += ' ../../render/extern/include'
-<<<<<<< .working
-incs += ' ../../gpu ../../makesrna ../../bmesh'
-=======
-incs += ' ../../gpu ../../makesrna ../../blenloader'
->>>>>>> .merge-right.r35190
+incs += ' ../../gpu ../../makesrna ../../blenloader ../../bmesh'
if env['OURPLATFORM'] == 'linux2':
cflags='-pthread'
Modified: branches/bmesh/blender/source/blender/editors/space_buttons/SConscript
===================================================================
--- branches/bmesh/blender/source/blender/editors/space_buttons/SConscript 2011-03-17 23:10:05 UTC (rev 35600)
+++ branches/bmesh/blender/source/blender/editors/space_buttons/SConscript 2011-03-17 23:30:29 UTC (rev 35601)
@@ -5,11 +5,7 @@
incs = '../include ../../blenlib ../../blenkernel ../../makesdna ../../imbuf'
@@ Diff output truncated at 10240 characters. @@
More information about the Bf-blender-cvs
mailing list