diff options
| author | Benoit Bolsee <benoit.bolsee@online.be> | 2008-08-22 19:00:30 +0400 |
|---|---|---|
| committer | Benoit Bolsee <benoit.bolsee@online.be> | 2008-08-22 19:00:30 +0400 |
| commit | 7630539fe88b3c0dc353ae194baea8d757b79cae (patch) | |
| tree | f90a17933b280abcb5d1e921430fe8b950bd42d8 | |
| parent | 39a8125e4ce362a7e080408834f8587f6c52f1b6 (diff) | |
Fix Windows compilation problem and update MSVC project files
| -rw-r--r-- | projectfiles_vc7/blender/blenkernel/BKE_blenkernel.vcproj | 6 | ||||
| -rw-r--r-- | source/blender/blenlib/BLI_winstuff.h | 8 | ||||
| -rw-r--r-- | source/gameengine/Ketsji/KX_PythonInit.cpp | 7 |
3 files changed, 20 insertions, 1 deletions
diff --git a/projectfiles_vc7/blender/blenkernel/BKE_blenkernel.vcproj b/projectfiles_vc7/blender/blenkernel/BKE_blenkernel.vcproj index 0ea3503a289..42dcc843091 100644 --- a/projectfiles_vc7/blender/blenkernel/BKE_blenkernel.vcproj +++ b/projectfiles_vc7/blender/blenkernel/BKE_blenkernel.vcproj @@ -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 diff --git a/source/blender/blenlib/BLI_winstuff.h b/source/blender/blenlib/BLI_winstuff.h index 11150075bac..3bb63506c95 100644 --- a/source/blender/blenlib/BLI_winstuff.h +++ b/source/blender/blenlib/BLI_winstuff.h @@ -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 @@ int closedir (DIR *dp); void get_default_root(char *root); int check_file_chars(char *filename); +#ifdef __cplusplus +} +#endif + #endif /* __WINSTUFF_H__ */ diff --git a/source/gameengine/Ketsji/KX_PythonInit.cpp b/source/gameengine/Ketsji/KX_PythonInit.cpp index 6179d614e8c..5d2126ca37a 100644 --- a/source/gameengine/Ketsji/KX_PythonInit.cpp +++ b/source/gameengine/Ketsji/KX_PythonInit.cpp @@ -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) |