Revision: 23444
http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=23444
Author: ben2610
Date: 2009-09-24 11:29:59 +0200 (Thu, 24 Sep 2009)
Log Message:
-----------
Fix compilation problem in Windows and update project files
Modified Paths:
--------------
trunk/blender/projectfiles_vc9/blender/blenlib/BLI_blenlib.vcproj
trunk/blender/projectfiles_vc9/blender/makesrna/RNA_makesrna.vcproj
trunk/blender/projectfiles_vc9/gameengine/blenderhook/KX_blenderhook.vcproj
trunk/blender/source/blender/blenlib/BLI_winstuff.h
trunk/blender/source/blender/blenlib/intern/BLI_bfile.c
Modified: trunk/blender/projectfiles_vc9/blender/blenlib/BLI_blenlib.vcproj
===================================================================
--- trunk/blender/projectfiles_vc9/blender/blenlib/BLI_blenlib.vcproj
2009-09-24 07:03:18 UTC (rev 23443)
+++ trunk/blender/projectfiles_vc9/blender/blenlib/BLI_blenlib.vcproj
2009-09-24 09:29:59 UTC (rev 23444)
@@ -483,6 +483,10 @@
>
</File>
<File
+
RelativePath="..\..\..\source\blender\blenlib\intern\BLI_bfile.c"
+ >
+ </File>
+ <File
RelativePath="..\..\..\source\blender\blenlib\intern\BLI_dynstr.c"
>
</File>
@@ -620,6 +624,10 @@
>
</File>
<File
+
RelativePath="..\..\..\source\blender\blenlib\BLI_bfile.h"
+ >
+ </File>
+ <File
RelativePath="..\..\..\source\blender\blenlib\BLI_blenlib.h"
>
</File>
Modified: trunk/blender/projectfiles_vc9/blender/makesrna/RNA_makesrna.vcproj
===================================================================
--- trunk/blender/projectfiles_vc9/blender/makesrna/RNA_makesrna.vcproj
2009-09-24 07:03:18 UTC (rev 23443)
+++ trunk/blender/projectfiles_vc9/blender/makesrna/RNA_makesrna.vcproj
2009-09-24 09:29:59 UTC (rev 23444)
@@ -603,6 +603,10 @@
>
</File>
<File
+
RelativePath="..\..\..\source\blender\makesrna\intern\rna_action_api.c"
+ >
+ </File>
+ <File
RelativePath="..\..\..\source\blender\makesrna\intern\rna_actuator.c"
>
</File>
@@ -683,6 +687,10 @@
>
</File>
<File
+
RelativePath="..\..\..\source\blender\makesrna\intern\rna_image_api.c"
+ >
+ </File>
+ <File
RelativePath="..\..\..\source\blender\makesrna\intern\rna_key.c"
>
</File>
@@ -707,6 +715,10 @@
>
</File>
<File
+
RelativePath="..\..\..\source\blender\makesrna\intern\rna_material_api.c"
+ >
+ </File>
+ <File
RelativePath="..\..\..\source\blender\makesrna\intern\rna_mesh.c"
>
</File>
@@ -755,6 +767,10 @@
>
</File>
<File
+
RelativePath="..\..\..\source\blender\makesrna\intern\rna_pose_api.c"
+ >
+ </File>
+ <File
RelativePath="..\..\..\source\blender\makesrna\intern\rna_property.c"
>
</File>
Modified:
trunk/blender/projectfiles_vc9/gameengine/blenderhook/KX_blenderhook.vcproj
===================================================================
--- trunk/blender/projectfiles_vc9/gameengine/blenderhook/KX_blenderhook.vcproj
2009-09-24 07:03:18 UTC (rev 23443)
+++ trunk/blender/projectfiles_vc9/gameengine/blenderhook/KX_blenderhook.vcproj
2009-09-24 09:29:59 UTC (rev 23444)
@@ -43,7 +43,7 @@
<Tool
Name="VCCLCompilerTool"
Optimization="0"
-
AdditionalIncludeDirectories="..\..\..\..\build\msvc_9\intern\moto\include;..\..\..\..\build\msvc_9\intern\string\include;..\..\..\..\build\msvc_9\intern\bmfont\include;..\..\..\..\build\msvc_9\intern\soundsystem\include;..\..\..\..\build\msvc_9\intern\guardedalloc\include;..\..\..\..\build\msvc_9\extern\solid\include;..\..\..\..\build\msvc_9\extern\glew\include;..\..\..\..\lib\windows\python\include\python3.1;..\..\..\source\blender;..\..\..\source\blender\misc;..\..\..\source\blender\imbuf;..\..\..\source\blender\blenlib;..\..\..\source\blender\include;..\..\..\source\blender\makesdna;..\..\..\source\blender\makesrna;..\..\..\source\blender\blenloader;..\..\..\source\blender\blenkernel;..\..\..\source\kernel\gen_system;..\..\..\source\gameengine\ketsji;..\..\..\source\gameengine\network;..\..\..\source\gameengine\rasterizer;..\..\..\source\gameengine\Converter;..\..\..\source\gameengine\gamelogic;..\..\..\source\gameengine\scenegraph;..\..\..\source\gameengine\expressi
ons;..\..\..\source\gameengine\Physics\Sumo;..\..\..\source\gameengine\Physics\common;..\..\..\source\gameengine\network\loopbacknetwork;..\..\..\source\gameengine\rasterizer\ras_openglrasterizer;..\..\..\source\gameengine\Physics\Sumo\Fuzzics\include;..\..\..\source\blender\gpu;..\..\..\source\blender\windowmanager;..\..\..\source\blender\blenfont"
+
AdditionalIncludeDirectories="..\..\..\..\build\msvc_9\intern\moto\include;..\..\..\..\build\msvc_9\intern\string\include;..\..\..\..\build\msvc_9\intern\bmfont\include;..\..\..\..\build\msvc_9\intern\soundsystem\include;..\..\..\..\build\msvc_9\intern\guardedalloc\include;..\..\..\..\build\msvc_9\extern\solid\include;..\..\..\..\build\msvc_9\extern\glew\include;..\..\..\..\lib\windows\python\include\python3.1;..\..\..\source\blender;..\..\..\source\blender\misc;..\..\..\source\blender\imbuf;..\..\..\source\blender\blenlib;..\..\..\source\blender\include;..\..\..\source\blender\makesdna;..\..\..\source\blender\makesrna;..\..\..\source\blender\blenloader;..\..\..\source\blender\blenkernel;..\..\..\source\kernel\gen_system;..\..\..\source\gameengine\ketsji;..\..\..\source\gameengine\network;..\..\..\source\gameengine\rasterizer;..\..\..\source\gameengine\Converter;..\..\..\source\gameengine\gamelogic;..\..\..\source\gameengine\scenegraph;..\..\..\source\gameengine\expressi
ons;..\..\..\source\gameengine\Physics\Sumo;..\..\..\source\gameengine\Physics\common;..\..\..\source\gameengine\network\loopbacknetwork;..\..\..\source\gameengine\rasterizer\ras_openglrasterizer;..\..\..\source\gameengine\Physics\Sumo\Fuzzics\include;..\..\..\source\blender\gpu;..\..\..\source\blender\windowmanager;..\..\..\source\blender\blenfont;..\..\..\intern\audaspace\intern"
PreprocessorDefinitions="WIN32;_LIB;_DEBUG;WITH_GLEXT;WITH_FFMPEG"
BasicRuntimeChecks="3"
RuntimeLibrary="1"
@@ -119,7 +119,7 @@
<Tool
Name="VCCLCompilerTool"
InlineFunctionExpansion="1"
-
AdditionalIncludeDirectories="..\..\..\..\build\msvc_9\intern\moto\include;..\..\..\..\build\msvc_9\intern\string\include;..\..\..\..\build\msvc_9\intern\bmfont\include;..\..\..\..\build\msvc_9\intern\soundsystem\include;..\..\..\..\build\msvc_9\intern\guardedalloc\include;..\..\..\..\build\msvc_9\extern\solid\include;..\..\..\..\build\msvc_9\extern\glew\include;..\..\..\..\lib\windows\python\include\python3.1;..\..\..\source\blender;..\..\..\source\blender\misc;..\..\..\source\blender\imbuf;..\..\..\source\blender\blenlib;..\..\..\source\blender\include;..\..\..\source\blender\makesdna;..\..\..\source\blender\makesrna;..\..\..\source\blender\blenloader;..\..\..\source\blender\blenkernel;..\..\..\source\kernel\gen_system;..\..\..\source\gameengine\ketsji;..\..\..\source\gameengine\network;..\..\..\source\gameengine\rasterizer;..\..\..\source\gameengine\Converter;..\..\..\source\gameengine\gamelogic;..\..\..\source\gameengine\scenegraph;..\..\..\source\gameengine\expressi
ons;..\..\..\source\gameengine\Physics\Sumo;..\..\..\source\gameengine\Physics\common;..\..\..\source\gameengine\network\loopbacknetwork;..\..\..\source\gameengine\rasterizer\ras_openglrasterizer;..\..\..\source\gameengine\Physics\Sumo\Fuzzics\include;..\..\..\source\blender\gpu;..\..\..\source\blender\windowmanager;..\..\..\source\blender\blenfont"
+
AdditionalIncludeDirectories="..\..\..\..\build\msvc_9\intern\moto\include;..\..\..\..\build\msvc_9\intern\string\include;..\..\..\..\build\msvc_9\intern\bmfont\include;..\..\..\..\build\msvc_9\intern\soundsystem\include;..\..\..\..\build\msvc_9\intern\guardedalloc\include;..\..\..\..\build\msvc_9\extern\solid\include;..\..\..\..\build\msvc_9\extern\glew\include;..\..\..\..\lib\windows\python\include\python3.1;..\..\..\source\blender;..\..\..\source\blender\misc;..\..\..\source\blender\imbuf;..\..\..\source\blender\blenlib;..\..\..\source\blender\include;..\..\..\source\blender\makesdna;..\..\..\source\blender\makesrna;..\..\..\source\blender\blenloader;..\..\..\source\blender\blenkernel;..\..\..\source\kernel\gen_system;..\..\..\source\gameengine\ketsji;..\..\..\source\gameengine\network;..\..\..\source\gameengine\rasterizer;..\..\..\source\gameengine\Converter;..\..\..\source\gameengine\gamelogic;..\..\..\source\gameengine\scenegraph;..\..\..\source\gameengine\expressi
ons;..\..\..\source\gameengine\Physics\Sumo;..\..\..\source\gameengine\Physics\common;..\..\..\source\gameengine\network\loopbacknetwork;..\..\..\source\gameengine\rasterizer\ras_openglrasterizer;..\..\..\source\gameengine\Physics\Sumo\Fuzzics\include;..\..\..\source\blender\gpu;..\..\..\source\blender\windowmanager;..\..\..\source\blender\blenfont;..\..\..\intern\audaspace\intern"
PreprocessorDefinitions="NDEBUG;WIN32;_LIB;USE_SUMO_SOLID;WITH_GLEXT;WITH_FFMPEG"
StringPooling="true"
BasicRuntimeChecks="0"
Modified: trunk/blender/source/blender/blenlib/BLI_winstuff.h
===================================================================
--- trunk/blender/source/blender/blenlib/BLI_winstuff.h 2009-09-24 07:03:18 UTC
(rev 23443)
+++ trunk/blender/source/blender/blenlib/BLI_winstuff.h 2009-09-24 09:29:59 UTC
(rev 23444)
@@ -91,6 +91,12 @@
typedef unsigned int mode_t;
#endif
+#if defined(_WIN64)
+typedef __int64 ssize_t;
+#else
+typedef _W64 int ssize_t;
+#endif
+
struct dirent {
int d_ino;
int d_off;
Modified: trunk/blender/source/blender/blenlib/intern/BLI_bfile.c
===================================================================
--- trunk/blender/source/blender/blenlib/intern/BLI_bfile.c 2009-09-24
07:03:18 UTC (rev 23443)
+++ trunk/blender/source/blender/blenlib/intern/BLI_bfile.c 2009-09-24
09:29:59 UTC (rev 23444)
@@ -26,7 +26,12 @@
#include <string.h>
-#include <unistd.h>
+#ifndef WIN32
+ #include <unistd.h>
+#else
+ #include <io.h>
+#include "BLI_winstuff.h"
+#endif
#include <sys/types.h>
#include <sys/stat.h>
_______________________________________________
Bf-blender-cvs mailing list
[email protected]
http://lists.blender.org/mailman/listinfo/bf-blender-cvs
