Revision: 16231 http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=16231 Author: ben2610 Date: 2008-08-22 17:00:30 +0200 (Fri, 22 Aug 2008)
Log Message: ----------- Fix Windows compilation problem and update MSVC project files Modified Paths: -------------- trunk/blender/projectfiles_vc7/blender/blenkernel/BKE_blenkernel.vcproj trunk/blender/source/blender/blenlib/BLI_winstuff.h trunk/blender/source/gameengine/Ketsji/KX_PythonInit.cpp Modified: trunk/blender/projectfiles_vc7/blender/blenkernel/BKE_blenkernel.vcproj =================================================================== --- trunk/blender/projectfiles_vc7/blender/blenkernel/BKE_blenkernel.vcproj 2008-08-22 13:49:27 UTC (rev 16230) +++ trunk/blender/projectfiles_vc7/blender/blenkernel/BKE_blenkernel.vcproj 2008-08-22 15:00:30 UTC (rev 16231) @@ -495,6 +495,9 @@ RelativePath="..\..\..\source\blender\blenkernel\intern\script.c"> </File> <File + RelativePath="..\..\..\source\blender\blenkernel\intern\shrinkwrap.c"> + </File> + <File RelativePath="..\..\..\source\blender\blenkernel\intern\softbody.c"> </File> <File @@ -709,6 +712,9 @@ RelativePath="..\..\..\source\blender\blenkernel\BKE_script.h"> </File> <File + RelativePath="..\..\..\source\blender\blenkernel\BKE_shrinkwrap.h"> + </File> + <File RelativePath="..\..\..\source\blender\blenkernel\BKE_softbody.h"> </File> <File Modified: trunk/blender/source/blender/blenlib/BLI_winstuff.h =================================================================== --- trunk/blender/source/blender/blenlib/BLI_winstuff.h 2008-08-22 13:49:27 UTC (rev 16230) +++ trunk/blender/source/blender/blenlib/BLI_winstuff.h 2008-08-22 15:00:30 UTC (rev 16231) @@ -61,6 +61,10 @@ // These definitions are also in arithb for simplicity +#ifdef __cplusplus +extern "C" { +#endif + #ifndef M_PI #define M_PI 3.14159265358979323846 #endif @@ -116,5 +120,9 @@ void get_default_root(char *root); int check_file_chars(char *filename); +#ifdef __cplusplus +} +#endif + #endif /* __WINSTUFF_H__ */ Modified: trunk/blender/source/gameengine/Ketsji/KX_PythonInit.cpp =================================================================== --- trunk/blender/source/gameengine/Ketsji/KX_PythonInit.cpp 2008-08-22 13:49:27 UTC (rev 16230) +++ trunk/blender/source/gameengine/Ketsji/KX_PythonInit.cpp 2008-08-22 15:00:30 UTC (rev 16231) @@ -30,8 +30,13 @@ #include "GL/glew.h" +// directory header for py function getBlendFileList #include <stdlib.h> -#include <dirent.h> // directory header for py function getBlendFileList +#ifndef WIN32 + #include <dirent.h> +#else + #include "BLI_winstuff.h" +#endif #ifdef WIN32 #pragma warning (disable : 4786) _______________________________________________ Bf-blender-cvs mailing list Bf-blender-cvs@blender.org http://lists.blender.org/mailman/listinfo/bf-blender-cvs