From 7630539fe88b3c0dc353ae194baea8d757b79cae Mon Sep 17 00:00:00 2001 From: Benoit Bolsee Date: Fri, 22 Aug 2008 15:00:30 +0000 Subject: [PATCH] Fix Windows compilation problem and update MSVC project files --- projectfiles_vc7/blender/blenkernel/BKE_blenkernel.vcproj | 6 ++++++ source/blender/blenlib/BLI_winstuff.h | 8 ++++++++ source/gameengine/Ketsji/KX_PythonInit.cpp | 7 ++++++- 3 files changed, 20 insertions(+), 1 deletion(-) 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 @@ -494,6 +494,9 @@ + + @@ -708,6 +711,9 @@ + + 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 -#include // directory header for py function getBlendFileList +#ifndef WIN32 + #include +#else + #include "BLI_winstuff.h" +#endif #ifdef WIN32 #pragma warning (disable : 4786)