Revision: 23492
http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=23492
Author: campbellbarton
Date: 2009-09-25 18:57:30 +0200 (Fri, 25 Sep 2009)
Log Message:
-----------
files that somehow didnt get merged
Modified Paths:
--------------
branches/ge_dyn_load/intern/audaspace/make/msvc_9_0/audaspace.vcproj
branches/ge_dyn_load/projectfiles_vc9/blender/editors/ED_editors.vcproj
branches/ge_dyn_load/projectfiles_vc9/blender/imbuf/BL_imbuf.vcproj
branches/ge_dyn_load/projectfiles_vc9/blender/makesrna/RNA_makesrna.vcproj
branches/ge_dyn_load/projectfiles_vc9/blender/makesrna/RNA_rna.vcproj
branches/ge_dyn_load/projectfiles_vc9/gameengine/videotexture/TEX_Video.vcproj
branches/ge_dyn_load/release/io/engine_render_pov.py
branches/ge_dyn_load/release/io/export_ply.py
branches/ge_dyn_load/release/ui/buttons_data_text.py
branches/ge_dyn_load/release/ui/buttons_material.py
branches/ge_dyn_load/release/ui/buttons_physics_fluid.py
branches/ge_dyn_load/release/ui/buttons_scene.py
branches/ge_dyn_load/release/ui/space_userpref.py
branches/ge_dyn_load/release/ui/space_view3d_toolbar.py
branches/ge_dyn_load/source/blender/editors/space_graph/graph_draw.c
branches/ge_dyn_load/source/blender/editors/space_graph/graph_select.c
branches/ge_dyn_load/source/gameengine/GameLogic/SCA_ActuatorEventManager.cpp
branches/ge_dyn_load/source/gameengine/Ketsji/KX_PythonInit.cpp
Modified: branches/ge_dyn_load/intern/audaspace/make/msvc_9_0/audaspace.vcproj
===================================================================
--- branches/ge_dyn_load/intern/audaspace/make/msvc_9_0/audaspace.vcproj
2009-09-25 16:43:11 UTC (rev 23491)
+++ branches/ge_dyn_load/intern/audaspace/make/msvc_9_0/audaspace.vcproj
2009-09-25 16:57:30 UTC (rev 23492)
@@ -44,7 +44,7 @@
Name="VCCLCompilerTool"
Optimization="2"
InlineFunctionExpansion="2"
-
AdditionalIncludeDirectories="..\..;..\..\ffmpeg;..\..\FX;..\..\intern;..\..\OpenAL;..\..\SDL;..\..\SRC;..\..\..\..\..\lib\windows\pthreads\include;..\..\..\..\..\lib\windows\samplerate\include;..\..\..\..\..\lib\windows\ffmpeg\include;..\..\..\..\..\lib\windows\sdl\include;..\..\..\..\..\lib\windows\openal\include;..\..\..\..\..\lib\windows\jack\include"
+
AdditionalIncludeDirectories="..\..;..\..\ffmpeg;..\..\FX;..\..\intern;..\..\OpenAL;..\..\SDL;..\..\SRC;..\..\sndfile;..\..\..\..\..\lib\windows\pthreads\include;..\..\..\..\..\lib\windows\samplerate\include;..\..\..\..\..\lib\windows\ffmpeg\include;..\..\..\..\..\lib\windows\ffmpeg\include\msvc;..\..\..\..\..\lib\windows\sdl\include;..\..\..\..\..\lib\windows\openal\include;..\..\..\..\..\lib\windows\jack\include;..\..\..\..\..\lib\windows\sndfile\include"
PreprocessorDefinitions="WIN32,NDEBUG,_LIB,WITH_FFMPEG,WITH_SDL,WITH_OPENAL"
StringPooling="true"
RuntimeLibrary="0"
@@ -118,7 +118,7 @@
<Tool
Name="VCCLCompilerTool"
Optimization="0"
-
AdditionalIncludeDirectories="..\..;..\..\ffmpeg;..\..\FX;..\..\intern;..\..\OpenAL;..\..\SDL;..\..\SRC;..\..\..\..\..\lib\windows\pthreads\include;..\..\..\..\..\lib\windows\samplerate\include;..\..\..\..\..\lib\windows\ffmpeg\include;..\..\..\..\..\lib\windows\sdl\include;..\..\..\..\..\lib\windows\openal\include;..\..\..\..\..\lib\windows\jack\include"
+
AdditionalIncludeDirectories="..\..;..\..\ffmpeg;..\..\FX;..\..\intern;..\..\OpenAL;..\..\SDL;..\..\SRC;..\..\sndfile;..\..\..\..\..\lib\windows\pthreads\include;..\..\..\..\..\lib\windows\samplerate\include;..\..\..\..\..\lib\windows\ffmpeg\include;..\..\..\..\..\lib\windows\ffmpeg\include\msvc;..\..\..\..\..\lib\windows\sdl\include;..\..\..\..\..\lib\windows\openal\include;..\..\..\..\..\lib\windows\jack\include;..\..\..\..\..\lib\windows\sndfile\include"
PreprocessorDefinitions="WIN32,_DEBUG,_LIB,WITH_FFMPEG,WITH_SDL,WITH_OPENAL"
BasicRuntimeChecks="3"
RuntimeLibrary="1"
@@ -193,7 +193,7 @@
<Tool
Name="VCCLCompilerTool"
InlineFunctionExpansion="2"
-
AdditionalIncludeDirectories="..\..;..\..\ffmpeg;..\..\FX;..\..\intern;..\..\OpenAL;..\..\SDL;..\..\SRC;..\..\..\..\..\lib\windows\pthreads\include;..\..\..\..\..\lib\windows\samplerate\include;..\..\..\..\..\lib\windows\ffmpeg\include;..\..\..\..\..\lib\windows\sdl\include;..\..\..\..\..\lib\windows\openal\include;..\..\..\..\..\lib\windows\jack\include"
+
AdditionalIncludeDirectories="..\..;..\..\ffmpeg;..\..\FX;..\..\intern;..\..\OpenAL;..\..\SDL;..\..\SRC;..\..\sndfile;..\..\..\..\..\lib\windows\pthreads\include;..\..\..\..\..\lib\windows\samplerate\include;..\..\..\..\..\lib\windows\ffmpeg\include;..\..\..\..\..\lib\windows\ffmpeg\include\msvc;..\..\..\..\..\lib\windows\sdl\include;..\..\..\..\..\lib\windows\openal\include;..\..\..\..\..\lib\windows\jack\include;..\..\..\..\..\lib\windows\sndfile\include"
PreprocessorDefinitions="WIN32,NDEBUG,_LIB,WITH_FFMPEG,WITH_SDL,WITH_OPENAL"
StringPooling="true"
RuntimeLibrary="2"
@@ -267,7 +267,7 @@
<Tool
Name="VCCLCompilerTool"
Optimization="0"
-
AdditionalIncludeDirectories="..\..;..\..\ffmpeg;..\..\FX;..\..\intern;..\..\OpenAL;..\..\SDL;..\..\SRC;..\..\..\..\..\lib\windows\pthreads\include;..\..\..\..\..\lib\windows\samplerate\include;..\..\..\..\..\lib\windows\ffmpeg\include;..\..\..\..\..\lib\windows\sdl\include;..\..\..\..\..\lib\windows\openal\include;..\..\..\..\..\lib\windows\jack\include"
+
AdditionalIncludeDirectories="..\..;..\..\ffmpeg;..\..\FX;..\..\intern;..\..\OpenAL;..\..\SDL;..\..\SRC;..\..\sndfile;..\..\..\..\..\lib\windows\pthreads\include;..\..\..\..\..\lib\windows\samplerate\include;..\..\..\..\..\lib\windows\ffmpeg\include;..\..\..\..\..\lib\windows\ffmpeg\include\msvc;..\..\..\..\..\lib\windows\sdl\include;..\..\..\..\..\lib\windows\openal\include;..\..\..\..\..\lib\windows\jack\include;..\..\..\..\..\lib\windows\sndfile\include"
PreprocessorDefinitions="WIN32,_DEBUG,_LIB,WITH_FFMPEG,WITH_SDL,WITH_OPENAL"
BasicRuntimeChecks="3"
RuntimeLibrary="3"
@@ -738,6 +738,26 @@
>
</File>
</Filter>
+ <Filter
+ Name="sndfile"
+ >
+ <File
+
RelativePath="..\..\sndfile\AUD_SndFileFactory.cpp"
+ >
+ </File>
+ <File
+
RelativePath="..\..\sndfile\AUD_SndFileFactory.h"
+ >
+ </File>
+ <File
+
RelativePath="..\..\sndfile\AUD_SndFileReader.cpp"
+ >
+ </File>
+ <File
+ RelativePath="..\..\sndfile\AUD_SndFileReader.h"
+ >
+ </File>
+ </Filter>
<File
RelativePath="..\..\AUD_C-API.h"
>
Modified:
branches/ge_dyn_load/projectfiles_vc9/blender/editors/ED_editors.vcproj
===================================================================
--- branches/ge_dyn_load/projectfiles_vc9/blender/editors/ED_editors.vcproj
2009-09-25 16:43:11 UTC (rev 23491)
+++ branches/ge_dyn_load/projectfiles_vc9/blender/editors/ED_editors.vcproj
2009-09-25 16:57:30 UTC (rev 23492)
@@ -295,6 +295,10 @@
>
</File>
<File
+
RelativePath="..\..\..\source\blender\editors\include\ED_sound.h"
+ >
+ </File>
+ <File
RelativePath="..\..\..\source\blender\editors\include\ED_space_api.h"
>
</File>
@@ -1372,6 +1376,10 @@
>
</File>
<File
+
RelativePath="..\..\..\source\blender\editors\gpencil\gpencil_buttons.c"
+ >
+ </File>
+ <File
RelativePath="..\..\..\source\blender\editors\gpencil\gpencil_edit.c"
>
</File>
@@ -1379,6 +1387,14 @@
RelativePath="..\..\..\source\blender\editors\gpencil\gpencil_intern.h"
>
</File>
+ <File
+
RelativePath="..\..\..\source\blender\editors\gpencil\gpencil_ops.c"
+ >
+ </File>
+ <File
+
RelativePath="..\..\..\source\blender\editors\gpencil\gpencil_paint.c"
+ >
+ </File>
</Filter>
<Filter
Name="curve"
@@ -1520,6 +1536,18 @@
>
</File>
</Filter>
+ <Filter
+ Name="sound"
+ >
+ <File
+
RelativePath="..\..\..\source\blender\editors\sound\sound_intern.h"
+ >
+ </File>
+ <File
+
RelativePath="..\..\..\source\blender\editors\sound\sound_ops.c"
+ >
+ </File>
+ </Filter>
</Files>
<Globals>
</Globals>
Modified: branches/ge_dyn_load/projectfiles_vc9/blender/imbuf/BL_imbuf.vcproj
===================================================================
--- branches/ge_dyn_load/projectfiles_vc9/blender/imbuf/BL_imbuf.vcproj
2009-09-25 16:43:11 UTC (rev 23491)
+++ branches/ge_dyn_load/projectfiles_vc9/blender/imbuf/BL_imbuf.vcproj
2009-09-25 16:57:30 UTC (rev 23492)
@@ -43,7 +43,7 @@
<Tool
Name="VCCLCompilerTool"
Optimization="0"
-
AdditionalIncludeDirectories="..\..\..\..\lib\windows\jpeg\include;..\..\..\..\lib\windows\zlib\include;..\..\..\..\lib\windows\png\include;..\..\..\..\lib\windows\tiff\include;..\..\..\..\lib\windows\openexr\include;..\..\..\..\lib\windows\openexr\include\Iex;..\..\..\..\lib\windows\openexr\include\Imath;..\..\..\..\lib\windows\openexr\include\IlmImf;..\..\..\..\lib\windows\QTDevWin\CIncludes;..\..\..\..\lib\windows\ffmpeg\include;..\..\..\..\build\msvc_9\intern\memutil\include;..\..\..\..\build\msvc_9\intern\guardedalloc\include;..\..\..\source\blender\avi;..\..\..\source\blender\imbuf;..\..\..\source\blender\blenlib;..\..\..\source\blender\include;..\..\..\source\blender\quicktime;..\..\..\source\blender\blenkernel;..\..\..\source\blender\blenloader;..\..\..\source\blender\makesdna;..\..\..\source\blender\imbuf\intern;..\..\..\source\blender\readstreamglue;..\..\..\source\blender\render\extern\include;..\..\..\source\blender\imbuf\intern\openexr;..\..\..\source\blende
r\imbuf\intern\dds"
+
AdditionalIncludeDirectories="..\..\..\..\lib\windows\jpeg\include;..\..\..\..\lib\windows\zlib\include;..\..\..\..\lib\windows\png\include;..\..\..\..\lib\windows\tiff\include;..\..\..\..\lib\windows\openexr\include;..\..\..\..\lib\windows\openexr\include\Iex;..\..\..\..\lib\windows\openexr\include\Imath;..\..\..\..\lib\windows\openexr\include\IlmImf;..\..\..\..\lib\windows\QTDevWin\CIncludes;..\..\..\..\lib\windows\ffmpeg\include;..\..\..\..\lib\windows\ffmpeg\include\msvc;..\..\..\..\build\msvc_9\intern\memutil\include;..\..\..\..\build\msvc_9\intern\guardedalloc\include;..\..\..\source\blender\avi;..\..\..\source\blender\imbuf;..\..\..\source\blender\blenlib;..\..\..\source\blender\include;..\..\..\source\blender\quicktime;..\..\..\source\blender\blenkernel;..\..\..\source\blender\blenloader;..\..\..\source\blender\makesdna;..\..\..\source\blender\imbuf\intern;..\..\..\source\blender\readstreamglue;..\..\..\source\blender\render\extern\include;..\..\..\source\blender
\imbuf\intern\openexr;..\..\..\source\blender\imbuf\intern\dds"
PreprocessorDefinitions="_DEBUG;WIN32;_LIB;WITH_QUICKTIME;WITH_OPENEXR;WITH_DDS;WITH_FFMPEG"
BasicRuntimeChecks="3"
RuntimeLibrary="1"
@@ -118,7 +118,7 @@
<Tool
Name="VCCLCompilerTool"
Optimization="0"
@@ Diff output truncated at 10240 characters. @@
_______________________________________________
Bf-blender-cvs mailing list
[email protected]
http://lists.blender.org/mailman/listinfo/bf-blender-cvs
