[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [23484] branches/ge_dyn_load: svn merge https://svn.blender.org/svnroot/bf-blender/trunk/blender -r23300 :23400
Campbell Barton
ideasman42 at gmail.com
Fri Sep 25 13:24:34 CEST 2009
Revision: 23484
http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=23484
Author: campbellbarton
Date: 2009-09-25 13:24:33 +0200 (Fri, 25 Sep 2009)
Log Message:
-----------
svn merge https://svn.blender.org/svnroot/bf-blender/trunk/blender -r23300:23400
Modified Paths:
--------------
branches/ge_dyn_load/CMakeLists.txt
branches/ge_dyn_load/SConstruct
branches/ge_dyn_load/config/darwin-config.py
branches/ge_dyn_load/config/irix6-config.py
branches/ge_dyn_load/config/linux2-config.py
branches/ge_dyn_load/config/linuxcross-config.py
branches/ge_dyn_load/config/openbsd3-config.py
branches/ge_dyn_load/config/sunos5-config.py
branches/ge_dyn_load/config/win32-mingw-config.py
branches/ge_dyn_load/config/win32-vc-config.py
branches/ge_dyn_load/config/win64-vc-config.py
branches/ge_dyn_load/intern/audaspace/intern/AUD_C-API.cpp
branches/ge_dyn_load/intern/audaspace/intern/AUD_C-API.h
branches/ge_dyn_load/intern/ghost/GHOST_Types.h
branches/ge_dyn_load/intern/ghost/intern/GHOST_SystemWin32.cpp
branches/ge_dyn_load/intern/ghost/intern/GHOST_SystemX11.cpp
branches/ge_dyn_load/intern/ghost/intern/GHOST_WindowX11.cpp
branches/ge_dyn_load/projectfiles_vc9/blender/editors/ED_editors.vcproj
branches/ge_dyn_load/release/io/export_ply.py
branches/ge_dyn_load/release/ui/buttons_data_armature.py
branches/ge_dyn_load/release/ui/buttons_data_bone.py
branches/ge_dyn_load/release/ui/buttons_data_mesh.py
branches/ge_dyn_load/release/ui/buttons_game.py
branches/ge_dyn_load/release/ui/buttons_object_constraint.py
branches/ge_dyn_load/release/ui/buttons_particle.py
branches/ge_dyn_load/release/ui/buttons_scene.py
branches/ge_dyn_load/release/ui/space_console.py
branches/ge_dyn_load/release/ui/space_image.py
branches/ge_dyn_load/release/ui/space_info.py
branches/ge_dyn_load/release/ui/space_time.py
branches/ge_dyn_load/release/ui/space_userpref.py
branches/ge_dyn_load/release/ui/space_view3d.py
branches/ge_dyn_load/release/ui/space_view3d_toolbar.py
branches/ge_dyn_load/source/blender/blenkernel/BKE_boids.h
branches/ge_dyn_load/source/blender/blenkernel/BKE_brush.h
branches/ge_dyn_load/source/blender/blenkernel/BKE_fcurve.h
branches/ge_dyn_load/source/blender/blenkernel/BKE_particle.h
branches/ge_dyn_load/source/blender/blenkernel/BKE_sound.h
branches/ge_dyn_load/source/blender/blenkernel/intern/anim.c
branches/ge_dyn_load/source/blender/blenkernel/intern/anim_sys.c
branches/ge_dyn_load/source/blender/blenkernel/intern/boids.c
branches/ge_dyn_load/source/blender/blenkernel/intern/brush.c
branches/ge_dyn_load/source/blender/blenkernel/intern/cloth.c
branches/ge_dyn_load/source/blender/blenkernel/intern/constraint.c
branches/ge_dyn_load/source/blender/blenkernel/intern/curve.c
branches/ge_dyn_load/source/blender/blenkernel/intern/depsgraph.c
branches/ge_dyn_load/source/blender/blenkernel/intern/fcurve.c
branches/ge_dyn_load/source/blender/blenkernel/intern/implicit.c
branches/ge_dyn_load/source/blender/blenkernel/intern/modifier.c
branches/ge_dyn_load/source/blender/blenkernel/intern/object.c
branches/ge_dyn_load/source/blender/blenkernel/intern/particle.c
branches/ge_dyn_load/source/blender/blenkernel/intern/particle_system.c
branches/ge_dyn_load/source/blender/blenkernel/intern/pointcache.c
branches/ge_dyn_load/source/blender/blenkernel/intern/scene.c
branches/ge_dyn_load/source/blender/blenkernel/intern/sound.c
branches/ge_dyn_load/source/blender/blenkernel/intern/text.c
branches/ge_dyn_load/source/blender/blenkernel/intern/writeffmpeg.c
branches/ge_dyn_load/source/blender/blenlib/BLI_arithb.h
branches/ge_dyn_load/source/blender/blenlib/BLI_util.h
branches/ge_dyn_load/source/blender/blenlib/intern/arithb.c
branches/ge_dyn_load/source/blender/blenlib/intern/util.c
branches/ge_dyn_load/source/blender/blenloader/intern/readfile.c
branches/ge_dyn_load/source/blender/blenloader/intern/writefile.c
branches/ge_dyn_load/source/blender/editors/animation/anim_channels_defines.c
branches/ge_dyn_load/source/blender/editors/animation/anim_channels_edit.c
branches/ge_dyn_load/source/blender/editors/animation/anim_filter.c
branches/ge_dyn_load/source/blender/editors/animation/anim_markers.c
branches/ge_dyn_load/source/blender/editors/animation/anim_ops.c
branches/ge_dyn_load/source/blender/editors/animation/keyframes_draw.c
branches/ge_dyn_load/source/blender/editors/animation/keyframes_edit.c
branches/ge_dyn_load/source/blender/editors/animation/keyframing.c
branches/ge_dyn_load/source/blender/editors/armature/armature_intern.h
branches/ge_dyn_load/source/blender/editors/armature/armature_ops.c
branches/ge_dyn_load/source/blender/editors/armature/editarmature.c
branches/ge_dyn_load/source/blender/editors/armature/editarmature_sketch.c
branches/ge_dyn_load/source/blender/editors/armature/meshlaplacian.c
branches/ge_dyn_load/source/blender/editors/armature/poselib.c
branches/ge_dyn_load/source/blender/editors/armature/poseobject.c
branches/ge_dyn_load/source/blender/editors/curve/curve_ops.c
branches/ge_dyn_load/source/blender/editors/curve/editfont.c
branches/ge_dyn_load/source/blender/editors/gpencil/gpencil_ops.c
branches/ge_dyn_load/source/blender/editors/gpencil/gpencil_paint.c
branches/ge_dyn_load/source/blender/editors/include/ED_anim_api.h
branches/ge_dyn_load/source/blender/editors/include/ED_keyframes_draw.h
branches/ge_dyn_load/source/blender/editors/include/ED_sculpt.h
branches/ge_dyn_load/source/blender/editors/include/ED_transform.h
branches/ge_dyn_load/source/blender/editors/interface/interface.c
branches/ge_dyn_load/source/blender/editors/interface/interface_handlers.c
branches/ge_dyn_load/source/blender/editors/interface/interface_layout.c
branches/ge_dyn_load/source/blender/editors/interface/interface_panel.c
branches/ge_dyn_load/source/blender/editors/interface/interface_regions.c
branches/ge_dyn_load/source/blender/editors/interface/interface_templates.c
branches/ge_dyn_load/source/blender/editors/interface/view2d_ops.c
branches/ge_dyn_load/source/blender/editors/mesh/editmesh_mods.c
branches/ge_dyn_load/source/blender/editors/mesh/editmesh_tools.c
branches/ge_dyn_load/source/blender/editors/mesh/loopcut.c
branches/ge_dyn_load/source/blender/editors/mesh/mesh_ops.c
branches/ge_dyn_load/source/blender/editors/metaball/mball_ops.c
branches/ge_dyn_load/source/blender/editors/object/object_intern.h
branches/ge_dyn_load/source/blender/editors/object/object_ops.c
branches/ge_dyn_load/source/blender/editors/physics/ed_pointcache.c
branches/ge_dyn_load/source/blender/editors/physics/editparticle.c
branches/ge_dyn_load/source/blender/editors/preview/previewrender.c
branches/ge_dyn_load/source/blender/editors/screen/area.c
branches/ge_dyn_load/source/blender/editors/screen/screen_ops.c
branches/ge_dyn_load/source/blender/editors/sculpt_paint/paint_image.c
branches/ge_dyn_load/source/blender/editors/sculpt_paint/paint_intern.h
branches/ge_dyn_load/source/blender/editors/sculpt_paint/paint_ops.c
branches/ge_dyn_load/source/blender/editors/sculpt_paint/paint_vertex.c
branches/ge_dyn_load/source/blender/editors/sculpt_paint/sculpt.c
branches/ge_dyn_load/source/blender/editors/sculpt_paint/sculpt_intern.h
branches/ge_dyn_load/source/blender/editors/space_action/action_header.c
branches/ge_dyn_load/source/blender/editors/space_action/action_ops.c
branches/ge_dyn_load/source/blender/editors/space_action/space_action.c
branches/ge_dyn_load/source/blender/editors/space_api/spacetypes.c
branches/ge_dyn_load/source/blender/editors/space_buttons/buttons_context.c
branches/ge_dyn_load/source/blender/editors/space_buttons/buttons_header.c
branches/ge_dyn_load/source/blender/editors/space_buttons/buttons_ops.c
branches/ge_dyn_load/source/blender/editors/space_buttons/space_buttons.c
branches/ge_dyn_load/source/blender/editors/space_console/space_console.c
branches/ge_dyn_load/source/blender/editors/space_file/file_draw.c
branches/ge_dyn_load/source/blender/editors/space_file/file_ops.c
branches/ge_dyn_load/source/blender/editors/space_file/filelist.c
branches/ge_dyn_load/source/blender/editors/space_file/filesel.c
branches/ge_dyn_load/source/blender/editors/space_file/space_file.c
branches/ge_dyn_load/source/blender/editors/space_graph/graph_header.c
branches/ge_dyn_load/source/blender/editors/space_graph/graph_ops.c
branches/ge_dyn_load/source/blender/editors/space_graph/space_graph.c
branches/ge_dyn_load/source/blender/editors/space_image/image_buttons.c
branches/ge_dyn_load/source/blender/editors/space_image/image_draw.c
branches/ge_dyn_load/source/blender/editors/space_image/image_ops.c
branches/ge_dyn_load/source/blender/editors/space_image/space_image.c
branches/ge_dyn_load/source/blender/editors/space_logic/space_logic.c
branches/ge_dyn_load/source/blender/editors/space_nla/nla_ops.c
branches/ge_dyn_load/source/blender/editors/space_nla/space_nla.c
branches/ge_dyn_load/source/blender/editors/space_node/drawnode.c
branches/ge_dyn_load/source/blender/editors/space_node/node_edit.c
branches/ge_dyn_load/source/blender/editors/space_node/node_ops.c
branches/ge_dyn_load/source/blender/editors/space_node/space_node.c
branches/ge_dyn_load/source/blender/editors/space_outliner/outliner.c
branches/ge_dyn_load/source/blender/editors/space_outliner/outliner_ops.c
branches/ge_dyn_load/source/blender/editors/space_outliner/space_outliner.c
branches/ge_dyn_load/source/blender/editors/space_script/script_ops.c
branches/ge_dyn_load/source/blender/editors/space_script/space_script.c
branches/ge_dyn_load/source/blender/editors/space_sequencer/sequencer_ops.c
branches/ge_dyn_load/source/blender/editors/space_sequencer/space_sequencer.c
branches/ge_dyn_load/source/blender/editors/space_sound/space_sound.c
branches/ge_dyn_load/source/blender/editors/space_text/space_text.c
branches/ge_dyn_load/source/blender/editors/space_text/text_ops.c
branches/ge_dyn_load/source/blender/editors/space_time/space_time.c
branches/ge_dyn_load/source/blender/editors/space_time/time_ops.c
branches/ge_dyn_load/source/blender/editors/space_view3d/Makefile
branches/ge_dyn_load/source/blender/editors/space_view3d/drawarmature.c
branches/ge_dyn_load/source/blender/editors/space_view3d/drawobject.c
branches/ge_dyn_load/source/blender/editors/space_view3d/drawvolume.c
branches/ge_dyn_load/source/blender/editors/space_view3d/space_view3d.c
branches/ge_dyn_load/source/blender/editors/space_view3d/view3d_buttons.c
branches/ge_dyn_load/source/blender/editors/space_view3d/view3d_edit.c
branches/ge_dyn_load/source/blender/editors/space_view3d/view3d_intern.h
branches/ge_dyn_load/source/blender/editors/space_view3d/view3d_ops.c
branches/ge_dyn_load/source/blender/editors/space_view3d/view3d_select.c
branches/ge_dyn_load/source/blender/editors/space_view3d/view3d_toolbar.c
branches/ge_dyn_load/source/blender/editors/transform/transform.h
branches/ge_dyn_load/source/blender/editors/transform/transform_conversions.c
branches/ge_dyn_load/source/blender/editors/transform/transform_generics.c
branches/ge_dyn_load/source/blender/editors/transform/transform_input.c
branches/ge_dyn_load/source/blender/editors/transform/transform_ops.c
branches/ge_dyn_load/source/blender/editors/transform/transform_orientations.c
branches/ge_dyn_load/source/blender/editors/uvedit/uvedit_draw.c
branches/ge_dyn_load/source/blender/editors/uvedit/uvedit_ops.c
branches/ge_dyn_load/source/blender/editors/uvedit/uvedit_unwrap_ops.c
branches/ge_dyn_load/source/blender/makesdna/DNA_action_types.h
branches/ge_dyn_load/source/blender/makesdna/DNA_armature_types.h
branches/ge_dyn_load/source/blender/makesdna/DNA_brush_types.h
branches/ge_dyn_load/source/blender/makesdna/DNA_curve_types.h
branches/ge_dyn_load/source/blender/makesdna/DNA_particle_types.h
branches/ge_dyn_load/source/blender/makesdna/DNA_scene_types.h
branches/ge_dyn_load/source/blender/makesdna/DNA_space_types.h
branches/ge_dyn_load/source/blender/makesdna/DNA_view3d_types.h
branches/ge_dyn_load/source/blender/makesdna/DNA_windowmanager_types.h
branches/ge_dyn_load/source/blender/makesrna/intern/rna_armature.c
branches/ge_dyn_load/source/blender/makesrna/intern/rna_brush.c
branches/ge_dyn_load/source/blender/makesrna/intern/rna_constraint.c
branches/ge_dyn_load/source/blender/makesrna/intern/rna_curve.c
branches/ge_dyn_load/source/blender/makesrna/intern/rna_image.c
branches/ge_dyn_load/source/blender/makesrna/intern/rna_nodetree.c
branches/ge_dyn_load/source/blender/makesrna/intern/rna_nodetree_types.h
branches/ge_dyn_load/source/blender/makesrna/intern/rna_particle.c
branches/ge_dyn_load/source/blender/makesrna/intern/rna_pose.c
branches/ge_dyn_load/source/blender/makesrna/intern/rna_scene.c
branches/ge_dyn_load/source/blender/makesrna/intern/rna_sequence.c
branches/ge_dyn_load/source/blender/makesrna/intern/rna_space.c
branches/ge_dyn_load/source/blender/makesrna/intern/rna_ui_api.c
branches/ge_dyn_load/source/blender/makesrna/intern/rna_userdef.c
branches/ge_dyn_load/source/blender/makesrna/intern/rna_wm.c
branches/ge_dyn_load/source/blender/python/intern/bpy_interface.c
branches/ge_dyn_load/source/blender/python/intern/bpy_operator.c
branches/ge_dyn_load/source/blender/python/intern/bpy_operator_wrap.c
branches/ge_dyn_load/source/blender/render/intern/source/convertblender.c
branches/ge_dyn_load/source/blender/render/intern/source/pipeline.c
branches/ge_dyn_load/source/blender/render/intern/source/pointdensity.c
branches/ge_dyn_load/source/blender/render/intern/source/volumetric.c
branches/ge_dyn_load/source/blender/windowmanager/WM_api.h
branches/ge_dyn_load/source/blender/windowmanager/intern/wm_event_system.c
branches/ge_dyn_load/source/blender/windowmanager/intern/wm_init_exit.c
branches/ge_dyn_load/source/blender/windowmanager/intern/wm_keymap.c
branches/ge_dyn_load/source/blender/windowmanager/intern/wm_operators.c
branches/ge_dyn_load/source/blender/windowmanager/intern/wm_window.c
branches/ge_dyn_load/source/blender/windowmanager/wm_event_system.h
branches/ge_dyn_load/source/blender/windowmanager/wm_event_types.h
branches/ge_dyn_load/source/creator/CMakeLists.txt
branches/ge_dyn_load/source/creator/SConscript
branches/ge_dyn_load/source/creator/creator.c
branches/ge_dyn_load/source/gameengine/BlenderRoutines/BL_KetsjiEmbedStart.cpp
branches/ge_dyn_load/source/gameengine/BlenderRoutines/CMakeLists.txt
branches/ge_dyn_load/source/gameengine/BlenderRoutines/Makefile
branches/ge_dyn_load/source/gameengine/BlenderRoutines/SConscript
branches/ge_dyn_load/source/gameengine/PyDoc/SConscript
branches/ge_dyn_load/source/nan_warn.mk
branches/ge_dyn_load/source/tools/guess/config.guess
branches/ge_dyn_load/tools/Blender.py
branches/ge_dyn_load/tools/btools.py
Removed Paths:
-------------
branches/ge_dyn_load/source/blender/.obj.Makefile
Modified: branches/ge_dyn_load/CMakeLists.txt
===================================================================
--- branches/ge_dyn_load/CMakeLists.txt 2009-09-25 10:59:36 UTC (rev 23483)
+++ branches/ge_dyn_load/CMakeLists.txt 2009-09-25 11:24:33 UTC (rev 23484)
@@ -51,6 +51,10 @@
SET(EXECUTABLE_OUTPUT_PATH ${CMAKE_BINARY_DIR}/bin)
SET(LIBRARY_OUTPUT_PATH ${CMAKE_BINARY_DIR}/lib)
+# Note! - Could create this from the blender version string
+# ...but thats quite involved, make sure this matches the blender version.
+SET(BLENDER_VERSION 2.5)
+
#-----------------------------------------------------------------------------
# Set default config options
OPTION(WITH_PLAYER "Build Player" OFF)
Modified: branches/ge_dyn_load/SConstruct
===================================================================
--- branches/ge_dyn_load/SConstruct 2009-09-25 10:59:36 UTC (rev 23483)
+++ branches/ge_dyn_load/SConstruct 2009-09-25 11:24:33 UTC (rev 23484)
@@ -186,6 +186,15 @@
SetOption('num_jobs', int(env['BF_NUMJOBS']))
print "Build with %d parallel jobs" % (GetOption('num_jobs'))
+# BLENDERPATH is a unix only option to enable typical style paths this is
+# spesifically a data-dir, which is used a lot but cant replace BF_INSTALLDIR
+# because the blender binary is installed in $BF_INSTALLDIR/bin/blender
+
+if env['WITH_BF_FHS']:
+ BLENDERPATH = os.path.join(env['BF_INSTALLDIR'], 'share', 'blender', env['BF_VERSION'])
+else:
+ BLENDERPATH = env['BF_INSTALLDIR']
+
# disable elbeem (fluidsim) compilation?
if env['BF_NO_ELBEEM'] == 1:
env['CPPFLAGS'].append('-DDISABLE_ELBEEM')
@@ -198,7 +207,7 @@
env['CPPFLAGS'].append('/openmp')
env['CXXFLAGS'].append('/openmp')
else:
- if env['CC'][-3:] == 'icc': # to be able to handle CC=/opt/bla/icc case
+ if env['CC'].endswith('icc'): # to be able to handle CC=/opt/bla/icc case
env.Append(LINKFLAGS=['-openmp', '-static-intel'])
env['CCFLAGS'].append('-openmp')
env['CPPFLAGS'].append('-openmp')
@@ -301,7 +310,7 @@
# lastly we check for root_build_dir ( we should not do before, otherwise we might do wrong builddir
B.root_build_dir = env['BF_BUILDDIR']
-B.doc_build_dir = env['BF_DOCDIR']
+B.doc_build_dir = os.path.join(BLENDERPATH, 'doc')
if not B.root_build_dir[-1]==os.sep:
B.root_build_dir += os.sep
if not B.doc_build_dir[-1]==os.sep:
@@ -426,7 +435,10 @@
source=[dp+os.sep+f for f in df]
blenderinstall.append(env.Install(dir=dir,source=source))
else:
- blenderinstall = env.Install(dir=env['BF_INSTALLDIR'], source=B.program_list)
+ if env['WITH_BF_FHS']: dir= os.path.join(env['BF_INSTALLDIR'], 'bin')
+ else: dir= env['BF_INSTALLDIR']
+
+ blenderinstall = env.Install(dir=dir, source=B.program_list)
#-- .blender
#- dont do .blender and scripts for darwin, it is already in the bundle
@@ -450,7 +462,13 @@
continue
dotblendlist.append(os.path.join(dp, f))
- dottargetlist.append(env['BF_INSTALLDIR']+dp[3:]+os.sep+f)
+ if env['WITH_BF_FHS']: dir= os.path.join(*([BLENDERPATH] + dp.split(os.sep)[2:])) # skip bin/.blender
+ else: dir= os.path.join(*([BLENDERPATH] + dp.split(os.sep)[1:])) # skip bin
+
+ # print dir+ os.sep + f
+ print dir
+ dottargetlist.append(dir + os.sep + f)
+
dotblenderinstall = []
for targetdir,srcfile in zip(dottargetlist, dotblendlist):
@@ -464,8 +482,12 @@
for dp, dn, df in os.walk(scriptpath):
if '.svn' in dn:
dn.remove('.svn')
- dir=env['BF_INSTALLDIR']+'/.blender/'+os.path.basename(scriptpath)+dp[len(scriptpath):]
- source=[dp+os.sep+f for f in df]
+
+ if env['WITH_BF_FHS']: dir = BLENDERPATH
+ else: dir = os.path.join(env['BF_INSTALLDIR'], '.blender')
+ dir += os.sep + os.path.basename(scriptpath) + dp[len(scriptpath):]
+
+ source=[os.path.join(dp, f) for f in df]
scriptinstall.append(env.Install(dir=dir,source=source))
#-- icons
@@ -477,8 +499,8 @@
if '.svn' in tn:
tn.remove('.svn')
for f in tf:
- iconlist.append(tp+os.sep+f)
- icontargetlist.append(env['BF_INSTALLDIR']+tp[19:]+os.sep+f)
+ iconlist.append(os.path.join(tp, f))
+ icontargetlist.append( os.path.join(*([BLENDERPATH] + tp.split(os.sep)[2:] + [f])) )
iconinstall = []
for targetdir,srcfile in zip(icontargetlist, iconlist):
@@ -499,24 +521,25 @@
if '.svn' in tn:
tn.remove('.svn')
for f in tf:
- pluglist.append(tp+os.sep+f)
- plugtargetlist.append(env['BF_INSTALLDIR']+tp[7:]+os.sep+f)
+ pluglist.append(os.path.join(tp, f))
+ plugtargetlist.append( os.path.join(*([BLENDERPATH] + tp.split(os.sep)[1:] + [f])) )
+
# header files for plugins
pluglist.append('source/blender/blenpluginapi/documentation.h')
-plugtargetlist.append(env['BF_INSTALLDIR'] + os.sep + 'plugins' + os.sep + 'include' + os.sep +'documentation.h')
+plugtargetlist.append(os.path.join(BLENDERPATH, 'plugins', 'include', 'documentation.h'))
pluglist.append('source/blender/blenpluginapi/externdef.h')
-plugtargetlist.append(env['BF_INSTALLDIR'] + os.sep + 'plugins' + os.sep + 'include' + os.sep +'externdef.h')
+plugtargetlist.append(os.path.join(BLENDERPATH, 'plugins', 'include', 'externdef.h'))
pluglist.append('source/blender/blenpluginapi/floatpatch.h')
-plugtargetlist.append(env['BF_INSTALLDIR'] + os.sep + 'plugins' + os.sep + 'include' + os.sep +'floatpatch.h')
+plugtargetlist.append(os.path.join(BLENDERPATH, 'plugins', 'include', 'floatpatch.h'))
pluglist.append('source/blender/blenpluginapi/iff.h')
-plugtargetlist.append(env['BF_INSTALLDIR'] + os.sep + 'plugins' + os.sep + 'include' + os.sep +'iff.h')
+plugtargetlist.append(os.path.join(BLENDERPATH, 'plugins', 'include', 'iff.h'))
pluglist.append('source/blender/blenpluginapi/plugin.h')
-plugtargetlist.append(env['BF_INSTALLDIR'] + os.sep + 'plugins' + os.sep + 'include' + os.sep +'plugin.h')
+plugtargetlist.append(os.path.join(BLENDERPATH, 'plugins', 'include', 'plugin.h'))
pluglist.append('source/blender/blenpluginapi/util.h')
-plugtargetlist.append(env['BF_INSTALLDIR'] + os.sep + 'plugins' + os.sep + 'include' + os.sep +'util.h')
+plugtargetlist.append(os.path.join(BLENDERPATH, 'plugins', 'include', 'util.h'))
pluglist.append('source/blender/blenpluginapi/plugin.DEF')
-plugtargetlist.append(env['BF_INSTALLDIR'] + os.sep + 'plugins' + os.sep + 'include' + os.sep + 'plugin.def')
+plugtargetlist.append(os.path.join(BLENDERPATH, 'plugins', 'include', 'plugin.def'))
plugininstall = []
for targetdir,srcfile in zip(plugtargetlist, pluglist):
@@ -531,7 +554,7 @@
for f in tf:
textlist.append(tp+os.sep+f)
-textinstall = env.Install(dir=env['BF_INSTALLDIR'], source=textlist)
+textinstall = env.Install(dir=BLENDERPATH, source=textlist)
if env['OURPLATFORM']=='darwin':
allinstall = [blenderinstall, plugininstall, textinstall]
Modified: branches/ge_dyn_load/config/darwin-config.py
===================================================================
--- branches/ge_dyn_load/config/darwin-config.py 2009-09-25 10:59:36 UTC (rev 23483)
+++ branches/ge_dyn_load/config/darwin-config.py 2009-09-25 11:24:33 UTC (rev 23484)
@@ -274,4 +274,3 @@
BF_BUILDDIR='../build/darwin'
BF_INSTALLDIR='../install/darwin'
-BF_DOCDIR='../install/doc'
Modified: branches/ge_dyn_load/config/irix6-config.py
===================================================================
--- branches/ge_dyn_load/config/irix6-config.py 2009-09-25 10:59:36 UTC (rev 23483)
+++ branches/ge_dyn_load/config/irix6-config.py 2009-09-25 11:24:33 UTC (rev 23484)
@@ -189,7 +189,6 @@
BF_BUILDDIR = '../build/irix6'
BF_INSTALLDIR='../install/irix6'
-BF_DOCDIR='../install/doc'
#Link against pthread
LDIRS = []
Modified: branches/ge_dyn_load/config/linux2-config.py
===================================================================
--- branches/ge_dyn_load/config/linux2-config.py 2009-09-25 10:59:36 UTC (rev 23483)
+++ branches/ge_dyn_load/config/linux2-config.py 2009-09-25 11:24:33 UTC (rev 23484)
@@ -189,9 +189,7 @@
BF_BUILDDIR = '../build/linux2'
BF_INSTALLDIR='../install/linux2'
-BF_DOCDIR='../install/doc'
-
#Link against pthread
PLATFORM_LINKFLAGS = ['-pthread']
Modified: branches/ge_dyn_load/config/linuxcross-config.py
===================================================================
--- branches/ge_dyn_load/config/linuxcross-config.py 2009-09-25 10:59:36 UTC (rev 23483)
+++ branches/ge_dyn_load/config/linuxcross-config.py 2009-09-25 11:24:33 UTC (rev 23484)
@@ -139,4 +139,3 @@
BF_BUILDDIR = '../build/linuxcross'
BF_INSTALLDIR='../install/linuxcross'
-BF_DOCDIR='../install/doc'
Modified: branches/ge_dyn_load/config/openbsd3-config.py
===================================================================
--- branches/ge_dyn_load/config/openbsd3-config.py 2009-09-25 10:59:36 UTC (rev 23483)
+++ branches/ge_dyn_load/config/openbsd3-config.py 2009-09-25 11:24:33 UTC (rev 23484)
@@ -151,4 +151,3 @@
BF_BUILDDIR='../build/openbsd3'
BF_INSTALLDIR='../install/openbsd3'
-BF_DOCDIR='../install/doc'
Modified: branches/ge_dyn_load/config/sunos5-config.py
===================================================================
--- branches/ge_dyn_load/config/sunos5-config.py 2009-09-25 10:59:36 UTC (rev 23483)
+++ branches/ge_dyn_load/config/sunos5-config.py 2009-09-25 11:24:33 UTC (rev 23484)
@@ -165,7 +165,6 @@
BF_BUILDDIR = '../build/sunos5'
BF_INSTALLDIR='../install/sunos5'
-BF_DOCDIR='../install/doc'
PLATFORM_LINKFLAGS = []
Modified: branches/ge_dyn_load/config/win32-mingw-config.py
===================================================================
--- branches/ge_dyn_load/config/win32-mingw-config.py 2009-09-25 10:59:36 UTC (rev 23483)
+++ branches/ge_dyn_load/config/win32-mingw-config.py 2009-09-25 11:24:33 UTC (rev 23484)
@@ -152,4 +152,3 @@
BF_BUILDDIR = '..\\build\\win32-mingw'
BF_INSTALLDIR='..\\install\\win32-mingw'
-BF_DOCDIR = '..\\install\\doc'
Modified: branches/ge_dyn_load/config/win32-vc-config.py
===================================================================
--- branches/ge_dyn_load/config/win32-vc-config.py 2009-09-25 10:59:36 UTC (rev 23483)
+++ branches/ge_dyn_load/config/win32-vc-config.py 2009-09-25 11:24:33 UTC (rev 23484)
@@ -173,4 +173,3 @@
BF_BUILDDIR = '..\\build\\win32-vc'
BF_INSTALLDIR='..\\install\\win32-vc'
-BF_DOCDIR='..\\install\\doc'
Modified: branches/ge_dyn_load/config/win64-vc-config.py
===================================================================
@@ Diff output truncated at 10240 characters. @@
More information about the Bf-blender-cvs
mailing list