Revision: 19895
http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=19895
Author: ben2610
Date: 2009-04-23 09:37:54 +0200 (Thu, 23 Apr 2009)
Log Message:
-----------
svn merge -r 19816:19894
https://svn.blender.org/svnroot/bf-blender/trunk/blender
Modified Paths:
--------------
branches/ge_dev/Makefile
branches/ge_dev/extern/Makefile
branches/ge_dev/extern/ffmpeg/Makefile
branches/ge_dev/extern/ffmpeg/libavcodec/Makefile
branches/ge_dev/extern/ffmpeg/libavcodec/x86/x86inc.asm
branches/ge_dev/po/Makefile
branches/ge_dev/projectfiles_vc9/blender/BPY_python/BPY_python.vcproj
branches/ge_dev/projectfiles_vc9/gameengine/converter/KX_converter.vcproj
branches/ge_dev/projectfiles_vc9/gameengine/rasterizer/RAS_rasterizer.vcproj
branches/ge_dev/projectfiles_vc9/gameengine/rasterizer/openglrasterizer/RAS_openglrasterizer.vcproj
branches/ge_dev/projectfiles_vc9/gameengine/videotexture/TEX_Video.vcproj
branches/ge_dev/release/scripts/lightwave_export.py
branches/ge_dev/source/Makefile
branches/ge_dev/source/blender/blenkernel/BKE_DerivedMesh.h
branches/ge_dev/source/blender/blenkernel/BKE_scene.h
branches/ge_dev/source/blender/blenkernel/bad_level_call_stubs/stubs.c
branches/ge_dev/source/blender/blenkernel/intern/DerivedMesh.c
branches/ge_dev/source/blender/blenkernel/intern/Makefile
branches/ge_dev/source/blender/blenkernel/intern/constraint.c
branches/ge_dev/source/blender/blenkernel/intern/image.c
branches/ge_dev/source/blender/blenkernel/intern/ipo.c
branches/ge_dev/source/blender/blenkernel/intern/modifier.c
branches/ge_dev/source/blender/blenkernel/intern/multires.c
branches/ge_dev/source/blender/blenkernel/intern/node.c
branches/ge_dev/source/blender/blenloader/intern/readfile.c
branches/ge_dev/source/blender/imbuf/intern/openexr/openexr_api.cpp
branches/ge_dev/source/blender/imbuf/intern/rotate.c
branches/ge_dev/source/blender/include/BIF_butspace.h
branches/ge_dev/source/blender/include/BIF_editseq.h
branches/ge_dev/source/blender/include/blendef.h
branches/ge_dev/source/blender/nodes/intern/CMP_nodes/CMP_normalize.c
branches/ge_dev/source/blender/nodes/intern/CMP_nodes/CMP_scale.c
branches/ge_dev/source/blender/nodes/intern/SHD_nodes/SHD_dynamic.c
branches/ge_dev/source/blender/python/BPY_interface.c
branches/ge_dev/source/blender/python/api2_2x/BGL.c
branches/ge_dev/source/blender/python/api2_2x/Geometry.h
branches/ge_dev/source/blender/python/api2_2x/Group.c
branches/ge_dev/source/blender/python/api2_2x/Key.c
branches/ge_dev/source/blender/python/api2_2x/Mathutils.c
branches/ge_dev/source/blender/python/api2_2x/Mathutils.h
branches/ge_dev/source/blender/python/api2_2x/Node.c
branches/ge_dev/source/blender/python/api2_2x/Scene.c
branches/ge_dev/source/blender/python/api2_2x/Texture.c
branches/ge_dev/source/blender/python/api2_2x/Types.c
branches/ge_dev/source/blender/python/api2_2x/Window.c
branches/ge_dev/source/blender/python/api2_2x/doc/Library.py
branches/ge_dev/source/blender/python/api2_2x/euler.c
branches/ge_dev/source/blender/python/api2_2x/gen_utils.c
branches/ge_dev/source/blender/python/api2_2x/gen_utils.h
branches/ge_dev/source/blender/python/api2_2x/matrix.c
branches/ge_dev/source/blender/python/api2_2x/quat.c
branches/ge_dev/source/blender/python/api2_2x/vector.c
branches/ge_dev/source/blender/python/api2_2x/vector.h
branches/ge_dev/source/blender/render/intern/source/convertblender.c
branches/ge_dev/source/blender/render/intern/source/pipeline.c
branches/ge_dev/source/blender/render/intern/source/rayshade.c
branches/ge_dev/source/blender/src/booleanops.c
branches/ge_dev/source/blender/src/buttons_scene.c
branches/ge_dev/source/blender/src/drawobject.c
branches/ge_dev/source/blender/src/editseq.c
branches/ge_dev/source/blender/src/ghostwinlay.c
branches/ge_dev/source/blender/src/header_info.c
branches/ge_dev/source/blender/src/meshtools.c
branches/ge_dev/source/blender/src/sequence.c
branches/ge_dev/source/creator/buildinfo.c
branches/ge_dev/source/gameengine/Converter/BL_ActionActuator.cpp
branches/ge_dev/source/gameengine/Converter/BL_ActionActuator.h
branches/ge_dev/source/gameengine/Converter/BL_ArmatureObject.cpp
branches/ge_dev/source/gameengine/Converter/BL_ArmatureObject.h
branches/ge_dev/source/gameengine/Converter/BL_BlenderDataConversion.cpp
branches/ge_dev/source/gameengine/Converter/BL_DeformableGameObject.cpp
branches/ge_dev/source/gameengine/Converter/BL_DeformableGameObject.h
branches/ge_dev/source/gameengine/Converter/BL_MeshDeformer.h
branches/ge_dev/source/gameengine/Converter/BL_ShapeActionActuator.cpp
branches/ge_dev/source/gameengine/Converter/BL_ShapeActionActuator.h
branches/ge_dev/source/gameengine/Converter/BL_ShapeDeformer.cpp
branches/ge_dev/source/gameengine/Converter/BL_ShapeDeformer.h
branches/ge_dev/source/gameengine/Converter/BL_SkinDeformer.cpp
branches/ge_dev/source/gameengine/Converter/BL_SkinDeformer.h
branches/ge_dev/source/gameengine/Converter/BL_SkinMeshObject.cpp
branches/ge_dev/source/gameengine/Expressions/BoolValue.cpp
branches/ge_dev/source/gameengine/Expressions/EmptyValue.cpp
branches/ge_dev/source/gameengine/Expressions/FloatValue.cpp
branches/ge_dev/source/gameengine/Expressions/IntValue.cpp
branches/ge_dev/source/gameengine/Expressions/ListValue.cpp
branches/ge_dev/source/gameengine/Expressions/ListValue.h
branches/ge_dev/source/gameengine/Expressions/PyObjectPlus.cpp
branches/ge_dev/source/gameengine/Expressions/PyObjectPlus.h
branches/ge_dev/source/gameengine/Expressions/StringValue.cpp
branches/ge_dev/source/gameengine/Expressions/Value.cpp
branches/ge_dev/source/gameengine/Expressions/Value.h
branches/ge_dev/source/gameengine/Expressions/VectorValue.cpp
branches/ge_dev/source/gameengine/GameLogic/SCA_2DFilterActuator.cpp
branches/ge_dev/source/gameengine/GameLogic/SCA_2DFilterActuator.h
branches/ge_dev/source/gameengine/GameLogic/SCA_ANDController.cpp
branches/ge_dev/source/gameengine/GameLogic/SCA_ANDController.h
branches/ge_dev/source/gameengine/GameLogic/SCA_ActuatorSensor.cpp
branches/ge_dev/source/gameengine/GameLogic/SCA_ActuatorSensor.h
branches/ge_dev/source/gameengine/GameLogic/SCA_AlwaysSensor.cpp
branches/ge_dev/source/gameengine/GameLogic/SCA_AlwaysSensor.h
branches/ge_dev/source/gameengine/GameLogic/SCA_DelaySensor.cpp
branches/ge_dev/source/gameengine/GameLogic/SCA_DelaySensor.h
branches/ge_dev/source/gameengine/GameLogic/SCA_ExpressionController.cpp
branches/ge_dev/source/gameengine/GameLogic/SCA_ExpressionController.h
branches/ge_dev/source/gameengine/GameLogic/SCA_IActuator.cpp
branches/ge_dev/source/gameengine/GameLogic/SCA_ILogicBrick.cpp
branches/ge_dev/source/gameengine/GameLogic/SCA_ILogicBrick.h
branches/ge_dev/source/gameengine/GameLogic/SCA_IObject.cpp
branches/ge_dev/source/gameengine/GameLogic/SCA_IObject.h
branches/ge_dev/source/gameengine/GameLogic/SCA_ISensor.cpp
branches/ge_dev/source/gameengine/GameLogic/SCA_ISensor.h
branches/ge_dev/source/gameengine/GameLogic/SCA_JoystickSensor.cpp
branches/ge_dev/source/gameengine/GameLogic/SCA_JoystickSensor.h
branches/ge_dev/source/gameengine/GameLogic/SCA_KeyboardSensor.cpp
branches/ge_dev/source/gameengine/GameLogic/SCA_KeyboardSensor.h
branches/ge_dev/source/gameengine/GameLogic/SCA_MouseSensor.cpp
branches/ge_dev/source/gameengine/GameLogic/SCA_MouseSensor.h
branches/ge_dev/source/gameengine/GameLogic/SCA_NANDController.cpp
branches/ge_dev/source/gameengine/GameLogic/SCA_NANDController.h
branches/ge_dev/source/gameengine/GameLogic/SCA_NORController.cpp
branches/ge_dev/source/gameengine/GameLogic/SCA_NORController.h
branches/ge_dev/source/gameengine/GameLogic/SCA_ORController.cpp
branches/ge_dev/source/gameengine/GameLogic/SCA_ORController.h
branches/ge_dev/source/gameengine/GameLogic/SCA_PropertyActuator.cpp
branches/ge_dev/source/gameengine/GameLogic/SCA_PropertyActuator.h
branches/ge_dev/source/gameengine/GameLogic/SCA_PropertySensor.cpp
branches/ge_dev/source/gameengine/GameLogic/SCA_PropertySensor.h
branches/ge_dev/source/gameengine/GameLogic/SCA_PythonController.cpp
branches/ge_dev/source/gameengine/GameLogic/SCA_RandomActuator.cpp
branches/ge_dev/source/gameengine/GameLogic/SCA_RandomActuator.h
branches/ge_dev/source/gameengine/GameLogic/SCA_RandomSensor.cpp
branches/ge_dev/source/gameengine/GameLogic/SCA_RandomSensor.h
branches/ge_dev/source/gameengine/GameLogic/SCA_XNORController.cpp
branches/ge_dev/source/gameengine/GameLogic/SCA_XNORController.h
branches/ge_dev/source/gameengine/GameLogic/SCA_XORController.cpp
branches/ge_dev/source/gameengine/GameLogic/SCA_XORController.h
branches/ge_dev/source/gameengine/Ketsji/BL_Material.cpp
branches/ge_dev/source/gameengine/Ketsji/BL_Material.h
branches/ge_dev/source/gameengine/Ketsji/BL_Shader.cpp
branches/ge_dev/source/gameengine/Ketsji/BL_Shader.h
branches/ge_dev/source/gameengine/Ketsji/CMakeLists.txt
branches/ge_dev/source/gameengine/Ketsji/KXNetwork/KX_NetworkMessageActuator.cpp
branches/ge_dev/source/gameengine/Ketsji/KXNetwork/KX_NetworkMessageActuator.h
branches/ge_dev/source/gameengine/Ketsji/KXNetwork/KX_NetworkMessageSensor.cpp
branches/ge_dev/source/gameengine/Ketsji/KXNetwork/KX_NetworkMessageSensor.h
branches/ge_dev/source/gameengine/Ketsji/KX_BlenderMaterial.cpp
branches/ge_dev/source/gameengine/Ketsji/KX_BlenderMaterial.h
branches/ge_dev/source/gameengine/Ketsji/KX_CDActuator.cpp
branches/ge_dev/source/gameengine/Ketsji/KX_CDActuator.h
branches/ge_dev/source/gameengine/Ketsji/KX_Camera.cpp
branches/ge_dev/source/gameengine/Ketsji/KX_Camera.h
branches/ge_dev/source/gameengine/Ketsji/KX_CameraActuator.cpp
branches/ge_dev/source/gameengine/Ketsji/KX_CameraActuator.h
branches/ge_dev/source/gameengine/Ketsji/KX_ConstraintActuator.cpp
branches/ge_dev/source/gameengine/Ketsji/KX_ConstraintActuator.h
branches/ge_dev/source/gameengine/Ketsji/KX_ConstraintWrapper.cpp
branches/ge_dev/source/gameengine/Ketsji/KX_ConstraintWrapper.h
branches/ge_dev/source/gameengine/Ketsji/KX_ConvertPhysicsObjects.cpp
branches/ge_dev/source/gameengine/Ketsji/KX_Dome.cpp
branches/ge_dev/source/gameengine/Ketsji/KX_Dome.h
branches/ge_dev/source/gameengine/Ketsji/KX_GameActuator.cpp
branches/ge_dev/source/gameengine/Ketsji/KX_GameActuator.h
branches/ge_dev/source/gameengine/Ketsji/KX_GameObject.cpp
branches/ge_dev/source/gameengine/Ketsji/KX_GameObject.h
branches/ge_dev/source/gameengine/Ketsji/KX_IpoActuator.cpp
branches/ge_dev/source/gameengine/Ketsji/KX_IpoActuator.h
branches/ge_dev/source/gameengine/Ketsji/KX_KetsjiEngine.cpp
branches/ge_dev/source/gameengine/Ketsji/KX_Light.cpp
branches/ge_dev/source/gameengine/Ketsji/KX_Light.h
branches/ge_dev/source/gameengine/Ketsji/KX_MeshProxy.cpp
branches/ge_dev/source/gameengine/Ketsji/KX_MeshProxy.h
branches/ge_dev/source/gameengine/Ketsji/KX_MouseFocusSensor.cpp
branches/ge_dev/source/gameengine/Ketsji/KX_MouseFocusSensor.h
branches/ge_dev/source/gameengine/Ketsji/KX_NearSensor.cpp
branches/ge_dev/source/gameengine/Ketsji/KX_NearSensor.h
branches/ge_dev/source/gameengine/Ketsji/KX_ObjectActuator.cpp
branches/ge_dev/source/gameengine/Ketsji/KX_ObjectActuator.h
branches/ge_dev/source/gameengine/Ketsji/KX_ParentActuator.cpp
branches/ge_dev/source/gameengine/Ketsji/KX_ParentActuator.h
branches/ge_dev/source/gameengine/Ketsji/KX_PhysicsObjectWrapper.cpp
branches/ge_dev/source/gameengine/Ketsji/KX_PhysicsObjectWrapper.h
branches/ge_dev/source/gameengine/Ketsji/KX_PolyProxy.cpp
branches/ge_dev/source/gameengine/Ketsji/KX_PolyProxy.h
branches/ge_dev/source/gameengine/Ketsji/KX_PolygonMaterial.cpp
branches/ge_dev/source/gameengine/Ketsji/KX_PolygonMaterial.h
branches/ge_dev/source/gameengine/Ketsji/KX_PythonInit.cpp
branches/ge_dev/source/gameengine/Ketsji/KX_RadarSensor.cpp
branches/ge_dev/source/gameengine/Ketsji/KX_RadarSensor.h
branches/ge_dev/source/gameengine/Ketsji/KX_RaySensor.cpp
branches/ge_dev/source/gameengine/Ketsji/KX_RaySensor.h
branches/ge_dev/source/gameengine/Ketsji/KX_SCA_AddObjectActuator.cpp
branches/ge_dev/source/gameengine/Ketsji/KX_SCA_AddObjectActuator.h
branches/ge_dev/source/gameengine/Ketsji/KX_SCA_DynamicActuator.cpp
branches/ge_dev/source/gameengine/Ketsji/KX_SCA_DynamicActuator.h
branches/ge_dev/source/gameengine/Ketsji/KX_SCA_EndObjectActuator.cpp
branches/ge_dev/source/gameengine/Ketsji/KX_SCA_EndObjectActuator.h
branches/ge_dev/source/gameengine/Ketsji/KX_SCA_ReplaceMeshActuator.cpp
branches/ge_dev/source/gameengine/Ketsji/KX_SCA_ReplaceMeshActuator.h
branches/ge_dev/source/gameengine/Ketsji/KX_Scene.cpp
branches/ge_dev/source/gameengine/Ketsji/KX_Scene.h
branches/ge_dev/source/gameengine/Ketsji/KX_SceneActuator.cpp
branches/ge_dev/source/gameengine/Ketsji/KX_SceneActuator.h
branches/ge_dev/source/gameengine/Ketsji/KX_SoundActuator.cpp
branches/ge_dev/source/gameengine/Ketsji/KX_SoundActuator.h
branches/ge_dev/source/gameengine/Ketsji/KX_StateActuator.cpp
branches/ge_dev/source/gameengine/Ketsji/KX_StateActuator.h
branches/ge_dev/source/gameengine/Ketsji/KX_TouchSensor.cpp
branches/ge_dev/source/gameengine/Ketsji/KX_TouchSensor.h
branches/ge_dev/source/gameengine/Ketsji/KX_TrackToActuator.cpp
branches/ge_dev/source/gameengine/Ketsji/KX_TrackToActuator.h
branches/ge_dev/source/gameengine/Ketsji/KX_VehicleWrapper.cpp
branches/ge_dev/source/gameengine/Ketsji/KX_VehicleWrapper.h
branches/ge_dev/source/gameengine/Ketsji/KX_VertexProxy.cpp
branches/ge_dev/source/gameengine/Ketsji/KX_VertexProxy.h
branches/ge_dev/source/gameengine/Ketsji/KX_VisibilityActuator.cpp
branches/ge_dev/source/gameengine/Ketsji/KX_VisibilityActuator.h
branches/ge_dev/source/gameengine/Ketsji/SConscript
branches/ge_dev/source/gameengine/PyDoc/KX_GameObject.py
branches/ge_dev/source/gameengine/PyDoc/Rasterizer.py
branches/ge_dev/source/gameengine/Rasterizer/CMakeLists.txt
branches/ge_dev/source/gameengine/Rasterizer/Makefile
branches/ge_dev/source/gameengine/Rasterizer/RAS_Deformer.h
branches/ge_dev/source/gameengine/Rasterizer/RAS_IPolygonMaterial.cpp
branches/ge_dev/source/gameengine/Rasterizer/RAS_IPolygonMaterial.h
branches/ge_dev/source/gameengine/Rasterizer/RAS_IRasterizer.h
branches/ge_dev/source/gameengine/Rasterizer/RAS_MaterialBucket.cpp
branches/ge_dev/source/gameengine/Rasterizer/RAS_MaterialBucket.h
branches/ge_dev/source/gameengine/Rasterizer/RAS_MeshObject.cpp
branches/ge_dev/source/gameengine/Rasterizer/RAS_MeshObject.h
branches/ge_dev/source/gameengine/Rasterizer/RAS_OpenGLRasterizer/CMakeLists.txt
branches/ge_dev/source/gameengine/Rasterizer/RAS_OpenGLRasterizer/Makefile
branches/ge_dev/source/gameengine/Rasterizer/RAS_OpenGLRasterizer/RAS_ListRasterizer.cpp
branches/ge_dev/source/gameengine/Rasterizer/RAS_OpenGLRasterizer/RAS_ListRasterizer.h
branches/ge_dev/source/gameengine/Rasterizer/RAS_OpenGLRasterizer/RAS_OpenGLRasterizer.cpp
branches/ge_dev/source/gameengine/Rasterizer/RAS_OpenGLRasterizer/RAS_OpenGLRasterizer.h
branches/ge_dev/source/gameengine/Rasterizer/RAS_OpenGLRasterizer/RAS_VAOpenGLRasterizer.cpp
branches/ge_dev/source/gameengine/Rasterizer/RAS_OpenGLRasterizer/SConscript
branches/ge_dev/source/gameengine/VideoTexture/BlendType.h
branches/ge_dev/source/gameengine/VideoTexture/Texture.cpp
Added Paths:
-----------
branches/ge_dev/source/gameengine/Converter/BL_ModifierDeformer.cpp
branches/ge_dev/source/gameengine/Converter/BL_ModifierDeformer.h
Removed Paths:
-------------
branches/ge_dev/source/blender/python/api2_2x/point.c
branches/ge_dev/source/blender/python/api2_2x/point.h
Modified: branches/ge_dev/Makefile
===================================================================
--- branches/ge_dev/Makefile 2009-04-23 06:58:02 UTC (rev 19894)
+++ branches/ge_dev/Makefile 2009-04-23 07:37:54 UTC (rev 19895)
@@ -1,3 +1,5 @@
+# -*- mode: gnumakefile; tab-width: 8; indent-tabs-mode: t; -*-
+# vim: tabstop=8
# $Id$
#
# ***** BEGIN GPL LICENSE BLOCK *****
@@ -31,12 +33,11 @@
# If the user wants to override some of the build
# vars they can put it in the file user-def.mk which
# will get included if it exists (please do not commit
-# user-def.mk to cvs).
-
+# user-def.mk to the revision control server).
sinclude user-def.mk
-# To build without openAL, uncomment the following line, or set it as
-# an environment variable, or put it uncommented in user-def.mk:
+# To build without openAL, set it as an environment variable,
+# or put it uncommented in user-def.mk:
# export NAN_NO_OPENAL=true
export NANBLENDERHOME=$(shell pwd)
@@ -44,15 +45,11 @@
SOURCEDIR =
ifeq ($(FREE_WINDOWS),true)
- DIRS ?= dlltool extern intern source
+ DIRS ?= dlltool extern intern source po
+else
+ DIRS ?= extern intern source po
endif
-DIRS ?= extern intern source
-
-ifneq ($(INTERNATIONAL),false)
- DIRS += po
-endif
-
include source/nan_subdirs.mk
.PHONY: release
Modified: branches/ge_dev/extern/Makefile
===================================================================
--- branches/ge_dev/extern/Makefile 2009-04-23 06:58:02 UTC (rev 19894)
+++ branches/ge_dev/extern/Makefile 2009-04-23 07:37:54 UTC (rev 19895)
@@ -49,9 +49,10 @@
DIRS += verse
endif
-ifneq ($(NAN_NO_KETSJI), true)
- DIRS += bullet2
-endif
+# Cloth requires it
+#ifneq ($(NAN_NO_KETSJI), true)
+DIRS += bullet2
+#endif
ifeq ($(WITH_BINRELOC), true)
DIRS += binreloc
Modified: branches/ge_dev/extern/ffmpeg/Makefile
===================================================================
--- branches/ge_dev/extern/ffmpeg/Makefile 2009-04-23 06:58:02 UTC (rev
19894)
+++ branches/ge_dev/extern/ffmpeg/Makefile 2009-04-23 07:37:54 UTC (rev
19895)
@@ -35,7 +35,7 @@
ALLDIRS = libavcodec libavformat libavutil libswscale libavdevice
config::
- ./configure --disable-shared --enable-gpl --enable-zlib --disable-vhook
--disable-ffserver --disable-ffplay --enable-swscale --enable-pthreads
--disable-yasm --disable-bzlib --disable-outdevs --disable-demuxer=alsa
+ ./configure --disable-shared --enable-gpl --enable-zlib --disable-vhook
--disable-ffserver --disable-ffplay --enable-swscale --enable-pthreads
--enable-yasm --disable-bzlib --disable-outdevs --disable-demuxer=alsa
all::
@for i in $(ALLDIRS); do \
echo "====> $(MAKE) $@ in $(SOURCEDIR)/$$i" ;\
Modified: branches/ge_dev/extern/ffmpeg/libavcodec/Makefile
===================================================================
--- branches/ge_dev/extern/ffmpeg/libavcodec/Makefile 2009-04-23 06:58:02 UTC
(rev 19894)
+++ branches/ge_dev/extern/ffmpeg/libavcodec/Makefile 2009-04-23 07:37:54 UTC
(rev 19895)
@@ -1,5 +1,8 @@
include $(SUBDIR)../config.mak
+$(OCGDIR)/extern/ffmpeg/libavcodec/x86/%.o: $(SUBDIR)x86/%.asm
+ $(YASM) $(YASMFLAGS) -I $(<D)/ -o $@ $<
+
NAME = avcodec
FFLIBS = avutil
Modified: branches/ge_dev/extern/ffmpeg/libavcodec/x86/x86inc.asm
===================================================================
--- branches/ge_dev/extern/ffmpeg/libavcodec/x86/x86inc.asm 2009-04-23
06:58:02 UTC (rev 19894)
+++ branches/ge_dev/extern/ffmpeg/libavcodec/x86/x86inc.asm 2009-04-23
07:37:54 UTC (rev 19895)
@@ -399,7 +399,11 @@
; This is needed for ELF, otherwise the GNU linker assumes the stack is
; executable by default.
%ifidn __OUTPUT_FORMAT__,elf
-SECTION .note.GNU-stack noalloc noexec nowrite progbits
+ %ifdef __NASM_MAJOR__
+ section .note.GNU-stack noalloc noexec nowrite progbits
+ %else
+ section ".note.GNU-stack" noalloc noexec nowrite progbits
+ %endif
%endif
%assign FENC_STRIDE 16
Modified: branches/ge_dev/po/Makefile
===================================================================
--- branches/ge_dev/po/Makefile 2009-04-23 06:58:02 UTC (rev 19894)
+++ branches/ge_dev/po/Makefile 2009-04-23 07:37:54 UTC (rev 19895)
@@ -1,3 +1,5 @@
+# -*- mode: gnumakefile; tab-width: 8; indent-tabs-mode: t; -*-
+# vim: tabstop=8
# $Id$
#
# ***** BEGIN GPL LICENSE BLOCK *****
@@ -9,47 +11,51 @@
#
# 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
+# 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.
+# Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
#
# The Original Code is Copyright (C) 2002 by Stichting Blender Foundation,
# Amsterdam, the Netherlands.
# All rights reserved.
#
-# The Original Code is: revision 1.1
+# The Original Code is: revision 1.3
#
-# Contributor(s): Wouter van Heyst
+# Contributor(s): Wouter van Heyst, GSR
#
# ***** END GPL LICENSE BLOCK *****
#
-# po Makefile for blender. Compiles the translations and places them
+# po Makefile for blender. Compiles the translations in the place
# where release can pick them up.
+PO_FILES = $(wildcard *.po)
+
+LINGUAS = $(basename $(PO_FILES))
+
SOURCEDIR = blender/po
include nan_definitions.mk
-LINGUAS = ar bg ca cs de el es fi fr hr it ja ko nl pl pt_BR ro ru sr
s...@latn sv uk zh_CN
-
ifeq ($(OS), darwin)
-DIR = $(OCGDIR)/bin/blender.app/Contents/Resources/locale/$@/LC_MESSAGES/
+ DIR = $(OCGDIR)/bin/blender.app/Contents/Resources/locale/
else
-DIR = $(OCGDIR)/bin/.blender/locale/$@/LC_MESSAGES/
+ DIR = $(OCGDIR)/bin/.blender/locale/
endif
-all debug:: $(LINGUAS)
+LINGUAS_DEST= $(foreach LINGUA,
$(LINGUAS),$(DIR)$(LINGUA)/LC_MESSAGES/blender.mo)
+$(DIR)%/LC_MESSAGES/blender.mo: %.po
+ mkdir -p $(@D)
+ msgfmt -o $@ $<
+ @cmp $@ $(NANBLENDERHOME)/bin/.blender/locale/$(basename
$<)/LC_MESSAGES/blender.mo \
+ || ( echo Mismatch between generated and commited $(basename $<).mo
catalog && \
+ rm -f $@ && false )
+
+all debug:: $(LINGUAS_DEST)
+# Just trigger the deps
+
clean::
-ifeq ($(OS), darwin)
- rm -rf $(OCGDIR)/bin/blender.app/Contents/Resources/locale/
-else
- rm -rf $(OCGDIR)/bin/.blender/locale/
-endif
-
-$(LINGUAS):
- mkdir -p $(DIR)
- msgfmt -o $(DIR)/blender.mo [email protected]
+ rm -rf $(DIR)
Modified: branches/ge_dev/projectfiles_vc9/blender/BPY_python/BPY_python.vcproj
===================================================================
--- branches/ge_dev/projectfiles_vc9/blender/BPY_python/BPY_python.vcproj
2009-04-23 06:58:02 UTC (rev 19894)
+++ branches/ge_dev/projectfiles_vc9/blender/BPY_python/BPY_python.vcproj
2009-04-23 07:37:54 UTC (rev 19895)
@@ -590,10 +590,6 @@
>
</File>
<File
-
RelativePath="..\..\..\source\blender\python\api2_2x\point.c"
- >
- </File>
- <File
RelativePath="..\..\..\source\blender\python\api2_2x\quat.c"
>
</File>
@@ -883,10 +879,6 @@
>
</File>
<File
-
RelativePath="..\..\..\source\blender\python\api2_2x\point.h"
- >
- </File>
- <File
RelativePath="..\..\..\source\blender\python\api2_2x\quat.h"
>
</File>
Modified:
branches/ge_dev/projectfiles_vc9/gameengine/converter/KX_converter.vcproj
===================================================================
--- branches/ge_dev/projectfiles_vc9/gameengine/converter/KX_converter.vcproj
2009-04-23 06:58:02 UTC (rev 19894)
+++ branches/ge_dev/projectfiles_vc9/gameengine/converter/KX_converter.vcproj
2009-04-23 07:37:54 UTC (rev 19895)
@@ -480,10 +480,6 @@
>
</File>
<File
-
RelativePath="..\..\..\source\gameengine\Converter\BL_ArmatureObject.cpp"
- >
- </File>
- <File
RelativePath="..\..\..\source\gameengine\Converter\BL_BlenderDataConversion.cpp"
>
</File>
@@ -496,6 +492,10 @@
>
</File>
<File
+
RelativePath="..\..\..\source\gameengine\Converter\BL_ModifierDeformer.cpp"
+ >
+ </File>
+ <File
RelativePath="..\..\..\source\gameengine\Converter\BL_ShapeActionActuator.cpp"
>
</File>
@@ -553,6 +553,10 @@
>
</File>
<File
+
RelativePath="..\..\..\source\gameengine\Converter\BL_ArmatureObject.cpp"
+ >
+ </File>
+ <File
RelativePath="..\..\..\source\gameengine\Converter\BL_ArmatureObject.h"
>
</File>
@@ -569,6 +573,10 @@
>
</File>
<File
+
RelativePath="..\..\..\source\gameengine\Converter\BL_ModifierDeformer.h"
+ >
+ </File>
+ <File
RelativePath="..\..\..\source\gameengine\Converter\BL_ShapeActionActuator.h"
>
</File>
Modified:
branches/ge_dev/projectfiles_vc9/gameengine/rasterizer/RAS_rasterizer.vcproj
===================================================================
---
branches/ge_dev/projectfiles_vc9/gameengine/rasterizer/RAS_rasterizer.vcproj
2009-04-23 06:58:02 UTC (rev 19894)
+++
branches/ge_dev/projectfiles_vc9/gameengine/rasterizer/RAS_rasterizer.vcproj
2009-04-23 07:37:54 UTC (rev 19895)
@@ -4,6 +4,7 @@
Version="9,00"
Name="RAS_rasterizer"
ProjectGUID="{51FB3D48-2467-4BFA-A321-D848252B437E}"
+ RootNamespace="RAS_rasterizer"
TargetFrameworkVersion="131072"
>
<Platforms>
@@ -42,7 +43,7 @@
<Tool
Name="VCCLCompilerTool"
Optimization="0"
-
AdditionalIncludeDirectories="..\..\..\..\build\msvc_9\intern\moto\include;..\..\..\..\build\msvc_9\intern\string\include;..\..\..\..\build\msvc_9\extern\glew\include;..\..\..\source\kernel\gen_system;..\..\..\source\gameengine\Expressions;..\..\..\..\lib\windows\python\include\python2.5"
+
AdditionalIncludeDirectories="..\..\..\..\build\msvc_9\intern\moto\include;..\..\..\..\build\msvc_9\intern\string\include;..\..\..\..\build\msvc_9\extern\glew\include;..\..\..\source\kernel\gen_system;..\..\..\source\gameengine\Expressions;..\..\..\..\lib\windows\python\include\python2.5;..\..\..\source\blender\makesdna"
PreprocessorDefinitions="_DEBUG;WIN32;_LIB;WITH_GLEXT"
BasicRuntimeChecks="3"
RuntimeLibrary="1"
@@ -117,7 +118,7 @@
<Tool
Name="VCCLCompilerTool"
InlineFunctionExpansion="1"
@@ Diff output truncated at 10240 characters. @@
_______________________________________________
Bf-blender-cvs mailing list
[email protected]
http://lists.blender.org/mailman/listinfo/bf-blender-cvs
