[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [13324] branches/cloth/blender: svn merge -r 13240:13323 https://svn.blender.org/svnroot/bf-blender/trunk/ blender
Daniel Genrich
daniel.genrich at gmx.net
Mon Jan 21 03:42:47 CET 2008
Revision: 13324
http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=13324
Author: genscher
Date: 2008-01-21 03:42:42 +0100 (Mon, 21 Jan 2008)
Log Message:
-----------
svn merge -r 13240:13323 https://svn.blender.org/svnroot/bf-blender/trunk/blender
Modified Paths:
--------------
branches/cloth/blender/CMakeLists.txt
branches/cloth/blender/config/linux2-config.py
branches/cloth/blender/config/win32-vc-config.py
branches/cloth/blender/extern/CMakeLists.txt
branches/cloth/blender/extern/Makefile
branches/cloth/blender/extern/SConscript
branches/cloth/blender/intern/bmfont/BMF_Api.h
branches/cloth/blender/intern/bmfont/intern/BMF_Api.cpp
branches/cloth/blender/intern/bmfont/intern/BMF_BitmapFont.cpp
branches/cloth/blender/intern/bmfont/intern/BMF_BitmapFont.h
branches/cloth/blender/release/Makefile
branches/cloth/blender/release/scripts/export_m3g.py
branches/cloth/blender/release/scripts/import_dxf.py
branches/cloth/blender/release/scripts/x3d_export.py
branches/cloth/blender/source/Makefile
branches/cloth/blender/source/blender/blenkernel/BKE_action.h
branches/cloth/blender/source/blender/blenkernel/BKE_blender.h
branches/cloth/blender/source/blender/blenkernel/BKE_group.h
branches/cloth/blender/source/blender/blenkernel/BKE_image.h
branches/cloth/blender/source/blender/blenkernel/BKE_node.h
branches/cloth/blender/source/blender/blenkernel/BKE_object.h
branches/cloth/blender/source/blender/blenkernel/BKE_particle.h
branches/cloth/blender/source/blender/blenkernel/BKE_sculpt.h
branches/cloth/blender/source/blender/blenkernel/intern/action.c
branches/cloth/blender/source/blender/blenkernel/intern/anim.c
branches/cloth/blender/source/blender/blenkernel/intern/blender.c
branches/cloth/blender/source/blender/blenkernel/intern/constraint.c
branches/cloth/blender/source/blender/blenkernel/intern/depsgraph.c
branches/cloth/blender/source/blender/blenkernel/intern/effect.c
branches/cloth/blender/source/blender/blenkernel/intern/group.c
branches/cloth/blender/source/blender/blenkernel/intern/image.c
branches/cloth/blender/source/blender/blenkernel/intern/modifier.c
branches/cloth/blender/source/blender/blenkernel/intern/node.c
branches/cloth/blender/source/blender/blenkernel/intern/object.c
branches/cloth/blender/source/blender/blenkernel/intern/particle.c
branches/cloth/blender/source/blender/blenkernel/intern/particle_system.c
branches/cloth/blender/source/blender/blenkernel/intern/scene.c
branches/cloth/blender/source/blender/blenkernel/intern/world.c
branches/cloth/blender/source/blender/blenlib/BLI_blenlib.h
branches/cloth/blender/source/blender/blenlib/SConscript
branches/cloth/blender/source/blender/blenlib/intern/Makefile
branches/cloth/blender/source/blender/blenlib/intern/fileops.c
branches/cloth/blender/source/blender/blenlib/intern/util.c
branches/cloth/blender/source/blender/blenloader/intern/readfile.c
branches/cloth/blender/source/blender/blenloader/intern/writefile.c
branches/cloth/blender/source/blender/imbuf/intern/allocimbuf.c
branches/cloth/blender/source/blender/imbuf/intern/anim.c
branches/cloth/blender/source/blender/imbuf/intern/dds/DirectDrawSurface.cpp
branches/cloth/blender/source/blender/imbuf/intern/imageprocess.c
branches/cloth/blender/source/blender/include/BDR_drawaction.h
branches/cloth/blender/source/blender/include/BDR_editobject.h
branches/cloth/blender/source/blender/include/BDR_sculptmode.h
branches/cloth/blender/source/blender/include/BIF_editaction.h
branches/cloth/blender/source/blender/include/BIF_editparticle.h
branches/cloth/blender/source/blender/include/BIF_editseq.h
branches/cloth/blender/source/blender/include/BSE_editaction_types.h
branches/cloth/blender/source/blender/include/butspace.h
branches/cloth/blender/source/blender/include/transform.h
branches/cloth/blender/source/blender/makesdna/DNA_action_types.h
branches/cloth/blender/source/blender/makesdna/DNA_material_types.h
branches/cloth/blender/source/blender/makesdna/DNA_object_types.h
branches/cloth/blender/source/blender/makesdna/DNA_particle_types.h
branches/cloth/blender/source/blender/makesdna/DNA_scene_types.h
branches/cloth/blender/source/blender/makesdna/DNA_space_types.h
branches/cloth/blender/source/blender/makesdna/DNA_userdef_types.h
branches/cloth/blender/source/blender/makesdna/DNA_world_types.h
branches/cloth/blender/source/blender/nodes/intern/CMP_nodes/CMP_image.c
branches/cloth/blender/source/blender/python/api2_2x/Effect.c
branches/cloth/blender/source/blender/python/api2_2x/Group.c
branches/cloth/blender/source/blender/python/api2_2x/doc/Ipo.py
branches/cloth/blender/source/blender/python/api2_2x/doc/Render.py
branches/cloth/blender/source/blender/python/api2_2x/sceneRender.c
branches/cloth/blender/source/blender/render/extern/include/RE_shader_ext.h
branches/cloth/blender/source/blender/render/intern/include/render_types.h
branches/cloth/blender/source/blender/render/intern/include/renderdatabase.h
branches/cloth/blender/source/blender/render/intern/include/shadbuf.h
branches/cloth/blender/source/blender/render/intern/include/shading.h
branches/cloth/blender/source/blender/render/intern/source/convertblender.c
branches/cloth/blender/source/blender/render/intern/source/pipeline.c
branches/cloth/blender/source/blender/render/intern/source/pixelshading.c
branches/cloth/blender/source/blender/render/intern/source/rendercore.c
branches/cloth/blender/source/blender/render/intern/source/renderdatabase.c
branches/cloth/blender/source/blender/render/intern/source/shadbuf.c
branches/cloth/blender/source/blender/render/intern/source/shadeinput.c
branches/cloth/blender/source/blender/render/intern/source/shadeoutput.c
branches/cloth/blender/source/blender/render/intern/source/strand.c
branches/cloth/blender/source/blender/render/intern/source/texture.c
branches/cloth/blender/source/blender/render/intern/source/zbuf.c
branches/cloth/blender/source/blender/src/buttons_editing.c
branches/cloth/blender/source/blender/src/buttons_object.c
branches/cloth/blender/source/blender/src/buttons_scene.c
branches/cloth/blender/source/blender/src/buttons_shading.c
branches/cloth/blender/source/blender/src/drawaction.c
branches/cloth/blender/source/blender/src/drawarmature.c
branches/cloth/blender/source/blender/src/drawipo.c
branches/cloth/blender/source/blender/src/drawnode.c
branches/cloth/blender/source/blender/src/drawobject.c
branches/cloth/blender/source/blender/src/drawseq.c
branches/cloth/blender/source/blender/src/drawview.c
branches/cloth/blender/source/blender/src/editaction.c
branches/cloth/blender/source/blender/src/editgroup.c
branches/cloth/blender/source/blender/src/editimasel.c
branches/cloth/blender/source/blender/src/editipo.c
branches/cloth/blender/source/blender/src/editobject.c
branches/cloth/blender/source/blender/src/editparticle.c
branches/cloth/blender/source/blender/src/editseq.c
branches/cloth/blender/source/blender/src/filesel.c
branches/cloth/blender/source/blender/src/header_action.c
branches/cloth/blender/source/blender/src/header_filesel.c
branches/cloth/blender/source/blender/src/header_imasel.c
branches/cloth/blender/source/blender/src/header_view3d.c
branches/cloth/blender/source/blender/src/outliner.c
branches/cloth/blender/source/blender/src/poselib.c
branches/cloth/blender/source/blender/src/renderwin.c
branches/cloth/blender/source/blender/src/resources.c
branches/cloth/blender/source/blender/src/sculptmode.c
branches/cloth/blender/source/blender/src/sequence.c
branches/cloth/blender/source/blender/src/space.c
branches/cloth/blender/source/blender/src/toolbox.c
branches/cloth/blender/source/blender/src/transform.c
branches/cloth/blender/source/blender/src/transform_conversions.c
branches/cloth/blender/source/blender/src/transform_snap.c
branches/cloth/blender/source/blender/src/usiblender.c
branches/cloth/blender/source/blender/src/view.c
branches/cloth/blender/source/creator/CMakeLists.txt
branches/cloth/blender/source/creator/Makefile
branches/cloth/blender/source/creator/SConscript
branches/cloth/blender/source/creator/creator.c
branches/cloth/blender/source/nan_definitions.mk
branches/cloth/blender/tools/btools.py
Added Paths:
-----------
branches/cloth/blender/extern/binreloc/
branches/cloth/blender/extern/binreloc/CMakeLists.txt
branches/cloth/blender/extern/binreloc/Makefile
branches/cloth/blender/extern/binreloc/SConscript
branches/cloth/blender/extern/binreloc/binreloc.c
branches/cloth/blender/extern/binreloc/include/
branches/cloth/blender/extern/binreloc/include/binreloc.h
branches/cloth/blender/release/getversion.py
branches/cloth/blender/source/blender/include/BIF_radialcontrol.h
branches/cloth/blender/source/blender/render/intern/include/occlusion.h
branches/cloth/blender/source/blender/render/intern/source/occlusion.c
branches/cloth/blender/source/blender/src/radialcontrol.c
Removed Paths:
-------------
branches/cloth/blender/extern/binreloc/CMakeLists.txt
branches/cloth/blender/extern/binreloc/Makefile
branches/cloth/blender/extern/binreloc/SConscript
branches/cloth/blender/extern/binreloc/binreloc.c
branches/cloth/blender/extern/binreloc/include/
branches/cloth/blender/extern/binreloc/include/binreloc.h
Modified: branches/cloth/blender/CMakeLists.txt
===================================================================
--- branches/cloth/blender/CMakeLists.txt 2008-01-21 02:23:03 UTC (rev 13323)
+++ branches/cloth/blender/CMakeLists.txt 2008-01-21 02:42:42 UTC (rev 13324)
@@ -68,6 +68,7 @@
OPTION(WITH_OPENAL "Enable OpenAL Support (http://www.openal.org)" ON)
OPTION(YESIAMSTUPID "Enable execution on 64-bit platforms" OFF)
OPTION(WITH_OPENMP "Enable OpenMP (has to be supported by the compiler)" OFF)
+OPTION(WITH_BINRELOC "Enable binreloc filepath support" OFF)
IF(NOT WITH_GAMEENGINE AND WITH_PLAYER)
MESSAGE("WARNING: WITH_PLAYER needs WITH_GAMEENGINE")
@@ -264,6 +265,9 @@
SET(FFMPEG_LIB avcodec-51 avformat-51 avutil-49)
SET(FFMPEG_LIBPATH ${FFMPEG}/lib)
+ SET(BINRELC ${LIBDIR}/binreloc)
+ SET(BINRELC_INC ${BINRELOC}/include)
+
SET(LLIBS kernel32 user32 gdi32 comdlg32 advapi32 shell32 ole32 oleaut32 uuid ws2_32 vfw32 winmm)
IF(WITH_OPENAL)
SET(LLIBS ${LLIBS} dxguid)
Modified: branches/cloth/blender/config/linux2-config.py
===================================================================
--- branches/cloth/blender/config/linux2-config.py 2008-01-21 02:23:03 UTC (rev 13323)
+++ branches/cloth/blender/config/linux2-config.py 2008-01-21 02:42:42 UTC (rev 13324)
@@ -114,6 +114,8 @@
BF_ICONV_LIB = 'iconv'
BF_ICONV_LIBPATH = '${BF_ICONV}/lib'
+WITH_BF_BINRELOC = 'true'
+
# enable ffmpeg support
WITH_BF_FFMPEG = 'true' # -DWITH_FFMPEG
BF_FFMPEG = '#extern/ffmpeg'
Modified: branches/cloth/blender/config/win32-vc-config.py
===================================================================
--- branches/cloth/blender/config/win32-vc-config.py 2008-01-21 02:23:03 UTC (rev 13323)
+++ branches/cloth/blender/config/win32-vc-config.py 2008-01-21 02:42:42 UTC (rev 13324)
@@ -106,6 +106,8 @@
WITH_BF_YAFRAY = 'true'
+WITH_BF_BINRELOC = 'false'
+
#WITH_BF_NSPR = 'true'
#BF_NSPR = $(LIBDIR)/nspr
#BF_NSPR_INC = -I$(BF_NSPR)/include -I$(BF_NSPR)/include/nspr
Modified: branches/cloth/blender/extern/CMakeLists.txt
===================================================================
--- branches/cloth/blender/extern/CMakeLists.txt 2008-01-21 02:23:03 UTC (rev 13323)
+++ branches/cloth/blender/extern/CMakeLists.txt 2008-01-21 02:42:42 UTC (rev 13324)
@@ -43,3 +43,6 @@
SUBDIRS(verse)
ENDIF(WITH_VERSE)
+if(WITH_BINRELOC)
+ SUBDIRS(binreloc)
+ENDIF(WITH_BINRELOC)
Modified: branches/cloth/blender/extern/Makefile
===================================================================
--- branches/cloth/blender/extern/Makefile 2008-01-21 02:23:03 UTC (rev 13323)
+++ branches/cloth/blender/extern/Makefile 2008-01-21 02:42:42 UTC (rev 13324)
@@ -56,6 +56,10 @@
DIRS += bullet2
endif
+ifeq ($(WITH_BINRELOC), true)
+ DIRS += binreloc
+endif
+
TARGET =
ifneq ($(OS),irix)
TARGET=solid
Modified: branches/cloth/blender/extern/SConscript
===================================================================
--- branches/cloth/blender/extern/SConscript 2008-01-21 02:23:03 UTC (rev 13323)
+++ branches/cloth/blender/extern/SConscript 2008-01-21 02:42:42 UTC (rev 13324)
@@ -17,3 +17,6 @@
if env['WITH_BF_FFMPEG'] and env['BF_FFMPEG_LIB'] == '':
SConscript(['ffmpeg/SConscript']);
+
+if env['OURPLATFORM'] == 'linux2':
+ SConscript(['binreloc/SConscript']);
\ No newline at end of file
Copied: branches/cloth/blender/extern/binreloc (from rev 13323, trunk/blender/extern/binreloc)
Deleted: branches/cloth/blender/extern/binreloc/CMakeLists.txt
===================================================================
--- trunk/blender/extern/binreloc/CMakeLists.txt 2008-01-21 02:23:03 UTC (rev 13323)
+++ branches/cloth/blender/extern/binreloc/CMakeLists.txt 2008-01-21 02:42:42 UTC (rev 13324)
@@ -1,26 +0,0 @@
-# ***** BEGIN GPL LICENSE BLOCK *****
-#
-# This program is free software; you can redistribute it and/or
-# modify it under the terms of the GNU General Public License
-# as published by the Free Software Foundation; either version 2
-# of the License, or (at your option) any later version.
-#
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program; if not, write to the Free Software Foundation,
-# Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
-#
-# The Original Code is Copyright (C) 2008 by The Blender Foundation
-# All rights reserved.
-#
-
-SET(INC ./include ${WINTAB_INC})
-ADD_DEFINITIONS(-DWITH_BINRELOC)
-FILE(GLOB SRC *.c)
-
-BLENDERLIB(binreloc "${SRC}" "${INC}")
-#, libtype=['core','player'], priority = [25,15] )
Copied: branches/cloth/blender/extern/binreloc/CMakeLists.txt (from rev 13323, trunk/blender/extern/binreloc/CMakeLists.txt)
===================================================================
--- branches/cloth/blender/extern/binreloc/CMakeLists.txt (rev 0)
+++ branches/cloth/blender/extern/binreloc/CMakeLists.txt 2008-01-21 02:42:42 UTC (rev 13324)
@@ -0,0 +1,26 @@
+# ***** BEGIN GPL LICENSE BLOCK *****
+#
+# This program is free software; you can redistribute it and/or
+# modify it under the terms of the GNU General Public License
+# as published by the Free Software Foundation; either version 2
+# of the License, or (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program; if not, write to the Free Software Foundation,
+# Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+#
+# The Original Code is Copyright (C) 2008 by The Blender Foundation
+# All rights reserved.
+#
+
+SET(INC ./include ${WINTAB_INC})
+ADD_DEFINITIONS(-DWITH_BINRELOC)
+FILE(GLOB SRC *.c)
+
+BLENDERLIB(binreloc "${SRC}" "${INC}")
+#, libtype=['core','player'], priority = [25,15] )
Deleted: branches/cloth/blender/extern/binreloc/Makefile
===================================================================
--- trunk/blender/extern/binreloc/Makefile 2008-01-21 02:23:03 UTC (rev 13323)
+++ branches/cloth/blender/extern/binreloc/Makefile 2008-01-21 02:42:42 UTC (rev 13324)
@@ -1,37 +0,0 @@
-#
-# ***** BEGIN GPL LICENSE BLOCK *****
-#
-# This program is free software; you can redistribute it and/or
-# modify it under the terms of the GNU General Public License
-# as published by the Free Software Foundation; either version 2
-# of the License, or (at your option) any later version.
-#
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program; if not, write to the Free Software Foundation,
-# Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
-#
-# The Original Code is Copyright (C) 2008 by The Blender Foundation
-# All rights reserved.
-#
-#
-
-LIBNAME = binreloc
-DIR = $(OCGDIR)/extern/$(LIBNAME)
-
-include nan_definitions.mk
-
-CPPFLAGS += -I./include
-
-
-include nan_compile.mk
-
-
-install: all debug
- @[ -d $(DIR) ] || mkdir $(DIR)
- @[ -d $(DIR)/include ] || mkdir $(DIR)/include
- @../../intern/tools/cpifdiff.sh include/*.h $(DIR)/include/
Copied: branches/cloth/blender/extern/binreloc/Makefile (from rev 13323, trunk/blender/extern/binreloc/Makefile)
===================================================================
--- branches/cloth/blender/extern/binreloc/Makefile (rev 0)
+++ branches/cloth/blender/extern/binreloc/Makefile 2008-01-21 02:42:42 UTC (rev 13324)
@@ -0,0 +1,37 @@
+#
+# ***** BEGIN GPL LICENSE BLOCK *****
+#
+# This program is free software; you can redistribute it and/or
+# modify it under the terms of the GNU General Public License
+# as published by the Free Software Foundation; either version 2
+# of the License, or (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program; if not, write to the Free Software Foundation,
+# Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+#
+# The Original Code is Copyright (C) 2008 by The Blender Foundation
+# All rights reserved.
+#
+#
+
+LIBNAME = binreloc
+DIR = $(OCGDIR)/extern/$(LIBNAME)
+
+include nan_definitions.mk
+
+CPPFLAGS += -I./include
+
+
+include nan_compile.mk
+
+
+install: all debug
+ @[ -d $(DIR) ] || mkdir $(DIR)
+ @[ -d $(DIR)/include ] || mkdir $(DIR)/include
+ @../../intern/tools/cpifdiff.sh include/*.h $(DIR)/include/
Deleted: branches/cloth/blender/extern/binreloc/SConscript
===================================================================
--- trunk/blender/extern/binreloc/SConscript 2008-01-21 02:23:03 UTC (rev 13323)
+++ branches/cloth/blender/extern/binreloc/SConscript 2008-01-21 02:42:42 UTC (rev 13324)
@@ -1,13 +0,0 @@
-#!/usr/bin/python
-import sys
-import os
-
-Import('env')
-defs = 'ENABLE_BINRELOC'
-cflags = []
-
-sources = ['binreloc.c']
-incs = 'include'
-
-env.BlenderLib ( 'extern_binreloc', sources, Split(incs), Split(defs), libtype=['intern','player'], priority=[36, 114], compileflags = cflags)
-
Copied: branches/cloth/blender/extern/binreloc/SConscript (from rev 13323, trunk/blender/extern/binreloc/SConscript)
===================================================================
--- branches/cloth/blender/extern/binreloc/SConscript (rev 0)
+++ branches/cloth/blender/extern/binreloc/SConscript 2008-01-21 02:42:42 UTC (rev 13324)
@@ -0,0 +1,13 @@
+#!/usr/bin/python
+import sys
+import os
+
+Import('env')
+defs = 'ENABLE_BINRELOC'
+cflags = []
+
+sources = ['binreloc.c']
+incs = 'include'
+
@@ Diff output truncated at 10240 characters. @@
More information about the Bf-blender-cvs
mailing list