diff options
237 files changed, 977 insertions, 66 deletions
diff --git a/intern/action/intern/ACT_Action.cpp b/intern/action/intern/ACT_Action.cpp index ff3c01d146d..a94c3c9f336 100644 --- a/intern/action/intern/ACT_Action.cpp +++ b/intern/action/intern/ACT_Action.cpp @@ -39,6 +39,10 @@ #include "ACT_Action.h" +#ifdef HAVE_CONFIG_H +#include <config.h> +#endif + ACT_Action::ACT_Action(const STR_String& name, bool applied) : m_name(name), m_applied(applied) diff --git a/intern/action/intern/ACT_ActionC-Api.cpp b/intern/action/intern/ACT_ActionC-Api.cpp index 1c2defa333a..7fcd1d7b60a 100644 --- a/intern/action/intern/ACT_ActionC-Api.cpp +++ b/intern/action/intern/ACT_ActionC-Api.cpp @@ -37,6 +37,10 @@ * @date April, 25, 2001 */ +#ifdef HAVE_CONFIG_H +#include <config.h> +#endif + #include "ACT_ActionC-Api.h" #include "ACT_ActionStack.h" diff --git a/intern/action/intern/ACT_ActionStack.cpp b/intern/action/intern/ACT_ActionStack.cpp index 569babd95f2..2025f744958 100644 --- a/intern/action/intern/ACT_ActionStack.cpp +++ b/intern/action/intern/ACT_ActionStack.cpp @@ -37,6 +37,10 @@ * @date March 31, 2001 */ +#ifdef HAVE_CONFIG_H +#include <config.h> +#endif + #include "ACT_ActionStack.h" diff --git a/intern/action/test/action_c_test/ActionTest.c b/intern/action/test/action_c_test/ActionTest.c index a30163e0c3b..8f169528204 100644 --- a/intern/action/test/action_c_test/ActionTest.c +++ b/intern/action/test/action_c_test/ActionTest.c @@ -37,6 +37,10 @@ * @date March 31, 2001 */ +#ifdef HAVE_CONFIG_H +#include <config.h> +#endif + #include "ACT_ActionC-Api.h" #include "TestAction.h" @@ -80,4 +84,4 @@ int main(int argc, char *argv[]) ACT_ActionStackRedo(stack); return 0; -}
\ No newline at end of file +} diff --git a/intern/action/test/action_c_test/TestAction.c b/intern/action/test/action_c_test/TestAction.c index 7b9739495d0..0b4896dadd7 100644 --- a/intern/action/test/action_c_test/TestAction.c +++ b/intern/action/test/action_c_test/TestAction.c @@ -39,6 +39,10 @@ #include <stdio.h> +#ifdef HAVE_CONFIG_H +#include <config.h> +#endif + #include "TestAction.h" diff --git a/intern/action/test/action_cpp_test/ActionTest.cpp b/intern/action/test/action_cpp_test/ActionTest.cpp index 379cc41a5de..55173bafb7b 100644 --- a/intern/action/test/action_cpp_test/ActionTest.cpp +++ b/intern/action/test/action_cpp_test/ActionTest.cpp @@ -37,6 +37,10 @@ * @date March 31, 2001 */ +#ifdef HAVE_CONFIG_H +#include <config.h> +#endif + #include "ACT_ActionStack.h" #include "TestAction.h" @@ -80,4 +84,4 @@ int main() testStack.redo(); return 0; -}
\ No newline at end of file +} diff --git a/intern/bmfont/BMF_Api.h b/intern/bmfont/BMF_Api.h index 001a9788920..608af5e536c 100644 --- a/intern/bmfont/BMF_Api.h +++ b/intern/bmfont/BMF_Api.h @@ -43,6 +43,10 @@ #ifndef __BMF_API_H #define __BMF_API_H +#ifdef HAVE_CONFIG_H +#include <config.h> +#endif + #ifdef __cplusplus extern "C" { #endif diff --git a/intern/bmfont/BMF_Fonts.h b/intern/bmfont/BMF_Fonts.h index bf7c370e47e..3a962bb9058 100644 --- a/intern/bmfont/BMF_Fonts.h +++ b/intern/bmfont/BMF_Fonts.h @@ -39,6 +39,10 @@ #ifndef __BMF_FONTS_H #define __BMF_FONTS_H +#ifdef HAVE_CONFIG_H +#include <config.h> +#endif + #include "BMF_Settings.h" typedef enum diff --git a/intern/bmfont/BMF_Settings.h b/intern/bmfont/BMF_Settings.h index 247f9e474fc..b4629511512 100644 --- a/intern/bmfont/BMF_Settings.h +++ b/intern/bmfont/BMF_Settings.h @@ -39,6 +39,10 @@ #ifndef __BMF_SETTINGS_H #define __BMF_SETTINGS_H +#ifdef HAVE_CONFIG_H +#include <config.h> +#endif + /* This font is included always */ #define BMF_INCLUDE_HELV10 1 diff --git a/intern/bmfont/intern/BMF_Api.cpp b/intern/bmfont/intern/BMF_Api.cpp index 08e54f13174..46776b08ba0 100644 --- a/intern/bmfont/intern/BMF_Api.cpp +++ b/intern/bmfont/intern/BMF_Api.cpp @@ -37,6 +37,10 @@ * Implementation of the API of the OpenGL bitmap font library. */ +#ifdef HAVE_CONFIG_H +#include <config.h> +#endif + #include "BMF_Api.h" #include "BMF_BitmapFont.h" diff --git a/intern/bmfont/intern/BMF_BitmapFont.cpp b/intern/bmfont/intern/BMF_BitmapFont.cpp index bd3fe0cb899..fbb5d5805af 100644 --- a/intern/bmfont/intern/BMF_BitmapFont.cpp +++ b/intern/bmfont/intern/BMF_BitmapFont.cpp @@ -37,6 +37,10 @@ #include <string.h> +#ifdef HAVE_CONFIG_H +#include <config.h> +#endif + #if defined(WIN32) || defined(__APPLE__) #ifdef WIN32 #if !defined(__CYGWIN32__) diff --git a/intern/bmfont/intern/BMF_BitmapFont.h b/intern/bmfont/intern/BMF_BitmapFont.h index 30cfd650353..2a363166179 100644 --- a/intern/bmfont/intern/BMF_BitmapFont.h +++ b/intern/bmfont/intern/BMF_BitmapFont.h @@ -38,6 +38,10 @@ #ifndef __BMF_BITMAP_FONT_H #define __BMF_BITMAP_FONT_H +#ifdef HAVE_CONFIG_H +#include <config.h> +#endif + #include "BMF_FontData.h" /** diff --git a/intern/bmfont/intern/BMF_FontData.h b/intern/bmfont/intern/BMF_FontData.h index 512bdf1a53d..0f4f92318dd 100644 --- a/intern/bmfont/intern/BMF_FontData.h +++ b/intern/bmfont/intern/BMF_FontData.h @@ -38,6 +38,10 @@ #ifndef __BMF_FONTDATA_H__ #define __BMF_FONTDATA_H__ +#ifdef HAVE_CONFIG_H +#include <config.h> +#endif + typedef struct { signed char width, height; signed char xorig, yorig; diff --git a/intern/bmfont/intern/BMF_font_helv10.cpp b/intern/bmfont/intern/BMF_font_helv10.cpp index b69796948c3..636ac78c5d6 100644 --- a/intern/bmfont/intern/BMF_font_helv10.cpp +++ b/intern/bmfont/intern/BMF_font_helv10.cpp @@ -29,6 +29,10 @@ * ***** END GPL/BL DUAL LICENSE BLOCK ***** */ +#ifdef HAVE_CONFIG_H +#include <config.h> +#endif + #include "BMF_FontData.h" #include "BMF_Settings.h" diff --git a/intern/bmfont/intern/BMF_font_helv12.cpp b/intern/bmfont/intern/BMF_font_helv12.cpp index 45ab6531cdb..813d22475eb 100644 --- a/intern/bmfont/intern/BMF_font_helv12.cpp +++ b/intern/bmfont/intern/BMF_font_helv12.cpp @@ -29,8 +29,11 @@ * ***** END GPL/BL DUAL LICENSE BLOCK ***** */ -#include "BMF_FontData.h" +#ifdef HAVE_CONFIG_H +#include <config.h> +#endif +#include "BMF_FontData.h" #include "BMF_Settings.h" #if BMF_INCLUDE_HELV12 diff --git a/intern/bmfont/intern/BMF_font_helvb10.cpp b/intern/bmfont/intern/BMF_font_helvb10.cpp index 4707abfeda2..66583767ffb 100644 --- a/intern/bmfont/intern/BMF_font_helvb10.cpp +++ b/intern/bmfont/intern/BMF_font_helvb10.cpp @@ -29,8 +29,11 @@ * ***** END GPL/BL DUAL LICENSE BLOCK ***** */ -#include "BMF_FontData.h" +#ifdef HAVE_CONFIG_H +#include <config.h> +#endif +#include "BMF_FontData.h" #include "BMF_Settings.h" #if BMF_INCLUDE_HELVB10 diff --git a/intern/bmfont/intern/BMF_font_helvb12.cpp b/intern/bmfont/intern/BMF_font_helvb12.cpp index 7ae4f3b4dd5..69230d48ae8 100644 --- a/intern/bmfont/intern/BMF_font_helvb12.cpp +++ b/intern/bmfont/intern/BMF_font_helvb12.cpp @@ -29,8 +29,11 @@ * ***** END GPL/BL DUAL LICENSE BLOCK ***** */ -#include "BMF_FontData.h" +#ifdef HAVE_CONFIG_H +#include <config.h> +#endif +#include "BMF_FontData.h" #include "BMF_Settings.h" #if BMF_INCLUDE_HELVB12 diff --git a/intern/bmfont/intern/BMF_font_helvb14.cpp b/intern/bmfont/intern/BMF_font_helvb14.cpp index d77697e74a8..e793295f295 100644 --- a/intern/bmfont/intern/BMF_font_helvb14.cpp +++ b/intern/bmfont/intern/BMF_font_helvb14.cpp @@ -29,8 +29,11 @@ * ***** END GPL/BL DUAL LICENSE BLOCK ***** */ -#include "BMF_FontData.h" +#ifdef HAVE_CONFIG_H +#include <config.h> +#endif +#include "BMF_FontData.h" #include "BMF_Settings.h" #if BMF_INCLUDE_HELVB14 diff --git a/intern/bmfont/intern/BMF_font_helvb8.cpp b/intern/bmfont/intern/BMF_font_helvb8.cpp index 0dfefbeda95..79651b06519 100644 --- a/intern/bmfont/intern/BMF_font_helvb8.cpp +++ b/intern/bmfont/intern/BMF_font_helvb8.cpp @@ -29,8 +29,11 @@ * ***** END GPL/BL DUAL LICENSE BLOCK ***** */ -#include "BMF_FontData.h" +#ifdef HAVE_CONFIG_H +#include <config.h> +#endif +#include "BMF_FontData.h" #include "BMF_Settings.h" #if BMF_INCLUDE_HELVB8 diff --git a/intern/bmfont/intern/BMF_font_scr12.cpp b/intern/bmfont/intern/BMF_font_scr12.cpp index a870ea91763..bcdb87fcc0b 100644 --- a/intern/bmfont/intern/BMF_font_scr12.cpp +++ b/intern/bmfont/intern/BMF_font_scr12.cpp @@ -29,8 +29,11 @@ * ***** END GPL/BL DUAL LICENSE BLOCK ***** */ -#include "BMF_FontData.h" +#ifdef HAVE_CONFIG_H +#include <config.h> +#endif +#include "BMF_FontData.h" #include "BMF_Settings.h" #if BMF_INCLUDE_SCR12 diff --git a/intern/bmfont/intern/BMF_font_scr14.cpp b/intern/bmfont/intern/BMF_font_scr14.cpp index c060556c7e0..6a3ee9dd710 100644 --- a/intern/bmfont/intern/BMF_font_scr14.cpp +++ b/intern/bmfont/intern/BMF_font_scr14.cpp @@ -29,8 +29,11 @@ * ***** END GPL/BL DUAL LICENSE BLOCK ***** */ -#include "BMF_FontData.h" +#ifdef HAVE_CONFIG_H +#include <config.h> +#endif +#include "BMF_FontData.h" #include "BMF_Settings.h" #if BMF_INCLUDE_SCR14 diff --git a/intern/bmfont/intern/BMF_font_scr15.cpp b/intern/bmfont/intern/BMF_font_scr15.cpp index 708420410c6..919db333e65 100644 --- a/intern/bmfont/intern/BMF_font_scr15.cpp +++ b/intern/bmfont/intern/BMF_font_scr15.cpp @@ -29,8 +29,11 @@ * ***** END GPL/BL DUAL LICENSE BLOCK ***** */ -#include "BMF_FontData.h" +#ifdef HAVE_CONFIG_H +#include <config.h> +#endif +#include "BMF_FontData.h" #include "BMF_Settings.h" #if BMF_INCLUDE_SCR15 diff --git a/intern/bmfont/test/BMF_Test.cpp b/intern/bmfont/test/BMF_Test.cpp index 37d2f45d164..8dbd4b3ce75 100644 --- a/intern/bmfont/test/BMF_Test.cpp +++ b/intern/bmfont/test/BMF_Test.cpp @@ -40,6 +40,10 @@ #include <iostream> +#ifdef HAVE_CONFIG_H +#include <config.h> +#endif + #if defined(WIN32) || defined(__APPLE__) #ifdef WIN32 #include <windows.h> diff --git a/intern/bsp/extern/CSG_BooleanOps.h b/intern/bsp/extern/CSG_BooleanOps.h index 58e8534f351..c7f854ff5d7 100755 --- a/intern/bsp/extern/CSG_BooleanOps.h +++ b/intern/bsp/extern/CSG_BooleanOps.h @@ -33,6 +33,11 @@ #define CSG_BOOLEANOPS_H +#ifdef HAVE_CONFIG_H +#include <config.h> +#endif + + /** * @section Interface structures for CSG module. * This interface falls into 2 categories. diff --git a/intern/bsp/intern/BSP_CSGException.h b/intern/bsp/intern/BSP_CSGException.h index 15835bc0516..bfac6fd346e 100755 --- a/intern/bsp/intern/BSP_CSGException.h +++ b/intern/bsp/intern/BSP_CSGException.h @@ -33,6 +33,10 @@ #define NAN_INCLUDED_CSGException_h +#ifdef HAVE_CONFIG_H +#include <config.h> +#endif + // stick in more error types as you think of them enum BSP_ExceptionType{ diff --git a/intern/bsp/intern/BSP_CSGHelper.cpp b/intern/bsp/intern/BSP_CSGHelper.cpp index b47cdfa76e8..0932d9bcdb9 100644 --- a/intern/bsp/intern/BSP_CSGHelper.cpp +++ b/intern/bsp/intern/BSP_CSGHelper.cpp @@ -29,6 +29,10 @@ * ***** END GPL/BL DUAL LICENSE BLOCK ***** */ +#ifdef HAVE_CONFIG_H +#include <config.h> +#endif + #include "BSP_CSGHelper.h" #include "BSP_CSGMesh.h" diff --git a/intern/bsp/intern/BSP_CSGHelper.h b/intern/bsp/intern/BSP_CSGHelper.h index 6bf51383268..e27de3687a4 100644 --- a/intern/bsp/intern/BSP_CSGHelper.h +++ b/intern/bsp/intern/BSP_CSGHelper.h @@ -33,6 +33,11 @@ #define BSP_CSGHELPER_H +#ifdef HAVE_CONFIG_H +#include <config.h> +#endif + + class BSP_CSGMesh; class BSP_MeshFragment; diff --git a/intern/bsp/intern/BSP_CSGISplitter.h b/intern/bsp/intern/BSP_CSGISplitter.h index c88a04a7932..826b2c0d477 100755 --- a/intern/bsp/intern/BSP_CSGISplitter.h +++ b/intern/bsp/intern/BSP_CSGISplitter.h @@ -33,6 +33,11 @@ #define BSP_CSGISplitter_h +#ifdef HAVE_CONFIG_H +#include <config.h> +#endif + + class BSP_MeshFragment; class BSP_CSGMesh; diff --git a/intern/bsp/intern/BSP_CSGMesh.cpp b/intern/bsp/intern/BSP_CSGMesh.cpp index d1721cb692b..efc7ba0f706 100755 --- a/intern/bsp/intern/BSP_CSGMesh.cpp +++ b/intern/bsp/intern/BSP_CSGMesh.cpp @@ -30,6 +30,9 @@ */ +#ifdef HAVE_CONFIG_H +#include <config.h> +#endif #include "BSP_CSGMesh.h" #include "MT_assert.h" diff --git a/intern/bsp/intern/BSP_CSGMesh.h b/intern/bsp/intern/BSP_CSGMesh.h index 2ff610d41f2..4b634f3aa50 100755 --- a/intern/bsp/intern/BSP_CSGMesh.h +++ b/intern/bsp/intern/BSP_CSGMesh.h @@ -33,6 +33,11 @@ #define NAN_INCLUDED_BSP_CSGMesh_h +#ifdef HAVE_CONFIG_H +#include <config.h> +#endif + + #include "BSP_MeshPrimitives.h" #include "MEM_SmartPtr.h" #include "MEM_RefCountPtr.h" diff --git a/intern/bsp/intern/BSP_CSGMeshBuilder.cpp b/intern/bsp/intern/BSP_CSGMeshBuilder.cpp index cbe4bfc920d..c7242e09ca5 100755 --- a/intern/bsp/intern/BSP_CSGMeshBuilder.cpp +++ b/intern/bsp/intern/BSP_CSGMeshBuilder.cpp @@ -29,6 +29,10 @@ * ***** END GPL/BL DUAL LICENSE BLOCK ***** */ +#ifdef HAVE_CONFIG_H +#include <config.h> +#endif + #include "BSP_CSGMeshBuilder.h" diff --git a/intern/bsp/intern/BSP_CSGMeshBuilder.h b/intern/bsp/intern/BSP_CSGMeshBuilder.h index 05ed5bee1f3..c6763f11755 100755 --- a/intern/bsp/intern/BSP_CSGMeshBuilder.h +++ b/intern/bsp/intern/BSP_CSGMeshBuilder.h @@ -33,6 +33,11 @@ #define BSP_CSGMeshBuilder_h +#ifdef HAVE_CONFIG_H +#include <config.h> +#endif + + #include "../extern/CSG_BooleanOps.h" #include "BSP_CSGMesh.h" #include "MEM_NonCopyable.h" diff --git a/intern/bsp/intern/BSP_CSGMeshSplitter.cpp b/intern/bsp/intern/BSP_CSGMeshSplitter.cpp index eac926085ef..ba3a3150dba 100755 --- a/intern/bsp/intern/BSP_CSGMeshSplitter.cpp +++ b/intern/bsp/intern/BSP_CSGMeshSplitter.cpp @@ -29,6 +29,10 @@ * ***** END GPL/BL DUAL LICENSE BLOCK ***** */ +#ifdef HAVE_CONFIG_H +#include <config.h> +#endif + #include "BSP_CSGMeshSplitter.h" #include "BSP_CSGMesh.h" diff --git a/intern/bsp/intern/BSP_CSGMeshSplitter.h b/intern/bsp/intern/BSP_CSGMeshSplitter.h index 108b18266c6..141c498b909 100755 --- a/intern/bsp/intern/BSP_CSGMeshSplitter.h +++ b/intern/bsp/intern/BSP_CSGMeshSplitter.h @@ -33,6 +33,11 @@ #define BSP_CSGMeshSplitter_h +#ifdef HAVE_CONFIG_H +#include <config.h> +#endif + + class BSP_MeshFragment; class MT_Plane3; class BSP_CSGMesh; diff --git a/intern/bsp/intern/BSP_CSGMesh_CFIterator.h b/intern/bsp/intern/BSP_CSGMesh_CFIterator.h index a29ea4a547a..4c31dda5d8f 100755 --- a/intern/bsp/intern/BSP_CSGMesh_CFIterator.h +++ b/intern/bsp/intern/BSP_CSGMesh_CFIterator.h @@ -33,6 +33,11 @@ #define BSP_CSGMesh_CFIterator_h +#ifdef HAVE_CONFIG_H +#include <config.h> +#endif + + #include "BSP_CSGMesh.h" #include "../extern/CSG_BooleanOps.h" /** diff --git a/intern/bsp/intern/BSP_CSGNCMeshSplitter.cpp b/intern/bsp/intern/BSP_CSGNCMeshSplitter.cpp index 4ffe5c73e47..11e8bff6810 100755 --- a/intern/bsp/intern/BSP_CSGNCMeshSplitter.cpp +++ b/intern/bsp/intern/BSP_CSGNCMeshSplitter.cpp @@ -29,6 +29,10 @@ * ***** END GPL/BL DUAL LICENSE BLOCK ***** */ +#ifdef HAVE_CONFIG_H +#include <config.h> +#endif + #include "BSP_CSGNCMeshSplitter.h" #include "BSP_CSGMesh.h" diff --git a/intern/bsp/intern/BSP_CSGNCMeshSplitter.h b/intern/bsp/intern/BSP_CSGNCMeshSplitter.h index 56c1258f5c4..1fcfbcac981 100755 --- a/intern/bsp/intern/BSP_CSGNCMeshSplitter.h +++ b/intern/bsp/intern/BSP_CSGNCMeshSplitter.h @@ -33,6 +33,11 @@ #define BSP_CSGNCMeshSplitter_h +#ifdef HAVE_CONFIG_H +#include <config.h> +#endif + + class BSP_MeshFragment; class MT_Plane3; class BSP_CSGMesh; diff --git a/intern/bsp/intern/BSP_CSGUserData.cpp b/intern/bsp/intern/BSP_CSGUserData.cpp index 7ba5664bd2a..fa007aa0e00 100755 --- a/intern/bsp/intern/BSP_CSGUserData.cpp +++ b/intern/bsp/intern/BSP_CSGUserData.cpp @@ -29,6 +29,10 @@ * ***** END GPL/BL DUAL LICENSE BLOCK ***** */ +#ifdef HAVE_CONFIG_H +#include <config.h> +#endif + #include "BSP_CSGUserData.h" diff --git a/intern/bsp/intern/BSP_CSGUserData.h b/intern/bsp/intern/BSP_CSGUserData.h index 6eb00d99cd3..1b3676992d5 100755 --- a/intern/bsp/intern/BSP_CSGUserData.h +++ b/intern/bsp/intern/BSP_CSGUserData.h @@ -33,6 +33,11 @@ #define BSP_CSGUserData_h +#ifdef HAVE_CONFIG_H +#include <config.h> +#endif + + #include <vector> /** diff --git a/intern/bsp/intern/BSP_FragNode.cpp b/intern/bsp/intern/BSP_FragNode.cpp index e23fdd835c7..c23b210a700 100755 --- a/intern/bsp/intern/BSP_FragNode.cpp +++ b/intern/bsp/intern/BSP_FragNode.cpp @@ -29,6 +29,10 @@ * ***** END GPL/BL DUAL LICENSE BLOCK ***** */ +#ifdef HAVE_CONFIG_H +#include <config.h> +#endif + #include "BSP_CSGMesh.h" #include "BSP_FragNode.h" diff --git a/intern/bsp/intern/BSP_FragNode.h b/intern/bsp/intern/BSP_FragNode.h index 699e080790e..7a674269b27 100755 --- a/intern/bsp/intern/BSP_FragNode.h +++ b/intern/bsp/intern/BSP_FragNode.h @@ -33,6 +33,11 @@ #define BSP_FragNode_h +#ifdef HAVE_CONFIG_H +#include <config.h> +#endif + + #include "BSP_FragTree.h" #include "BSP_MeshFragment.h" #include "MT_Plane3.h" diff --git a/intern/bsp/intern/BSP_FragTree.cpp b/intern/bsp/intern/BSP_FragTree.cpp index 3668db6cf7c..21a3e286447 100755 --- a/intern/bsp/intern/BSP_FragTree.cpp +++ b/intern/bsp/intern/BSP_FragTree.cpp @@ -29,6 +29,10 @@ * ***** END GPL/BL DUAL LICENSE BLOCK ***** */ +#ifdef HAVE_CONFIG_H +#include <config.h> +#endif + #include "BSP_FragTree.h" #include "BSP_FragNode.h" diff --git a/intern/bsp/intern/BSP_FragTree.h b/intern/bsp/intern/BSP_FragTree.h index ea56190244e..02fb7a8e66e 100755 --- a/intern/bsp/intern/BSP_FragTree.h +++ b/intern/bsp/intern/BSP_FragTree.h @@ -33,6 +33,11 @@ #define BSP_FragTree_h +#ifdef HAVE_CONFIG_H +#include <config.h> +#endif + + class BSP_FragNode; #include "MEM_SmartPtr.h" diff --git a/intern/bsp/intern/BSP_MeshFragment.cpp b/intern/bsp/intern/BSP_MeshFragment.cpp index 408a13d6cd9..b7583f04d8b 100755 --- a/intern/bsp/intern/BSP_MeshFragment.cpp +++ b/intern/bsp/intern/BSP_MeshFragment.cpp @@ -29,6 +29,10 @@ * ***** END GPL/BL DUAL LICENSE BLOCK ***** */ +#ifdef HAVE_CONFIG_H +#include <config.h> +#endif + #include "BSP_MeshFragment.h" #include "BSP_CSGMesh.h" diff --git a/intern/bsp/intern/BSP_MeshFragment.h b/intern/bsp/intern/BSP_MeshFragment.h index a53960299c2..ac1c21a338d 100755 --- a/intern/bsp/intern/BSP_MeshFragment.h +++ b/intern/bsp/intern/BSP_MeshFragment.h @@ -33,9 +33,15 @@ #define NAN_INCLUDED_BSP_MeshFragment_h + #define BSP_SPLIT_EPSILON MT_Scalar(1e-5) #include <vector> + +#ifdef HAVE_CONFIG_H +#include <config.h> +#endif + #include "BSP_MeshPrimitives.h" diff --git a/intern/bsp/intern/BSP_MeshPrimitives.cpp b/intern/bsp/intern/BSP_MeshPrimitives.cpp index 7425510b6a4..c9c4873540b 100755 --- a/intern/bsp/intern/BSP_MeshPrimitives.cpp +++ b/intern/bsp/intern/BSP_MeshPrimitives.cpp @@ -29,6 +29,10 @@ * ***** END GPL/BL DUAL LICENSE BLOCK ***** */ +#ifdef HAVE_CONFIG_H +#include <config.h> +#endif + #include "BSP_MeshPrimitives.h" #include "MT_assert.h" diff --git a/intern/bsp/intern/BSP_MeshPrimitives.h b/intern/bsp/intern/BSP_MeshPrimitives.h index 7b659700299..f3adfcffdc2 100644 --- a/intern/bsp/intern/BSP_MeshPrimitives.h +++ b/intern/bsp/intern/BSP_MeshPrimitives.h @@ -33,6 +33,11 @@ #define NAN_INCLUDED_BSP_MeshPrimitives +#ifdef HAVE_CONFIG_H +#include <config.h> +#endif + + #include "CTR_TaggedIndex.h" #include "MT_Vector3.h" #include "MT_Plane3.h" diff --git a/intern/bsp/intern/BSP_Triangulate.cpp b/intern/bsp/intern/BSP_Triangulate.cpp index 3d015b9f6d0..fbfba62b907 100755 --- a/intern/bsp/intern/BSP_Triangulate.cpp +++ b/intern/bsp/intern/BSP_Triangulate.cpp @@ -32,6 +32,11 @@ #include <stdio.h> #include <stdlib.h> + +#ifdef HAVE_CONFIG_H +#include <config.h> +#endif + #include "MT_Plane3.h" #include "BSP_Triangulate.h" #include "MT_assert.h" diff --git a/intern/bsp/intern/BSP_Triangulate.h b/intern/bsp/intern/BSP_Triangulate.h index 20b9e61ca7b..44a2b8c960a 100755 --- a/intern/bsp/intern/BSP_Triangulate.h +++ b/intern/bsp/intern/BSP_Triangulate.h @@ -51,6 +51,11 @@ #include <vector> // Include STL vector class. + +#ifdef HAVE_CONFIG_H +#include <config.h> +#endif + #include "MT_Point3.h" #include "BSP_MeshPrimitives.h" diff --git a/intern/bsp/intern/CSG_BooleanOps.cpp b/intern/bsp/intern/CSG_BooleanOps.cpp index 01b8bfc0b68..cb9aaf9dec4 100755 --- a/intern/bsp/intern/CSG_BooleanOps.cpp +++ b/intern/bsp/intern/CSG_BooleanOps.cpp @@ -34,6 +34,10 @@ * Implementation of external api for CSG part of BSP lib interface. */ +#ifdef HAVE_CONFIG_H +#include <config.h> +#endif + #include "../extern/CSG_BooleanOps.h" #include "BSP_CSGMesh_CFIterator.h" #include "BSP_CSGMeshBuilder.h" diff --git a/intern/bsp/test/BSP_GhostTest/BSP_GhostTest3D.cpp b/intern/bsp/test/BSP_GhostTest/BSP_GhostTest3D.cpp index 92e5198f139..5d8410462be 100755 --- a/intern/bsp/test/BSP_GhostTest/BSP_GhostTest3D.cpp +++ b/intern/bsp/test/BSP_GhostTest/BSP_GhostTest3D.cpp @@ -34,6 +34,9 @@ * $Id$ * Copyright (C) 2001 NaN Technologies B.V. */ +#ifdef HAVE_CONFIG_H +#include <config.h> +#endif #if defined(WIN32) || defined(__APPLE__) # ifdef WIN32 diff --git a/intern/bsp/test/BSP_GhostTest/BSP_GhostTest3D.h b/intern/bsp/test/BSP_GhostTest/BSP_GhostTest3D.h index 49ab615403d..05da968c69c 100755 --- a/intern/bsp/test/BSP_GhostTest/BSP_GhostTest3D.h +++ b/intern/bsp/test/BSP_GhostTest/BSP_GhostTest3D.h @@ -33,6 +33,10 @@ #define BSP_GhostTest_h +#ifdef HAVE_CONFIG_H +#include <config.h> +#endif + #include "GHOST_IEventConsumer.h" diff --git a/intern/bsp/test/BSP_GhostTest/BSP_MeshDrawer.cpp b/intern/bsp/test/BSP_GhostTest/BSP_MeshDrawer.cpp index 9df6d166263..4f5f5d46535 100755 --- a/intern/bsp/test/BSP_GhostTest/BSP_MeshDrawer.cpp +++ b/intern/bsp/test/BSP_GhostTest/BSP_MeshDrawer.cpp @@ -29,6 +29,10 @@ * ***** END GPL/BL DUAL LICENSE BLOCK ***** */ +#ifdef HAVE_CONFIG_H +#include <config.h> +#endif + #include "BSP_MeshDrawer.h" #include "BSP_TMesh.h" diff --git a/intern/bsp/test/BSP_GhostTest/BSP_MeshDrawer.h b/intern/bsp/test/BSP_GhostTest/BSP_MeshDrawer.h index fb1c5b1ccf0..f89462395bb 100755 --- a/intern/bsp/test/BSP_GhostTest/BSP_MeshDrawer.h +++ b/intern/bsp/test/BSP_GhostTest/BSP_MeshDrawer.h @@ -33,6 +33,11 @@ #define BSP_MeshDrawer_h +#ifdef HAVE_CONFIG_H +#include <config.h> +#endif + + class BSP_TMesh; diff --git a/intern/bsp/test/BSP_GhostTest/BSP_PlyLoader.cpp b/intern/bsp/test/BSP_GhostTest/BSP_PlyLoader.cpp index aa7dfbc3818..f148250f1aa 100755 --- a/intern/bsp/test/BSP_GhostTest/BSP_PlyLoader.cpp +++ b/intern/bsp/test/BSP_GhostTest/BSP_PlyLoader.cpp @@ -29,6 +29,10 @@ * ***** END GPL/BL DUAL LICENSE BLOCK ***** */ +#ifdef HAVE_CONFIG_H +#include <config.h> +#endif + #include "BSP_PlyLoader.h" #include "MT_Vector3.h" @@ -193,4 +197,4 @@ NewMeshFromFile( ply_close (ply); return mesh; -}
\ No newline at end of file +} diff --git a/intern/bsp/test/BSP_GhostTest/BSP_PlyLoader.h b/intern/bsp/test/BSP_GhostTest/BSP_PlyLoader.h index 011b5a8dbcb..4a4b12fb8be 100755 --- a/intern/bsp/test/BSP_GhostTest/BSP_PlyLoader.h +++ b/intern/bsp/test/BSP_GhostTest/BSP_PlyLoader.h @@ -33,6 +33,11 @@ #define BSP_PlyLoader_h +#ifdef HAVE_CONFIG_H +#include <config.h> +#endif + + #include "MEM_SmartPtr.h" #include "BSP_TMesh.h" diff --git a/intern/bsp/test/BSP_GhostTest/BSP_TMesh.h b/intern/bsp/test/BSP_GhostTest/BSP_TMesh.h index 5bfdb703a52..8b8a365ff78 100755 --- a/intern/bsp/test/BSP_GhostTest/BSP_TMesh.h +++ b/intern/bsp/test/BSP_GhostTest/BSP_TMesh.h @@ -33,6 +33,11 @@ #define BSP_TMesh_h +#ifdef HAVE_CONFIG_H +#include <config.h> +#endif + + #include "MT_Point3.h" #include "MT_Vector3.h" #include "MT_Transform.h" diff --git a/intern/bsp/test/BSP_GhostTest/main.cpp b/intern/bsp/test/BSP_GhostTest/main.cpp index e7875047651..6b0e0d66234 100755 --- a/intern/bsp/test/BSP_GhostTest/main.cpp +++ b/intern/bsp/test/BSP_GhostTest/main.cpp @@ -29,6 +29,10 @@ * ***** END GPL/BL DUAL LICENSE BLOCK ***** */ +#ifdef HAVE_CONFIG_H +#include <config.h> +#endif + #include "BSP_GhostTest3D.h" #include "BSP_TMesh.h" diff --git a/intern/bsp/test/BSP_GhostTest/ply.h b/intern/bsp/test/BSP_GhostTest/ply.h index 7947d224c5f..04844069971 100755 --- a/intern/bsp/test/BSP_GhostTest/ply.h +++ b/intern/bsp/test/BSP_GhostTest/ply.h @@ -71,6 +71,10 @@ extern "C" { #include <stdio.h> #include <stddef.h> +#ifdef HAVE_CONFIG_H +#include <config.h> +#endif + #define PLY_ASCII 1 /* ascii PLY file */ #define PLY_BINARY_BE 2 /* binary PLY file, big endian */ #define PLY_BINARY_LE 3 /* binary PLY file, little endian */ diff --git a/intern/bsp/test/BSP_GhostTest/plyfile.c b/intern/bsp/test/BSP_GhostTest/plyfile.c index 1fda4c77454..fd808aa0889 100755 --- a/intern/bsp/test/BSP_GhostTest/plyfile.c +++ b/intern/bsp/test/BSP_GhostTest/plyfile.c @@ -70,6 +70,10 @@ WARRANTY OF MERCHANTABILITY OR FITNESS FOR A PARTICULAR PURPOSE. #include <string.h> #include "ply.h" +#ifdef HAVE_CONFIG_H +#include <config.h> +#endif + char *type_names[] = { "invalid", "char", "short", "int", diff --git a/intern/container/CTR_List.h b/intern/container/CTR_List.h index 2ca2d60d0e7..23d82d40819 100644 --- a/intern/container/CTR_List.h +++ b/intern/container/CTR_List.h @@ -64,6 +64,11 @@ #ifndef CTR_LIST_H #define CTR_LIST_H +#ifdef HAVE_CONFIG_H +#include <config.h> +#endif + + class CTR_Link { public: CTR_Link( diff --git a/intern/container/CTR_Map.h b/intern/container/CTR_Map.h index 8d4c94b4c01..cffbe20832c 100644 --- a/intern/container/CTR_Map.h +++ b/intern/container/CTR_Map.h @@ -33,6 +33,10 @@ #define CTR_MAP_H +#ifdef HAVE_CONFIG_H +#include <config.h> +#endif + template <class Key, class Value> class CTR_Map { private: diff --git a/intern/container/CTR_TaggedIndex.h b/intern/container/CTR_TaggedIndex.h index 87bc8a4315e..aa94f94403f 100644 --- a/intern/container/CTR_TaggedIndex.h +++ b/intern/container/CTR_TaggedIndex.h @@ -50,6 +50,11 @@ #include <functional> +#ifdef HAVE_CONFIG_H +#include <config.h> +#endif + + enum { empty_tag = 0x0, diff --git a/intern/container/CTR_TaggedSetOps.h b/intern/container/CTR_TaggedSetOps.h index 6c550e6ff22..2696e644275 100644 --- a/intern/container/CTR_TaggedSetOps.h +++ b/intern/container/CTR_TaggedSetOps.h @@ -30,9 +30,13 @@ */ #ifndef NAN_INCLUDED_LOD_TaggedSetOps_h - #define NAN_INCLUDED_LOD_TaggedSetOps_h +#ifdef HAVE_CONFIG_H +#include <config.h> +#endif + + #include "MEM_NonCopyable.h" #include <vector> diff --git a/intern/container/CTR_UHeap.h b/intern/container/CTR_UHeap.h index c6321ea1abe..1f7c80fac2a 100644 --- a/intern/container/CTR_UHeap.h +++ b/intern/container/CTR_UHeap.h @@ -48,6 +48,11 @@ #define NAN_INCLUDED_CTR_UHeap_h #include <vector> + +#ifdef HAVE_CONFIG_H +#include <config.h> +#endif + #include "MEM_NonCopyable.h" class CTR_UHeapable { diff --git a/intern/container/intern/CTR_List.cpp b/intern/container/intern/CTR_List.cpp index 2e8c1bb13d2..9cbb384c835 100644 --- a/intern/container/intern/CTR_List.cpp +++ b/intern/container/intern/CTR_List.cpp @@ -29,6 +29,10 @@ * ***** END GPL/BL DUAL LICENSE BLOCK ***** */ +#ifdef HAVE_CONFIG_H +#include <config.h> +#endif + #include "CTR_List.h" diff --git a/intern/decimation/extern/LOD_decimation.h b/intern/decimation/extern/LOD_decimation.h index 4b1936b72fb..12e29a4a409 100644 --- a/intern/decimation/extern/LOD_decimation.h +++ b/intern/decimation/extern/LOD_decimation.h @@ -40,6 +40,9 @@ #ifndef NAN_INCLUDED_LOD_decimation_h #define NAN_INCLUDED_LOD_decimation_h +#ifdef HAVE_CONFIG_H +#include <config.h> +#endif #ifdef __cplusplus extern "C" { diff --git a/intern/decimation/intern/LOD_DecimationClass.h b/intern/decimation/intern/LOD_DecimationClass.h index 302c023392f..e29b3eb0119 100644 --- a/intern/decimation/intern/LOD_DecimationClass.h +++ b/intern/decimation/intern/LOD_DecimationClass.h @@ -33,6 +33,11 @@ #define NAN_INCLUDED_LOD_DecimationClass_h +#ifdef HAVE_CONFIG_H +#include <config.h> +#endif + + #include "MEM_SmartPtr.h" #include "MEM_NonCopyable.h" diff --git a/intern/decimation/intern/LOD_EdgeCollapser.cpp b/intern/decimation/intern/LOD_EdgeCollapser.cpp index 4168a2ae371..07bcbf2b9d2 100644 --- a/intern/decimation/intern/LOD_EdgeCollapser.cpp +++ b/intern/decimation/intern/LOD_EdgeCollapser.cpp @@ -29,6 +29,10 @@ * ***** END GPL/BL DUAL LICENSE BLOCK ***** */ +#ifdef HAVE_CONFIG_H +#include <config.h> +#endif + #include "LOD_EdgeCollapser.h" #include "LOD_ManMesh2.h" diff --git a/intern/decimation/intern/LOD_EdgeCollapser.h b/intern/decimation/intern/LOD_EdgeCollapser.h index c19786c8b85..d889ae25921 100644 --- a/intern/decimation/intern/LOD_EdgeCollapser.h +++ b/intern/decimation/intern/LOD_EdgeCollapser.h @@ -33,6 +33,11 @@ #define NAN_INCLDUED_EgdeCollapser_h +#ifdef HAVE_CONFIG_H +#include <config.h> +#endif + + // This is a helper class that collapses edges of a 2 - manifold mesh. #include "LOD_MeshPrimitives.h" diff --git a/intern/decimation/intern/LOD_ExternBufferEditor.h b/intern/decimation/intern/LOD_ExternBufferEditor.h index 9f628c4455b..9496151dda5 100644 --- a/intern/decimation/intern/LOD_ExternBufferEditor.h +++ b/intern/decimation/intern/LOD_ExternBufferEditor.h @@ -38,6 +38,11 @@ #ifndef NAN_INCLUDED_LOD_ExternBufferEditor_h #define NAN_INCLUDED_LOD_ExternBufferEditor_h +#ifdef HAVE_CONFIG_H +#include <config.h> +#endif + + #include "LOD_MeshPrimitives.h" #include <vector> #include "LOD_ManMesh2.h" diff --git a/intern/decimation/intern/LOD_ExternNormalEditor.cpp b/intern/decimation/intern/LOD_ExternNormalEditor.cpp index 357aaf56006..11818fc9f7c 100644 --- a/intern/decimation/intern/LOD_ExternNormalEditor.cpp +++ b/intern/decimation/intern/LOD_ExternNormalEditor.cpp @@ -30,9 +30,12 @@ */ #include "LOD_ExternNormalEditor.h" - #include <vector> +#ifdef HAVE_CONFIG_H +#include <config.h> +#endif + using namespace std; diff --git a/intern/decimation/intern/LOD_ExternNormalEditor.h b/intern/decimation/intern/LOD_ExternNormalEditor.h index ba205f79790..bff3c9f388b 100644 --- a/intern/decimation/intern/LOD_ExternNormalEditor.h +++ b/intern/decimation/intern/LOD_ExternNormalEditor.h @@ -33,6 +33,11 @@ #define NAN_INCLUDED_ExternNormalEditor_h +#ifdef HAVE_CONFIG_H +#include <config.h> +#endif + + #include "MEM_NonCopyable.h" #include "LOD_ManMesh2.h" #include "MT_Vector3.h" diff --git a/intern/decimation/intern/LOD_FaceNormalEditor.cpp b/intern/decimation/intern/LOD_FaceNormalEditor.cpp index ef6bc0d252e..bb384dca04c 100644 --- a/intern/decimation/intern/LOD_FaceNormalEditor.cpp +++ b/intern/decimation/intern/LOD_FaceNormalEditor.cpp @@ -32,6 +32,9 @@ // implementation of LOD_FaceNormalEditor.h /////////////////////////////////////// +#ifdef HAVE_CONFIG_H +#include <config.h> +#endif #include "LOD_FaceNormalEditor.h" diff --git a/intern/decimation/intern/LOD_FaceNormalEditor.h b/intern/decimation/intern/LOD_FaceNormalEditor.h index c3a1f9890c0..3fab4888865 100644 --- a/intern/decimation/intern/LOD_FaceNormalEditor.h +++ b/intern/decimation/intern/LOD_FaceNormalEditor.h @@ -33,6 +33,11 @@ #define NAN_INCLUDED_FaceNormalEditor_h +#ifdef HAVE_CONFIG_H +#include <config.h> +#endif + + #include "MEM_NonCopyable.h" #include "LOD_ManMesh2.h" #include "MT_Vector3.h" diff --git a/intern/decimation/intern/LOD_ManMesh2.cpp b/intern/decimation/intern/LOD_ManMesh2.cpp index f0bf40f577c..322a48e337b 100644 --- a/intern/decimation/intern/LOD_ManMesh2.cpp +++ b/intern/decimation/intern/LOD_ManMesh2.cpp @@ -29,6 +29,10 @@ * ***** END GPL/BL DUAL LICENSE BLOCK ***** */ +#ifdef HAVE_CONFIG_H +#include <config.h> +#endif + #include "LOD_ManMesh2.h" #include "MT_assert.h" diff --git a/intern/decimation/intern/LOD_ManMesh2.h b/intern/decimation/intern/LOD_ManMesh2.h index 6b52e574f4d..bcd137f261f 100644 --- a/intern/decimation/intern/LOD_ManMesh2.h +++ b/intern/decimation/intern/LOD_ManMesh2.h @@ -33,6 +33,11 @@ #define NAN_INCLUDED_ManMesh2_h +#ifdef HAVE_CONFIG_H +#include <config.h> +#endif + + #include "LOD_MeshPrimitives.h" #include "MEM_SmartPtr.h" #include <vector> diff --git a/intern/decimation/intern/LOD_MeshBounds.h b/intern/decimation/intern/LOD_MeshBounds.h index f9e1e08d9d3..74fcbc41480 100644 --- a/intern/decimation/intern/LOD_MeshBounds.h +++ b/intern/decimation/intern/LOD_MeshBounds.h @@ -33,6 +33,10 @@ #define NAN_INCLUDED_MeshBounds_h +#ifdef HAVE_CONFIG_H +#include <config.h> +#endif + #include "MEM_SmartPtr.h" #include "LOD_MeshPrimitives.h" diff --git a/intern/decimation/intern/LOD_MeshException.h b/intern/decimation/intern/LOD_MeshException.h index 0f8d1de546a..252c86c5fb1 100644 --- a/intern/decimation/intern/LOD_MeshException.h +++ b/intern/decimation/intern/LOD_MeshException.h @@ -30,9 +30,11 @@ */ #ifndef NAN_INCLUDED_MeshExceptions_h - #define NAN_INCLUDED_MeshExceptions_h +#ifdef HAVE_CONFIG_H +#include <config.h> +#endif class LOD_MeshException { diff --git a/intern/decimation/intern/LOD_MeshPrimitives.cpp b/intern/decimation/intern/LOD_MeshPrimitives.cpp index 147e107cb4b..16b80cdeea8 100644 --- a/intern/decimation/intern/LOD_MeshPrimitives.cpp +++ b/intern/decimation/intern/LOD_MeshPrimitives.cpp @@ -29,6 +29,10 @@ * ***** END GPL/BL DUAL LICENSE BLOCK ***** */ +#ifdef HAVE_CONFIG_H +#include <config.h> +#endif + #include "LOD_MeshPrimitives.h" #include "MT_assert.h" diff --git a/intern/decimation/intern/LOD_MeshPrimitives.h b/intern/decimation/intern/LOD_MeshPrimitives.h index 12214c7528d..0ffb34e1cc3 100644 --- a/intern/decimation/intern/LOD_MeshPrimitives.h +++ b/intern/decimation/intern/LOD_MeshPrimitives.h @@ -30,9 +30,12 @@ */ #ifndef NAN_INCLUDED_MeshPrimitives_h - #define NAN_INCLUDED_MeshPrimitives_h +#ifdef HAVE_CONFIG_H +#include <config.h> +#endif + #include "MT_Vector3.h" #include "CTR_TaggedIndex.h" #include "CTR_UHeap.h" diff --git a/intern/decimation/intern/LOD_QSDecimator.cpp b/intern/decimation/intern/LOD_QSDecimator.cpp index bf08de8e9de..231f076a78c 100644 --- a/intern/decimation/intern/LOD_QSDecimator.cpp +++ b/intern/decimation/intern/LOD_QSDecimator.cpp @@ -29,6 +29,10 @@ * ***** END GPL/BL DUAL LICENSE BLOCK ***** */ +#ifdef HAVE_CONFIG_H +#include <config.h> +#endif + #include "LOD_QSDecimator.h" #include "LOD_ExternBufferEditor.h" diff --git a/intern/decimation/intern/LOD_QSDecimator.h b/intern/decimation/intern/LOD_QSDecimator.h index 12846c04aae..f1364668e41 100644 --- a/intern/decimation/intern/LOD_QSDecimator.h +++ b/intern/decimation/intern/LOD_QSDecimator.h @@ -30,9 +30,12 @@ */ #ifndef NAN_INCLUDED_LOD_QSDecimator_H - #define NAN_INCLUDED_LOD_QSDecimator_H +#ifdef HAVE_CONFIG_H +#include <config.h> +#endif + #include "MEM_NonCopyable.h" #include "LOD_ManMesh2.h" #include "LOD_ExternNormalEditor.h" diff --git a/intern/decimation/intern/LOD_Quadric.h b/intern/decimation/intern/LOD_Quadric.h index d5b85c9ab71..16d3911538b 100644 --- a/intern/decimation/intern/LOD_Quadric.h +++ b/intern/decimation/intern/LOD_Quadric.h @@ -30,9 +30,12 @@ */ #ifndef NAN_INCLUDED_LOD_Quadric_h - #define NAN_INCLUDED_LOD_Quadric_h +#ifdef HAVE_CONFIG_H +#include <config.h> +#endif + #include "MT_Vector3.h" #include "MT_Matrix3x3.h" diff --git a/intern/decimation/intern/LOD_QuadricEditor.cpp b/intern/decimation/intern/LOD_QuadricEditor.cpp index 751f5d1e7e0..c1e5614b01d 100644 --- a/intern/decimation/intern/LOD_QuadricEditor.cpp +++ b/intern/decimation/intern/LOD_QuadricEditor.cpp @@ -29,8 +29,11 @@ * ***** END GPL/BL DUAL LICENSE BLOCK ***** */ -#include "LOD_QuadricEditor.h" +#ifdef HAVE_CONFIG_H +#include <config.h> +#endif +#include "LOD_QuadricEditor.h" #include "LOD_ExternNormalEditor.h" // Creation diff --git a/intern/decimation/intern/LOD_QuadricEditor.h b/intern/decimation/intern/LOD_QuadricEditor.h index d7f230ec2da..0e3a9d1813c 100644 --- a/intern/decimation/intern/LOD_QuadricEditor.h +++ b/intern/decimation/intern/LOD_QuadricEditor.h @@ -30,9 +30,12 @@ */ #ifndef NAN_INCLUDED_LOD_QuadricEditor_h - #define NAN_INCLUDED_LOD_QuadricEditor_h +#ifdef HAVE_CONFIG_H +#include <config.h> +#endif + #include "MEM_NonCopyable.h" #include "LOD_ManMesh2.h" #include "MT_Vector3.h" diff --git a/intern/decimation/intern/LOD_decimation.cpp b/intern/decimation/intern/LOD_decimation.cpp index 7bbc0945424..0f6500b829d 100644 --- a/intern/decimation/intern/LOD_decimation.cpp +++ b/intern/decimation/intern/LOD_decimation.cpp @@ -30,7 +30,9 @@ */ // implementation of external c api - +#ifdef HAVE_CONFIG_H +#include <config.h> +#endif #include "../extern/LOD_decimation.h" #include "LOD_DecimationClass.h" diff --git a/intern/ghost/GHOST_C-api.h b/intern/ghost/GHOST_C-api.h index 10b986a55b0..528e3ac6e70 100644 --- a/intern/ghost/GHOST_C-api.h +++ b/intern/ghost/GHOST_C-api.h @@ -30,11 +30,13 @@ */ #ifndef GHOST_C_API_H - #define GHOST_C_API_H #include "GHOST_Types.h" +#ifdef HAVE_CONFIG_H +#include <config.h> +#endif #ifdef __cplusplus extern "C" { diff --git a/intern/ghost/GHOST_IEvent.h b/intern/ghost/GHOST_IEvent.h index eb60b5d2e53..d47e5448dba 100644 --- a/intern/ghost/GHOST_IEvent.h +++ b/intern/ghost/GHOST_IEvent.h @@ -40,6 +40,10 @@ #ifndef _GHOST_IEVENT_H_ #define _GHOST_IEVENT_H_ +#ifdef HAVE_CONFIG_H +#include <config.h> +#endif + #include "GHOST_Types.h" class GHOST_IWindow; diff --git a/intern/ghost/GHOST_IEventConsumer.h b/intern/ghost/GHOST_IEventConsumer.h index ddb3de99953..f4fe85c06a9 100644 --- a/intern/ghost/GHOST_IEventConsumer.h +++ b/intern/ghost/GHOST_IEventConsumer.h @@ -40,6 +40,10 @@ #ifndef _GHOST_IEVENT_CONSUMER_H_ #define _GHOST_IEVENT_CONSUMER_H_ +#ifdef HAVE_CONFIG_H +#include <config.h> +#endif + #include "GHOST_IEvent.h" /** diff --git a/intern/ghost/GHOST_ISystem.h b/intern/ghost/GHOST_ISystem.h index 56c32ee870a..ef01eb5d8bd 100644 --- a/intern/ghost/GHOST_ISystem.h +++ b/intern/ghost/GHOST_ISystem.h @@ -40,6 +40,10 @@ #ifndef _GHOST_ISYSTEM_H_ #define _GHOST_ISYSTEM_H_ +#ifdef HAVE_CONFIG_H +#include <config.h> +#endif + #include "GHOST_Types.h" #include "GHOST_ITimerTask.h" #include "GHOST_IWindow.h" diff --git a/intern/ghost/GHOST_ITimerTask.h b/intern/ghost/GHOST_ITimerTask.h index dd952728ed1..ea8d73e8cc1 100644 --- a/intern/ghost/GHOST_ITimerTask.h +++ b/intern/ghost/GHOST_ITimerTask.h @@ -40,6 +40,9 @@ #ifndef _GHOST_ITIMER_TASK_H_ #define _GHOST_ITIMER_TASK_H_ +#ifdef HAVE_CONFIG_H +#include <config.h> +#endif #include "GHOST_Types.h" diff --git a/intern/ghost/GHOST_IWindow.h b/intern/ghost/GHOST_IWindow.h index ee576230890..a3e5bd0e788 100644 --- a/intern/ghost/GHOST_IWindow.h +++ b/intern/ghost/GHOST_IWindow.h @@ -40,6 +40,10 @@ #ifndef _GHOST_IWINDOW_H_ #define _GHOST_IWINDOW_H_ +#ifdef HAVE_CONFIG_H +#include <config.h> +#endif + #include "STR_String.h" #include "GHOST_Rect.h" #include "GHOST_Types.h" diff --git a/intern/ghost/GHOST_Rect.h b/intern/ghost/GHOST_Rect.h index fdf88697d94..22611516000 100644 --- a/intern/ghost/GHOST_Rect.h +++ b/intern/ghost/GHOST_Rect.h @@ -40,6 +40,10 @@ #ifndef _H_GHOST_Rect #define _H_GHOST_Rect +#ifdef HAVE_CONFIG_H +#include <config.h> +#endif + #include "GHOST_Types.h" diff --git a/intern/ghost/GHOST_Types.h b/intern/ghost/GHOST_Types.h index b48e8f2054c..7362a26d52c 100644 --- a/intern/ghost/GHOST_Types.h +++ b/intern/ghost/GHOST_Types.h @@ -40,6 +40,10 @@ #ifndef _GHOST_TYPES_H_ #define _GHOST_TYPES_H_ +#ifdef HAVE_CONFIG_H +#include <config.h> +#endif + typedef char GHOST_TInt8; typedef unsigned char GHOST_TUns8; typedef short GHOST_TInt16; diff --git a/intern/ghost/intern/GHOST_Buttons.cpp b/intern/ghost/intern/GHOST_Buttons.cpp index 6e0c46e17a0..fb878ee6244 100644 --- a/intern/ghost/intern/GHOST_Buttons.cpp +++ b/intern/ghost/intern/GHOST_Buttons.cpp @@ -39,6 +39,11 @@ #include "GHOST_Buttons.h" +#ifdef HAVE_CONFIG_H +#include <config.h> +#endif + + GHOST_Buttons::GHOST_Buttons() { diff --git a/intern/ghost/intern/GHOST_Buttons.h b/intern/ghost/intern/GHOST_Buttons.h index d803ace4352..c1c41566c26 100644 --- a/intern/ghost/intern/GHOST_Buttons.h +++ b/intern/ghost/intern/GHOST_Buttons.h @@ -40,6 +40,10 @@ #ifndef _GHOST_BUTTONS_H_ #define _GHOST_BUTTONS_H_ +#ifdef HAVE_CONFIG_H +#include <config.h> +#endif + #include "GHOST_Types.h" diff --git a/intern/ghost/intern/GHOST_C-api.cpp b/intern/ghost/intern/GHOST_C-api.cpp index 3ab3ce67fe8..5f7866b3c85 100644 --- a/intern/ghost/intern/GHOST_C-api.cpp +++ b/intern/ghost/intern/GHOST_C-api.cpp @@ -40,6 +40,10 @@ #include <stdlib.h> +#ifdef HAVE_CONFIG_H +#include <config.h> +#endif + #include "intern/GHOST_Debug.h" #include "GHOST_C-api.h" #include "GHOST_ISystem.h" diff --git a/intern/ghost/intern/GHOST_CallbackEventConsumer.cpp b/intern/ghost/intern/GHOST_CallbackEventConsumer.cpp index 8099bdbd1d5..2a5e7fb9b71 100644 --- a/intern/ghost/intern/GHOST_CallbackEventConsumer.cpp +++ b/intern/ghost/intern/GHOST_CallbackEventConsumer.cpp @@ -37,6 +37,10 @@ * @date October 25, 2001 */ +#ifdef HAVE_CONFIG_H +#include <config.h> +#endif + #include "GHOST_Debug.h" #include "GHOST_C-api.h" #include "GHOST_CallbackEventConsumer.h" diff --git a/intern/ghost/intern/GHOST_CallbackEventConsumer.h b/intern/ghost/intern/GHOST_CallbackEventConsumer.h index bdbbb7d7fea..41dfd187fee 100644 --- a/intern/ghost/intern/GHOST_CallbackEventConsumer.h +++ b/intern/ghost/intern/GHOST_CallbackEventConsumer.h @@ -40,6 +40,10 @@ #ifndef _GHOST_CALLBACK_EVENT_CONSUMER_H_ #define _GHOST_CALLBACK_EVENT_CONSUMER_H_ +#ifdef HAVE_CONFIG_H +#include <config.h> +#endif + #include "GHOST_IEventConsumer.h" #include "GHOST_C-api.h" diff --git a/intern/ghost/intern/GHOST_Debug.h b/intern/ghost/intern/GHOST_Debug.h index b63aaedfdec..cf351a24b78 100644 --- a/intern/ghost/intern/GHOST_Debug.h +++ b/intern/ghost/intern/GHOST_Debug.h @@ -40,6 +40,10 @@ #ifndef _GHOST_DEBUG_H_ #define _GHOST_DEBUG_H_ +#ifdef HAVE_CONFIG_H +#include <config.h> +#endif + #ifdef WIN32 #ifdef _DEBUG #pragma warning (disable:4786) // suppress stl-MSVC debug info warning diff --git a/intern/ghost/intern/GHOST_DisplayManager.cpp b/intern/ghost/intern/GHOST_DisplayManager.cpp index dc662634434..b36143ee1a9 100644 --- a/intern/ghost/intern/GHOST_DisplayManager.cpp +++ b/intern/ghost/intern/GHOST_DisplayManager.cpp @@ -37,8 +37,11 @@ * @date September 21, 2001 */ -#include "GHOST_DisplayManager.h" +#ifdef HAVE_CONFIG_H +#include <config.h> +#endif +#include "GHOST_DisplayManager.h" #include "GHOST_Debug.h" diff --git a/intern/ghost/intern/GHOST_DisplayManager.h b/intern/ghost/intern/GHOST_DisplayManager.h index a206243df79..645274d4bcd 100644 --- a/intern/ghost/intern/GHOST_DisplayManager.h +++ b/intern/ghost/intern/GHOST_DisplayManager.h @@ -40,6 +40,10 @@ #ifndef _GHOST_DISPLAY_MANAGER_H_ #define _GHOST_DISPLAY_MANAGER_H_ +#ifdef HAVE_CONFIG_H +#include <config.h> +#endif + #include "GHOST_Types.h" #ifdef WIN32 diff --git a/intern/ghost/intern/GHOST_DisplayManagerCarbon.cpp b/intern/ghost/intern/GHOST_DisplayManagerCarbon.cpp index 3220fa1a330..8984008f93d 100644 --- a/intern/ghost/intern/GHOST_DisplayManagerCarbon.cpp +++ b/intern/ghost/intern/GHOST_DisplayManagerCarbon.cpp @@ -37,8 +37,11 @@ * @date September 21, 2001 */ -#include "GHOST_DisplayManagerCarbon.h" +#ifdef HAVE_CONFIG_H +#include <config.h> +#endif +#include "GHOST_DisplayManagerCarbon.h" #include "GHOST_Debug.h" // We do not support multiple monitors at the moment diff --git a/intern/ghost/intern/GHOST_DisplayManagerCarbon.h b/intern/ghost/intern/GHOST_DisplayManagerCarbon.h index 644761f5c2a..b5b6dc05e94 100644 --- a/intern/ghost/intern/GHOST_DisplayManagerCarbon.h +++ b/intern/ghost/intern/GHOST_DisplayManagerCarbon.h @@ -40,6 +40,10 @@ #ifndef _GHOST_DISPLAY_MANAGER_CARBON_H_ #define _GHOST_DISPLAY_MANAGER_CARBON_H_ +#ifdef HAVE_CONFIG_H +#include <config.h> +#endif + #ifndef __APPLE__ #error Apple only! #endif // __APPLE__ diff --git a/intern/ghost/intern/GHOST_DisplayManagerWin32.cpp b/intern/ghost/intern/GHOST_DisplayManagerWin32.cpp index 60892ce094e..0e5e82f1f11 100644 --- a/intern/ghost/intern/GHOST_DisplayManagerWin32.cpp +++ b/intern/ghost/intern/GHOST_DisplayManagerWin32.cpp @@ -37,8 +37,11 @@ * @date September 21, 2001 */ -#include "GHOST_DisplayManagerWin32.h" +#ifdef HAVE_CONFIG_H +#include <config.h> +#endif +#include "GHOST_DisplayManagerWin32.h" #include "GHOST_Debug.h" // We do not support multiple monitors at the moment diff --git a/intern/ghost/intern/GHOST_DisplayManagerWin32.h b/intern/ghost/intern/GHOST_DisplayManagerWin32.h index 93be57c72cd..7eca752cea1 100644 --- a/intern/ghost/intern/GHOST_DisplayManagerWin32.h +++ b/intern/ghost/intern/GHOST_DisplayManagerWin32.h @@ -40,6 +40,10 @@ #ifndef _GHOST_DISPLAY_MANAGER_WIN32_H_ #define _GHOST_DISPLAY_MANAGER_WIN32_H_ +#ifdef HAVE_CONFIG_H +#include <config.h> +#endif + #ifndef WIN32 #error WIN32 only! #endif // WIN32 diff --git a/intern/ghost/intern/GHOST_DisplayManagerX11.cpp b/intern/ghost/intern/GHOST_DisplayManagerX11.cpp index 1eb0e0a10ca..9695e24e737 100755 --- a/intern/ghost/intern/GHOST_DisplayManagerX11.cpp +++ b/intern/ghost/intern/GHOST_DisplayManagerX11.cpp @@ -29,8 +29,11 @@ * ***** END GPL/BL DUAL LICENSE BLOCK ***** */ -#include "GHOST_DisplayManagerX11.h" +#ifdef HAVE_CONFIG_H +#include <config.h> +#endif +#include "GHOST_DisplayManagerX11.h" #include "GHOST_SystemX11.h" diff --git a/intern/ghost/intern/GHOST_DisplayManagerX11.h b/intern/ghost/intern/GHOST_DisplayManagerX11.h index 38819b54231..d74e54ce7ab 100755 --- a/intern/ghost/intern/GHOST_DisplayManagerX11.h +++ b/intern/ghost/intern/GHOST_DisplayManagerX11.h @@ -40,6 +40,9 @@ #ifndef _GHOST_DISPLAY_MANAGER_X11_H_ #define _GHOST_DISPLAY_MANAGER_X11_H_ +#ifdef HAVE_CONFIG_H +#include <config.h> +#endif #include "GHOST_DisplayManager.h" diff --git a/intern/ghost/intern/GHOST_Event.h b/intern/ghost/intern/GHOST_Event.h index 05c133cb332..481a7dc8ddf 100644 --- a/intern/ghost/intern/GHOST_Event.h +++ b/intern/ghost/intern/GHOST_Event.h @@ -40,6 +40,10 @@ #ifndef _GHOST_EVENT_H_ #define _GHOST_EVENT_H_ +#ifdef HAVE_CONFIG_H +#include <config.h> +#endif + #include "GHOST_IEvent.h" diff --git a/intern/ghost/intern/GHOST_EventButton.h b/intern/ghost/intern/GHOST_EventButton.h index 013aa92e2fb..0514e958418 100644 --- a/intern/ghost/intern/GHOST_EventButton.h +++ b/intern/ghost/intern/GHOST_EventButton.h @@ -40,6 +40,10 @@ #ifndef _GHOST_EVENT_BUTTON_H_ #define _GHOST_EVENT_BUTTON_H_ +#ifdef HAVE_CONFIG_H +#include <config.h> +#endif + #include "GHOST_Event.h" /** diff --git a/intern/ghost/intern/GHOST_EventCursor.h b/intern/ghost/intern/GHOST_EventCursor.h index 5d14e289715..592fba4f5af 100644 --- a/intern/ghost/intern/GHOST_EventCursor.h +++ b/intern/ghost/intern/GHOST_EventCursor.h @@ -40,6 +40,10 @@ #ifndef _GHOST_EVENT_CURSOR_H_ #define _GHOST_EVENT_CURSOR_H_ +#ifdef HAVE_CONFIG_H +#include <config.h> +#endif + #include "GHOST_Event.h" /** diff --git a/intern/ghost/intern/GHOST_EventKey.h b/intern/ghost/intern/GHOST_EventKey.h index d31ba845426..5db60da23fa 100644 --- a/intern/ghost/intern/GHOST_EventKey.h +++ b/intern/ghost/intern/GHOST_EventKey.h @@ -40,6 +40,10 @@ #ifndef _GHOST_EVENT_KEY_H_ #define _GHOST_EVENT_KEY_H_ +#ifdef HAVE_CONFIG_H +#include <config.h> +#endif + #include "GHOST_Event.h" /** diff --git a/intern/ghost/intern/GHOST_EventManager.cpp b/intern/ghost/intern/GHOST_EventManager.cpp index f4a8b72db25..878a5f812c6 100644 --- a/intern/ghost/intern/GHOST_EventManager.cpp +++ b/intern/ghost/intern/GHOST_EventManager.cpp @@ -38,11 +38,13 @@ */ #include "GHOST_EventManager.h" - #include <algorithm> - #include "GHOST_Debug.h" +#ifdef HAVE_CONFIG_H +#include <config.h> +#endif + GHOST_EventManager::GHOST_EventManager() { diff --git a/intern/ghost/intern/GHOST_EventManager.h b/intern/ghost/intern/GHOST_EventManager.h index 7f955eb42df..5b9f13d314c 100644 --- a/intern/ghost/intern/GHOST_EventManager.h +++ b/intern/ghost/intern/GHOST_EventManager.h @@ -40,6 +40,10 @@ #ifndef _GHOST_EVENT_MANAGER_H_ #define _GHOST_EVENT_MANAGER_H_ +#ifdef HAVE_CONFIG_H +#include <config.h> +#endif + #ifdef WIN32 #pragma warning (disable:4786) // suppress stl-MSVC debug info warning #endif // WIN32 diff --git a/intern/ghost/intern/GHOST_EventPrinter.cpp b/intern/ghost/intern/GHOST_EventPrinter.cpp index 16576357fbc..362b40fe504 100644 --- a/intern/ghost/intern/GHOST_EventPrinter.cpp +++ b/intern/ghost/intern/GHOST_EventPrinter.cpp @@ -38,12 +38,15 @@ */ #include "GHOST_EventPrinter.h" - #include <iostream> - #include "GHOST_EventKey.h" #include "GHOST_Debug.h" +#ifdef HAVE_CONFIG_H +#include <config.h> +#endif + + bool GHOST_EventPrinter::processEvent(GHOST_IEvent* event) { bool handled = true; diff --git a/intern/ghost/intern/GHOST_EventPrinter.h b/intern/ghost/intern/GHOST_EventPrinter.h index a943742026d..70208f0a5dc 100644 --- a/intern/ghost/intern/GHOST_EventPrinter.h +++ b/intern/ghost/intern/GHOST_EventPrinter.h @@ -40,6 +40,10 @@ #ifndef _GHOST_EVENT_PRINTER_H_ #define _GHOST_EVENT_PRINTER_H_ +#ifdef HAVE_CONFIG_H +#include <config.h> +#endif + #include "GHOST_IEventConsumer.h" #include "STR_String.h" diff --git a/intern/ghost/intern/GHOST_ISystem.cpp b/intern/ghost/intern/GHOST_ISystem.cpp index 6505194645a..0c2fce952e5 100644 --- a/intern/ghost/intern/GHOST_ISystem.cpp +++ b/intern/ghost/intern/GHOST_ISystem.cpp @@ -37,6 +37,10 @@ * @date May 7, 2001 */ +#ifdef HAVE_CONFIG_H +#include <config.h> +#endif + #include "GHOST_ISystem.h" #ifdef WIN32 diff --git a/intern/ghost/intern/GHOST_ModifierKeys.cpp b/intern/ghost/intern/GHOST_ModifierKeys.cpp index 930ddf97f9a..3e1b7fcc4cd 100644 --- a/intern/ghost/intern/GHOST_ModifierKeys.cpp +++ b/intern/ghost/intern/GHOST_ModifierKeys.cpp @@ -37,6 +37,10 @@ * @date May 31, 2001 */ +#ifdef HAVE_CONFIG_H +#include <config.h> +#endif + #include "GHOST_ModifierKeys.h" diff --git a/intern/ghost/intern/GHOST_ModifierKeys.h b/intern/ghost/intern/GHOST_ModifierKeys.h index 6b1e3c2e970..19ffd192f45 100644 --- a/intern/ghost/intern/GHOST_ModifierKeys.h +++ b/intern/ghost/intern/GHOST_ModifierKeys.h @@ -40,6 +40,10 @@ #ifndef _GHOST_MODIFIER_KEYS_H_ #define _GHOST_MODIFIER_KEYS_H_ +#ifdef HAVE_CONFIG_H +#include <config.h> +#endif + #include "GHOST_Types.h" struct GHOST_ModifierKeys diff --git a/intern/ghost/intern/GHOST_Rect.cpp b/intern/ghost/intern/GHOST_Rect.cpp index cb600815f69..70773fe1497 100644 --- a/intern/ghost/intern/GHOST_Rect.cpp +++ b/intern/ghost/intern/GHOST_Rect.cpp @@ -29,6 +29,10 @@ * ***** END GPL/BL DUAL LICENSE BLOCK ***** */ +#ifdef HAVE_CONFIG_H +#include <config.h> +#endif + #include "GHOST_Rect.h" diff --git a/intern/ghost/intern/GHOST_System.cpp b/intern/ghost/intern/GHOST_System.cpp index 5585be62f5a..50acc19383b 100644 --- a/intern/ghost/intern/GHOST_System.cpp +++ b/intern/ghost/intern/GHOST_System.cpp @@ -37,6 +37,10 @@ * @date May 7, 2001 */ +#ifdef HAVE_CONFIG_H +#include <config.h> +#endif + #include "GHOST_System.h" #include <time.h> diff --git a/intern/ghost/intern/GHOST_System.h b/intern/ghost/intern/GHOST_System.h index 533665b6671..3c763b8d230 100644 --- a/intern/ghost/intern/GHOST_System.h +++ b/intern/ghost/intern/GHOST_System.h @@ -40,6 +40,10 @@ #ifndef _GHOST_SYSTEM_H_ #define _GHOST_SYSTEM_H_ +#ifdef HAVE_CONFIG_H +#include <config.h> +#endif + #include "GHOST_ISystem.h" #include "GHOST_Debug.h" diff --git a/intern/ghost/intern/GHOST_SystemCarbon.cpp b/intern/ghost/intern/GHOST_SystemCarbon.cpp index baba1bb4e6c..802ff17a147 100644 --- a/intern/ghost/intern/GHOST_SystemCarbon.cpp +++ b/intern/ghost/intern/GHOST_SystemCarbon.cpp @@ -37,6 +37,10 @@ * @date May 7, 2001 */ +#ifdef HAVE_CONFIG_H +#include <config.h> +#endif + #include "GHOST_SystemCarbon.h" #include "GHOST_DisplayManagerCarbon.h" diff --git a/intern/ghost/intern/GHOST_SystemCarbon.h b/intern/ghost/intern/GHOST_SystemCarbon.h index 3648b41e4b5..f76fd5a98b8 100644 --- a/intern/ghost/intern/GHOST_SystemCarbon.h +++ b/intern/ghost/intern/GHOST_SystemCarbon.h @@ -46,8 +46,11 @@ #include <Carbon/Carbon.h> -#include "GHOST_System.h" +#ifdef HAVE_CONFIG_H +#include <config.h> +#endif +#include "GHOST_System.h" class GHOST_EventCursor; class GHOST_EventKey; diff --git a/intern/ghost/intern/GHOST_SystemCocoa.h b/intern/ghost/intern/GHOST_SystemCocoa.h index 96199af6346..563f88d3f7d 100644 --- a/intern/ghost/intern/GHOST_SystemCocoa.h +++ b/intern/ghost/intern/GHOST_SystemCocoa.h @@ -40,6 +40,10 @@ #ifndef _GHOST_SYSTEM_CARBON_H_ #define _GHOST_SYSTEM_CARBON_H_ +#ifdef HAVE_CONFIG_H +#include <config.h> +#endif + #ifndef __APPLE__ #error Apple OSX only! #endif // __APPLE__ diff --git a/intern/ghost/intern/GHOST_SystemWin32.cpp b/intern/ghost/intern/GHOST_SystemWin32.cpp index 6dc00bd1847..3582554ba44 100644 --- a/intern/ghost/intern/GHOST_SystemWin32.cpp +++ b/intern/ghost/intern/GHOST_SystemWin32.cpp @@ -37,6 +37,10 @@ * @date May 7, 2001 */ +#ifdef HAVE_CONFIG_H +#include <config.h> +#endif + #include "GHOST_SystemWin32.h" diff --git a/intern/ghost/intern/GHOST_SystemWin32.h b/intern/ghost/intern/GHOST_SystemWin32.h index ccdfbf5fda6..2e16cda2454 100644 --- a/intern/ghost/intern/GHOST_SystemWin32.h +++ b/intern/ghost/intern/GHOST_SystemWin32.h @@ -40,14 +40,18 @@ #ifndef _GHOST_SYSTEM_WIN32_H_ #define _GHOST_SYSTEM_WIN32_H_ +#ifdef HAVE_CONFIG_H +#include <config.h> +#endif + #ifndef WIN32 #error WIN32 only! #endif // WIN32 -#include "GHOST_System.h" - #include <windows.h> +#include "GHOST_System.h" + #if defined(__CYGWIN32__) # define __int64 long long #endif diff --git a/intern/ghost/intern/GHOST_SystemX11.cpp b/intern/ghost/intern/GHOST_SystemX11.cpp index 77c13d66de2..0d4752634a1 100755 --- a/intern/ghost/intern/GHOST_SystemX11.cpp +++ b/intern/ghost/intern/GHOST_SystemX11.cpp @@ -60,6 +60,9 @@ * ***** END GPL/BL DUAL LICENSE BLOCK ***** */ +#ifdef HAVE_CONFIG_H +#include <config.h> +#endif #include "GHOST_SystemX11.h" #include "GHOST_WindowX11.h" diff --git a/intern/ghost/intern/GHOST_SystemX11.h b/intern/ghost/intern/GHOST_SystemX11.h index 6cb9f06ea3f..54b0f7874d1 100755 --- a/intern/ghost/intern/GHOST_SystemX11.h +++ b/intern/ghost/intern/GHOST_SystemX11.h @@ -40,12 +40,16 @@ #ifndef _GHOST_SYSTEM_X11_H_ #define _GHOST_SYSTEM_X11_H_ -#include "GHOST_System.h" -#include "../GHOST_Types.h" - #include <X11/Xlib.h> #include <GL/glx.h> +#ifdef HAVE_CONFIG_H +#include <config.h> +#endif + +#include "GHOST_System.h" +#include "../GHOST_Types.h" + class GHOST_WindowX11; /** diff --git a/intern/ghost/intern/GHOST_TimerManager.cpp b/intern/ghost/intern/GHOST_TimerManager.cpp index e54dfce86f9..9f50b350baa 100644 --- a/intern/ghost/intern/GHOST_TimerManager.cpp +++ b/intern/ghost/intern/GHOST_TimerManager.cpp @@ -37,6 +37,10 @@ * @date May 31, 2001 */ +#ifdef HAVE_CONFIG_H +#include <config.h> +#endif + #include "GHOST_TimerManager.h" #include <algorithm> diff --git a/intern/ghost/intern/GHOST_TimerManager.h b/intern/ghost/intern/GHOST_TimerManager.h index fe843442661..bfd15925b4b 100644 --- a/intern/ghost/intern/GHOST_TimerManager.h +++ b/intern/ghost/intern/GHOST_TimerManager.h @@ -40,6 +40,10 @@ #ifndef _GHOST_TIMER_MANAGER_H_ #define _GHOST_TIMER_MANAGER_H_ +#ifdef HAVE_CONFIG_H +#include <config.h> +#endif + #ifdef WIN32 #pragma warning (disable:4786) // suppress stl-MSVC debug info warning #endif // WIN32 diff --git a/intern/ghost/intern/GHOST_TimerTask.h b/intern/ghost/intern/GHOST_TimerTask.h index bbcb75f4dcd..a973b644bca 100644 --- a/intern/ghost/intern/GHOST_TimerTask.h +++ b/intern/ghost/intern/GHOST_TimerTask.h @@ -40,6 +40,10 @@ #ifndef _GHOST_TIMER_TASK_H_ #define _GHOST_TIMER_TASK_H_ +#ifdef HAVE_CONFIG_H +#include <config.h> +#endif + #include "GHOST_ITimerTask.h" diff --git a/intern/ghost/intern/GHOST_Window.cpp b/intern/ghost/intern/GHOST_Window.cpp index daa83eedcf6..a21233d4475 100644 --- a/intern/ghost/intern/GHOST_Window.cpp +++ b/intern/ghost/intern/GHOST_Window.cpp @@ -37,6 +37,10 @@ * @date May 10, 2001 */ +#ifdef HAVE_CONFIG_H +#include <config.h> +#endif + #include "GHOST_Window.h" diff --git a/intern/ghost/intern/GHOST_Window.h b/intern/ghost/intern/GHOST_Window.h index b9f1797861c..9db19100409 100644 --- a/intern/ghost/intern/GHOST_Window.h +++ b/intern/ghost/intern/GHOST_Window.h @@ -40,6 +40,9 @@ #ifndef _GHOST_WINDOW_H_ #define _GHOST_WINDOW_H_ +#ifdef HAVE_CONFIG_H +#include <config.h> +#endif #include "GHOST_IWindow.h" diff --git a/intern/ghost/intern/GHOST_WindowCarbon.cpp b/intern/ghost/intern/GHOST_WindowCarbon.cpp index 0e894a2dd43..6b468237dd6 100644 --- a/intern/ghost/intern/GHOST_WindowCarbon.cpp +++ b/intern/ghost/intern/GHOST_WindowCarbon.cpp @@ -37,6 +37,10 @@ * @date May 10, 2001 */ +#ifdef HAVE_CONFIG_H +#include <config.h> +#endif + #include "GHOST_WindowCarbon.h" #include "GHOST_Debug.h" diff --git a/intern/ghost/intern/GHOST_WindowCarbon.h b/intern/ghost/intern/GHOST_WindowCarbon.h index 8fb4663b3df..2083d479649 100644 --- a/intern/ghost/intern/GHOST_WindowCarbon.h +++ b/intern/ghost/intern/GHOST_WindowCarbon.h @@ -40,6 +40,10 @@ #ifndef _GHOST_WINDOW_CARBON_H_ #define _GHOST_WINDOW_CARBON_H_ +#ifdef HAVE_CONFIG_H +#include <config.h> +#endif + #ifndef __APPLE__ #error Apple OSX only! #endif // __APPLE__ diff --git a/intern/ghost/intern/GHOST_WindowManager.cpp b/intern/ghost/intern/GHOST_WindowManager.cpp index a281145ac29..abce72e259c 100644 --- a/intern/ghost/intern/GHOST_WindowManager.cpp +++ b/intern/ghost/intern/GHOST_WindowManager.cpp @@ -37,10 +37,12 @@ * @date May 11, 2001 */ -#include "GHOST_WindowManager.h" +#ifdef HAVE_CONFIG_H +#include <config.h> +#endif +#include "GHOST_WindowManager.h" #include <algorithm> - #include "GHOST_Debug.h" #include "GHOST_Window.h" diff --git a/intern/ghost/intern/GHOST_WindowManager.h b/intern/ghost/intern/GHOST_WindowManager.h index b759b653196..3f01b10dd1c 100644 --- a/intern/ghost/intern/GHOST_WindowManager.h +++ b/intern/ghost/intern/GHOST_WindowManager.h @@ -40,6 +40,9 @@ #ifndef _GHOST_WINDOW_MANAGER_H_ #define _GHOST_WINDOW_MANAGER_H_ +#ifdef HAVE_CONFIG_H +#include <config.h> +#endif #ifdef WIN32 #pragma warning (disable:4786) // suppress stl-MSVC debug info warning diff --git a/intern/ghost/intern/GHOST_WindowWin32.cpp b/intern/ghost/intern/GHOST_WindowWin32.cpp index 239a020083b..b8e179650ba 100644 --- a/intern/ghost/intern/GHOST_WindowWin32.cpp +++ b/intern/ghost/intern/GHOST_WindowWin32.cpp @@ -37,10 +37,12 @@ * @date May 10, 2001 */ -#include <string.h> +#ifdef HAVE_CONFIG_H +#include <config.h> +#endif +#include <string.h> #include "GHOST_WindowWin32.h" - #include <GL/gl.h> LPCSTR GHOST_WindowWin32::s_windowClassName = "GHOST_WindowClass"; diff --git a/intern/ghost/intern/GHOST_WindowWin32.h b/intern/ghost/intern/GHOST_WindowWin32.h index 2663869ea47..6af8ea0df41 100644 --- a/intern/ghost/intern/GHOST_WindowWin32.h +++ b/intern/ghost/intern/GHOST_WindowWin32.h @@ -40,6 +40,10 @@ #ifndef _GHOST_WINDOW_WIN32_H_ #define _GHOST_WINDOW_WIN32_H_ +#ifdef HAVE_CONFIG_H +#include <config.h> +#endif + #ifndef WIN32 #error WIN32 only! #endif // WIN32 diff --git a/intern/ghost/intern/GHOST_WindowX11.cpp b/intern/ghost/intern/GHOST_WindowX11.cpp index 81592c1984c..7d3d7dfe62c 100755 --- a/intern/ghost/intern/GHOST_WindowX11.cpp +++ b/intern/ghost/intern/GHOST_WindowX11.cpp @@ -29,8 +29,11 @@ * ***** END GPL/BL DUAL LICENSE BLOCK ***** */ -#include "GHOST_WindowX11.h" +#ifdef HAVE_CONFIG_H +#include <config.h> +#endif +#include "GHOST_WindowX11.h" #include "GHOST_SystemX11.h" #include "STR_String.h" #include "GHOST_Debug.h" diff --git a/intern/ghost/intern/GHOST_WindowX11.h b/intern/ghost/intern/GHOST_WindowX11.h index 5a56a9a82e9..026253faa8d 100755 --- a/intern/ghost/intern/GHOST_WindowX11.h +++ b/intern/ghost/intern/GHOST_WindowX11.h @@ -40,6 +40,10 @@ #ifndef _GHOST_WINDOWX11_H_ #define _GHOST_WINDOWX11_H_ +#ifdef HAVE_CONFIG_H +#include <config.h> +#endif + #include "GHOST_Window.h" #include <X11/Xlib.h> #include <GL/glx.h> diff --git a/intern/ghost/test/gears/GHOST_C-Test.c b/intern/ghost/test/gears/GHOST_C-Test.c index 16d8b421d5b..731e711b1c3 100644 --- a/intern/ghost/test/gears/GHOST_C-Test.c +++ b/intern/ghost/test/gears/GHOST_C-Test.c @@ -46,6 +46,10 @@ #include <string.h> #include <math.h> +#ifdef HAVE_CONFIG_H +#include <config.h> +#endif + #include "GHOST_C-api.h" #if defined(WIN32) || defined(__APPLE__) diff --git a/intern/ghost/test/gears/GHOST_Test.cpp b/intern/ghost/test/gears/GHOST_Test.cpp index a5459c9da9b..40e980531ae 100755 --- a/intern/ghost/test/gears/GHOST_Test.cpp +++ b/intern/ghost/test/gears/GHOST_Test.cpp @@ -44,6 +44,10 @@ #include <iostream> #include <math.h> +#ifdef HAVE_CONFIG_H +#include <config.h> +#endif + #if defined(WIN32) || defined(__APPLE__) #ifdef WIN32 #include <windows.h> diff --git a/intern/ghost/test/multitest/Basic.c b/intern/ghost/test/multitest/Basic.c index c26cf7c92ca..db2ad9428b2 100644 --- a/intern/ghost/test/multitest/Basic.c +++ b/intern/ghost/test/multitest/Basic.c @@ -31,6 +31,9 @@ #include "Basic.h" +#ifdef HAVE_CONFIG_H +#include <config.h> +#endif int min_i(int a, int b) { return (a<b)?a:b; diff --git a/intern/ghost/test/multitest/Basic.h b/intern/ghost/test/multitest/Basic.h index 94fb0cdfc17..f3cd424a37a 100644 --- a/intern/ghost/test/multitest/Basic.h +++ b/intern/ghost/test/multitest/Basic.h @@ -29,6 +29,11 @@ * ***** END GPL/BL DUAL LICENSE BLOCK ***** */ +#ifdef HAVE_CONFIG_H +#include <config.h> +#endif + + int min_i (int a, int b); int max_i (int a, int b); diff --git a/intern/ghost/test/multitest/EventToBuf.c b/intern/ghost/test/multitest/EventToBuf.c index 950d80a2468..8ca8c9cecc8 100644 --- a/intern/ghost/test/multitest/EventToBuf.c +++ b/intern/ghost/test/multitest/EventToBuf.c @@ -33,6 +33,10 @@ #include <stdio.h> +#ifdef HAVE_CONFIG_H +#include <config.h> +#endif + #include "MEM_guardedalloc.h" #include "GHOST_C-api.h" diff --git a/intern/ghost/test/multitest/EventToBuf.h b/intern/ghost/test/multitest/EventToBuf.h index be6f37d869b..2e93d946f56 100644 --- a/intern/ghost/test/multitest/EventToBuf.h +++ b/intern/ghost/test/multitest/EventToBuf.h @@ -29,6 +29,10 @@ * ***** END GPL/BL DUAL LICENSE BLOCK ***** */ +#ifdef HAVE_CONFIG_H +#include <config.h> +#endif + char *eventtype_to_string(GHOST_TEventType type); void event_to_buf(GHOST_EventHandle evt, char buf[128]); diff --git a/intern/ghost/test/multitest/GL.h b/intern/ghost/test/multitest/GL.h index 7a96ae9e9f8..7aa21093fae 100644 --- a/intern/ghost/test/multitest/GL.h +++ b/intern/ghost/test/multitest/GL.h @@ -29,6 +29,10 @@ * ***** END GPL/BL DUAL LICENSE BLOCK ***** */ +#ifdef HAVE_CONFIG_H +#include <config.h> +#endif + #if defined(WIN32) || defined(__APPLE__) #ifdef WIN32 diff --git a/intern/ghost/test/multitest/MultiTest.c b/intern/ghost/test/multitest/MultiTest.c index c78d9045022..cc08441949b 100755 --- a/intern/ghost/test/multitest/MultiTest.c +++ b/intern/ghost/test/multitest/MultiTest.c @@ -41,6 +41,10 @@ #include "GL.h" +#ifdef HAVE_CONFIG_H +#include <config.h> +#endif + #include "MEM_guardedalloc.h" #include "GHOST_C-api.h" diff --git a/intern/ghost/test/multitest/ScrollBar.c b/intern/ghost/test/multitest/ScrollBar.c index cd690f6f14e..6ede0619b5f 100644 --- a/intern/ghost/test/multitest/ScrollBar.c +++ b/intern/ghost/test/multitest/ScrollBar.c @@ -33,6 +33,10 @@ #include <math.h> +#ifdef HAVE_CONFIG_H +#include <config.h> +#endif + #include "MEM_guardedalloc.h" #include "Basic.h" diff --git a/intern/ghost/test/multitest/ScrollBar.h b/intern/ghost/test/multitest/ScrollBar.h index b49ad041415..809afa5dad8 100644 --- a/intern/ghost/test/multitest/ScrollBar.h +++ b/intern/ghost/test/multitest/ScrollBar.h @@ -29,6 +29,10 @@ * ***** END GPL/BL DUAL LICENSE BLOCK ***** */ +#ifdef HAVE_CONFIG_H +#include <config.h> +#endif + typedef struct _ScrollBar ScrollBar; diff --git a/intern/ghost/test/multitest/Util.c b/intern/ghost/test/multitest/Util.c index 31e43f6f5da..4cf23ff06a9 100644 --- a/intern/ghost/test/multitest/Util.c +++ b/intern/ghost/test/multitest/Util.c @@ -35,6 +35,10 @@ #include <stdarg.h> #include <stdio.h> +#ifdef HAVE_CONFIG_H +#include <config.h> +#endif + #include "MEM_guardedalloc.h" #include "Util.h" diff --git a/intern/ghost/test/multitest/Util.h b/intern/ghost/test/multitest/Util.h index e3e51824515..18a81939d2c 100644 --- a/intern/ghost/test/multitest/Util.h +++ b/intern/ghost/test/multitest/Util.h @@ -29,6 +29,10 @@ * ***** END GPL/BL DUAL LICENSE BLOCK ***** */ +#ifdef HAVE_CONFIG_H +#include <config.h> +#endif + void* memdbl (void *mem, int *size_pr, int item_size); char* string_dup (char *str); diff --git a/intern/ghost/test/multitest/WindowData.c b/intern/ghost/test/multitest/WindowData.c index ee377c98b58..3c5739fd593 100644 --- a/intern/ghost/test/multitest/WindowData.c +++ b/intern/ghost/test/multitest/WindowData.c @@ -31,6 +31,9 @@ #include <stdlib.h> +#ifdef HAVE_CONFIG_H +#include <config.h> +#endif #include "MEM_guardedalloc.h" diff --git a/intern/ghost/test/multitest/WindowData.h b/intern/ghost/test/multitest/WindowData.h index d913697610a..7d2ca67212a 100644 --- a/intern/ghost/test/multitest/WindowData.h +++ b/intern/ghost/test/multitest/WindowData.h @@ -29,6 +29,10 @@ * ***** END GPL/BL DUAL LICENSE BLOCK ***** */ +#ifdef HAVE_CONFIG_H +#include <config.h> +#endif + typedef void (*WindowDataHandler)(void *priv, GHOST_EventHandle evt); typedef struct _WindowData WindowData; diff --git a/intern/guardedalloc/MEM_guardedalloc.h b/intern/guardedalloc/MEM_guardedalloc.h index 6280b52059c..2d84be49188 100644 --- a/intern/guardedalloc/MEM_guardedalloc.h +++ b/intern/guardedalloc/MEM_guardedalloc.h @@ -61,6 +61,10 @@ #ifndef MEM_MALLOCN_H #define MEM_MALLOCN_H +#ifdef HAVE_CONFIG_H +#include <config.h> +#endif + /* Needed for FILE* */ #include "stdio.h" diff --git a/intern/guardedalloc/intern/mallocn.c b/intern/guardedalloc/intern/mallocn.c index 64bfdea9d9a..f0cc0787a90 100644 --- a/intern/guardedalloc/intern/mallocn.c +++ b/intern/guardedalloc/intern/mallocn.c @@ -38,6 +38,10 @@ #include <stdlib.h> +#ifdef HAVE_CONFIG_H +#include <config.h> +#endif + #include "MEM_guardedalloc.h" /* --------------------------------------------------------------------- */ diff --git a/intern/guardedalloc/test/simpletest/memtest.c b/intern/guardedalloc/test/simpletest/memtest.c index f2cdc207958..7c5a8230ea7 100644 --- a/intern/guardedalloc/test/simpletest/memtest.c +++ b/intern/guardedalloc/test/simpletest/memtest.c @@ -46,6 +46,10 @@ #include <stdlib.h> #include "MEM_guardedalloc.h" +#ifdef HAVE_CONFIG_H +#include <config.h> +#endif + int main (int argc, char *argv[]) { int verbose = 0; diff --git a/intern/iksolver/extern/IK_solver.h b/intern/iksolver/extern/IK_solver.h index 7074c442cdf..5aa0cdd6992 100644 --- a/intern/iksolver/extern/IK_solver.h +++ b/intern/iksolver/extern/IK_solver.h @@ -74,7 +74,9 @@ #define NAN_INCLUDED_IK_solver_h - +#ifdef HAVE_CONFIG_H +#include <config.h> +#endif #ifdef __cplusplus extern "C" { diff --git a/intern/iksolver/intern/IK_CGChainSolver.cpp b/intern/iksolver/intern/IK_CGChainSolver.cpp index 6af4df2a35b..4c91c6b8ab1 100644 --- a/intern/iksolver/intern/IK_CGChainSolver.cpp +++ b/intern/iksolver/intern/IK_CGChainSolver.cpp @@ -29,8 +29,11 @@ * ***** END GPL/BL DUAL LICENSE BLOCK ***** */ -#include "IK_CGChainSolver.h" +#ifdef HAVE_CONFIG_H +#include <config.h> +#endif +#include "IK_CGChainSolver.h" #include "IK_Segment.h" using namespace std; diff --git a/intern/iksolver/intern/IK_Chain.cpp b/intern/iksolver/intern/IK_Chain.cpp index 875b8da1405..a86a615c859 100644 --- a/intern/iksolver/intern/IK_Chain.cpp +++ b/intern/iksolver/intern/IK_Chain.cpp @@ -29,8 +29,11 @@ * ***** END GPL/BL DUAL LICENSE BLOCK ***** */ -#include "IK_Chain.h" +#ifdef HAVE_CONFIG_H +#include <config.h> +#endif +#include "IK_Chain.h" using namespace std; diff --git a/intern/iksolver/intern/IK_ConjugateGradientSolver.cpp b/intern/iksolver/intern/IK_ConjugateGradientSolver.cpp index 028b7dfe2b0..6760ba432d2 100644 --- a/intern/iksolver/intern/IK_ConjugateGradientSolver.cpp +++ b/intern/iksolver/intern/IK_ConjugateGradientSolver.cpp @@ -29,8 +29,11 @@ * ***** END GPL/BL DUAL LICENSE BLOCK ***** */ -#include "IK_ConjugateGradientSolver.h" +#ifdef HAVE_CONFIG_H +#include <config.h> +#endif +#include "IK_ConjugateGradientSolver.h" #define EPS 1.0e-10 diff --git a/intern/iksolver/intern/IK_JacobianSolver.cpp b/intern/iksolver/intern/IK_JacobianSolver.cpp index d0e1b4c0748..9cca4ec7786 100644 --- a/intern/iksolver/intern/IK_JacobianSolver.cpp +++ b/intern/iksolver/intern/IK_JacobianSolver.cpp @@ -29,8 +29,11 @@ * ***** END GPL/BL DUAL LICENSE BLOCK ***** */ -#include "IK_JacobianSolver.h" +#ifdef HAVE_CONFIG_H +#include <config.h> +#endif +#include "IK_JacobianSolver.h" #include "TNT/svd.h" using namespace std; diff --git a/intern/iksolver/intern/IK_QChain.cpp b/intern/iksolver/intern/IK_QChain.cpp index f39fca16644..de62195b985 100644 --- a/intern/iksolver/intern/IK_QChain.cpp +++ b/intern/iksolver/intern/IK_QChain.cpp @@ -37,6 +37,10 @@ * @author Laurence */ +#ifdef HAVE_CONFIG_H +#include <config.h> +#endif + #include "IK_QChain.h" using namespace std; diff --git a/intern/iksolver/intern/IK_QJacobianSolver.cpp b/intern/iksolver/intern/IK_QJacobianSolver.cpp index 32a703cb94d..e5d8e19e92a 100644 --- a/intern/iksolver/intern/IK_QJacobianSolver.cpp +++ b/intern/iksolver/intern/IK_QJacobianSolver.cpp @@ -29,6 +29,10 @@ * ***** END GPL/BL DUAL LICENSE BLOCK ***** */ +#ifdef HAVE_CONFIG_H +#include <config.h> +#endif + #include "IK_QJacobianSolver.h" #include "TNT/svd.h" diff --git a/intern/iksolver/intern/IK_QSegment.cpp b/intern/iksolver/intern/IK_QSegment.cpp index 2956dd815e2..7f71d559ee4 100644 --- a/intern/iksolver/intern/IK_QSegment.cpp +++ b/intern/iksolver/intern/IK_QSegment.cpp @@ -37,6 +37,10 @@ * @author Laurence */ +#ifdef HAVE_CONFIG_H +#include <config.h> +#endif + #include "IK_QSegment.h" #include <iostream.h> diff --git a/intern/iksolver/intern/IK_Segment.cpp b/intern/iksolver/intern/IK_Segment.cpp index f955a657dae..af7f240e55f 100644 --- a/intern/iksolver/intern/IK_Segment.cpp +++ b/intern/iksolver/intern/IK_Segment.cpp @@ -29,6 +29,10 @@ * ***** END GPL/BL DUAL LICENSE BLOCK ***** */ +#ifdef HAVE_CONFIG_H +#include <config.h> +#endif + #include "IK_Segment.h" diff --git a/intern/iksolver/intern/IK_Solver.cpp b/intern/iksolver/intern/IK_Solver.cpp index 11646597d6d..2ae6395084d 100644 --- a/intern/iksolver/intern/IK_Solver.cpp +++ b/intern/iksolver/intern/IK_Solver.cpp @@ -29,6 +29,10 @@ * ***** END GPL/BL DUAL LICENSE BLOCK ***** */ +#ifdef HAVE_CONFIG_H +#include <config.h> +#endif + #define IK_USE_EXPMAP diff --git a/intern/iksolver/intern/MT_ExpMap.cpp b/intern/iksolver/intern/MT_ExpMap.cpp index c5ff0dc5886..c936466c8d5 100644 --- a/intern/iksolver/intern/MT_ExpMap.cpp +++ b/intern/iksolver/intern/MT_ExpMap.cpp @@ -37,6 +37,10 @@ * @author Laurence */ +#ifdef HAVE_CONFIG_H +#include <config.h> +#endif + #include "MT_ExpMap.h" /** diff --git a/intern/iksolver/test/ik_glut_test/common/GlutDrawer.cpp b/intern/iksolver/test/ik_glut_test/common/GlutDrawer.cpp index 40c6a4a95c9..6161addc170 100644 --- a/intern/iksolver/test/ik_glut_test/common/GlutDrawer.cpp +++ b/intern/iksolver/test/ik_glut_test/common/GlutDrawer.cpp @@ -29,6 +29,10 @@ * ***** END GPL/BL DUAL LICENSE BLOCK ***** */ +#ifdef HAVE_CONFIG_H +#include <config.h> +#endif + #include "GlutDrawer.h" #include "MT_assert.h" diff --git a/intern/iksolver/test/ik_glut_test/common/GlutDrawer.h b/intern/iksolver/test/ik_glut_test/common/GlutDrawer.h index 798f50be8ff..eac10393bf3 100644 --- a/intern/iksolver/test/ik_glut_test/common/GlutDrawer.h +++ b/intern/iksolver/test/ik_glut_test/common/GlutDrawer.h @@ -30,9 +30,12 @@ */ #ifndef NAN_INCLUDED_GlutDrawer - #define NAN_INCLUDED_GlutDrawer +#ifdef HAVE_CONFIG_H +#include <config.h> +#endif + #include "MEM_NonCopyable.h" #include "MEM_SmartPtr.h" diff --git a/intern/iksolver/test/ik_glut_test/common/GlutKeyboardManager.cpp b/intern/iksolver/test/ik_glut_test/common/GlutKeyboardManager.cpp index 0d1d52b542d..454e76f11bb 100644 --- a/intern/iksolver/test/ik_glut_test/common/GlutKeyboardManager.cpp +++ b/intern/iksolver/test/ik_glut_test/common/GlutKeyboardManager.cpp @@ -29,8 +29,11 @@ * ***** END GPL/BL DUAL LICENSE BLOCK ***** */ -#include "GlutKeyboardManager.h" +#ifdef HAVE_CONFIG_H +#include <config.h> +#endif +#include "GlutKeyboardManager.h" #include "MT_assert.h" MEM_SmartPtr<GlutKeyboardManager> GlutKeyboardManager::m_s_instance = MEM_SmartPtr<GlutKeyboardManager>(); @@ -86,4 +89,4 @@ GlutKeyboardManager:: ){ delete(m_handler); -}
\ No newline at end of file +} diff --git a/intern/iksolver/test/ik_glut_test/common/GlutKeyboardManager.h b/intern/iksolver/test/ik_glut_test/common/GlutKeyboardManager.h index 33343b74ebf..01e2ae039e2 100644 --- a/intern/iksolver/test/ik_glut_test/common/GlutKeyboardManager.h +++ b/intern/iksolver/test/ik_glut_test/common/GlutKeyboardManager.h @@ -30,9 +30,12 @@ */ #ifndef NAN_INCLUDED_GlutKeyboardManager - #define NAN_INCLUDED_GlutKeyboardManager +#ifdef HAVE_CONFIG_H +#include <config.h> +#endif + #include "MEM_NonCopyable.h" #include "MEM_SmartPtr.h" diff --git a/intern/iksolver/test/ik_glut_test/common/GlutMouseManager.cpp b/intern/iksolver/test/ik_glut_test/common/GlutMouseManager.cpp index 57f4a65327e..8221cb55a00 100644 --- a/intern/iksolver/test/ik_glut_test/common/GlutMouseManager.cpp +++ b/intern/iksolver/test/ik_glut_test/common/GlutMouseManager.cpp @@ -29,8 +29,11 @@ * ***** END GPL/BL DUAL LICENSE BLOCK ***** */ -#include "GlutMouseManager.h" +#ifdef HAVE_CONFIG_H +#include <config.h> +#endif +#include "GlutMouseManager.h" #include "MT_assert.h" MEM_SmartPtr<GlutMouseManager> GlutMouseManager::m_s_instance = MEM_SmartPtr<GlutMouseManager>(); diff --git a/intern/iksolver/test/ik_glut_test/common/GlutMouseManager.h b/intern/iksolver/test/ik_glut_test/common/GlutMouseManager.h index fab68207c60..2903a337248 100644 --- a/intern/iksolver/test/ik_glut_test/common/GlutMouseManager.h +++ b/intern/iksolver/test/ik_glut_test/common/GlutMouseManager.h @@ -33,6 +33,11 @@ #define NAN_INCLUDED_GlutMouseManager_h +#ifdef HAVE_CONFIG_H +#include <config.h> +#endif + + #include "MEM_NonCopyable.h" #include "MEM_SmartPtr.h" diff --git a/intern/iksolver/test/ik_glut_test/intern/ChainDrawer.h b/intern/iksolver/test/ik_glut_test/intern/ChainDrawer.h index b7e250a3ad0..5a4915fca1f 100644 --- a/intern/iksolver/test/ik_glut_test/intern/ChainDrawer.h +++ b/intern/iksolver/test/ik_glut_test/intern/ChainDrawer.h @@ -30,9 +30,12 @@ */ #ifndef NAN_INCLUDED_ChainDrawer_h - #define NAN_INCLUDED_ChainDrawer_h +#ifdef HAVE_CONFIG_H +#include <config.h> +#endif + #include "../common/GlutDrawer.h" #include "MyGlutMouseHandler.h" #include "MyGlutKeyHandler.h" diff --git a/intern/iksolver/test/ik_glut_test/intern/MyGlutKeyHandler.h b/intern/iksolver/test/ik_glut_test/intern/MyGlutKeyHandler.h index b84d600079e..8498c962f0c 100644 --- a/intern/iksolver/test/ik_glut_test/intern/MyGlutKeyHandler.h +++ b/intern/iksolver/test/ik_glut_test/intern/MyGlutKeyHandler.h @@ -30,9 +30,13 @@ */ #ifndef NAN_INCLUDED_MyGlutKeyHandler_h - #define NAN_INCLUDED_MyGlutKeyHandler_h +#ifdef HAVE_CONFIG_H +#include <config.h> +#endif + + #include "../common/GlutKeyboardManager.h" class MyGlutKeyHandler : public GlutKeyboardHandler diff --git a/intern/iksolver/test/ik_glut_test/intern/MyGlutMouseHandler.h b/intern/iksolver/test/ik_glut_test/intern/MyGlutMouseHandler.h index a4c97538c9e..7c16432f0ac 100644 --- a/intern/iksolver/test/ik_glut_test/intern/MyGlutMouseHandler.h +++ b/intern/iksolver/test/ik_glut_test/intern/MyGlutMouseHandler.h @@ -30,9 +30,12 @@ */ #ifndef NAN_INCLUDED_MyGlutMouseHandler_h - #define NAN_INCLUDED_MyGlutMouseHandler_h +#ifdef HAVE_CONFIG_H +#include <config.h> +#endif + #include "../common/GlutMouseManager.h" #include <GL/glut.h> #include "IK_solver.h" diff --git a/intern/iksolver/test/ik_glut_test/intern/main.cpp b/intern/iksolver/test/ik_glut_test/intern/main.cpp index 137c9bd4470..b8094e6cd4f 100644 --- a/intern/iksolver/test/ik_glut_test/intern/main.cpp +++ b/intern/iksolver/test/ik_glut_test/intern/main.cpp @@ -60,6 +60,9 @@ * ***** END GPL/BL DUAL LICENSE BLOCK ***** */ +#ifdef HAVE_CONFIG_H +#include <config.h> +#endif #include "MEM_SmartPtr.h" diff --git a/intern/img/extern/IMG_Pixmap.h b/intern/img/extern/IMG_Pixmap.h index d9ab96cd745..8f07e6a46bb 100644 --- a/intern/img/extern/IMG_Pixmap.h +++ b/intern/img/extern/IMG_Pixmap.h @@ -41,6 +41,10 @@ #ifndef _H_IMG_Pixmap #define _H_IMG_Pixmap +#ifdef HAVE_CONFIG_H +#include <config.h> +#endif + #include "GEN_Types.h" #include "GEN_Rect.h" diff --git a/intern/img/extern/IMG_PixmapRGBA32.h b/intern/img/extern/IMG_PixmapRGBA32.h index 861b9ab3ebf..7d7a937321d 100644 --- a/intern/img/extern/IMG_PixmapRGBA32.h +++ b/intern/img/extern/IMG_PixmapRGBA32.h @@ -45,6 +45,11 @@ #ifndef _H_IMG_PixmapRGBA32 #define _H_IMG_PixmapRGBA32 +#ifdef HAVE_CONFIG_H +#include <config.h> +#endif + + #include "IMG_Pixmap.h" #include "IMG_MemPtr.h" #include "IMG_Color.h" diff --git a/intern/img/intern/IMG_Color.h b/intern/img/intern/IMG_Color.h index 92a452096c6..71273c22ae9 100644 --- a/intern/img/intern/IMG_Color.h +++ b/intern/img/intern/IMG_Color.h @@ -43,6 +43,10 @@ #ifndef _H_IMG_Color #define _H_IMG_Color +#ifdef HAVE_CONFIG_H +#include <config.h> +#endif + class IMG_ColorRGBA; diff --git a/intern/img/intern/IMG_MemPtr.h b/intern/img/intern/IMG_MemPtr.h index a89e1f48d00..21a64a848a8 100644 --- a/intern/img/intern/IMG_MemPtr.h +++ b/intern/img/intern/IMG_MemPtr.h @@ -40,6 +40,10 @@ #include <stddef.h> +#ifdef HAVE_CONFIG_H +#include <config.h> +#endif + /** * A memory pointer for memory of any type. * It can be used to avoid memory leaks when allocating memory in constructors. diff --git a/intern/img/intern/IMG_Pixmap.cpp b/intern/img/intern/IMG_Pixmap.cpp index 74888647b75..51bf3b30038 100644 --- a/intern/img/intern/IMG_Pixmap.cpp +++ b/intern/img/intern/IMG_Pixmap.cpp @@ -38,6 +38,9 @@ * @date March 6, 2001 */ +#ifdef HAVE_CONFIG_H +#include <config.h> +#endif #include "../extern/IMG_Pixmap.h" @@ -82,4 +85,4 @@ IMG_Pixmap::IMG_Pixmap(GEN_TUns32 width, GEN_TUns32 height) IMG_Pixmap::~IMG_Pixmap() { -}
\ No newline at end of file +} diff --git a/intern/img/intern/IMG_PixmapRGBA32.cpp b/intern/img/intern/IMG_PixmapRGBA32.cpp index 70c62141097..a79ffe1b6e4 100644 --- a/intern/img/intern/IMG_PixmapRGBA32.cpp +++ b/intern/img/intern/IMG_PixmapRGBA32.cpp @@ -38,6 +38,9 @@ * @date March 6, 2001 */ +#ifdef HAVE_CONFIG_H +#include <config.h> +#endif #include "IMG_PixmapRGBA32.h" diff --git a/intern/keymaker/key.c b/intern/keymaker/key.c index 011196f3a8c..413ee8b448c 100644 --- a/intern/keymaker/key.c +++ b/intern/keymaker/key.c @@ -41,6 +41,10 @@ #include <stdlib.h> #include <string.h> +#ifdef HAVE_CONFIG_H +#include <config.h> +#endif + #include "blenkey.h" /* external interface */ #include "key_internal.h" diff --git a/intern/keymaker/key_internal.h b/intern/keymaker/key_internal.h index af17afbbe6e..393dad8ecb2 100644 --- a/intern/keymaker/key_internal.h +++ b/intern/keymaker/key_internal.h @@ -37,6 +37,10 @@ * Blender Key loader library internal stuff */ +#ifdef HAVE_CONFIG_H +#include <config.h> +#endif + #include "openssl/rand.h" #include "openssl/rsa.h" #include "openssl/ripemd.h" diff --git a/intern/keymaker/keyloader.c b/intern/keymaker/keyloader.c index 4da347c32ac..878ed319cb5 100644 --- a/intern/keymaker/keyloader.c +++ b/intern/keymaker/keyloader.c @@ -37,6 +37,10 @@ * Blender Key Read-tester */ +#ifdef HAVE_CONFIG_H +#include <config.h> +#endif + #include <stdio.h> #include <stdlib.h> #include <string.h> diff --git a/intern/keymaker/mt19937int.c b/intern/keymaker/mt19937int.c index 7845f9ad56e..9481a48aade 100644 --- a/intern/keymaker/mt19937int.c +++ b/intern/keymaker/mt19937int.c @@ -27,6 +27,10 @@ #include<stdio.h> +#ifdef HAVE_CONFIG_H +#include <config.h> +#endif + #include "mt19937int.h" /* Period parameters */ diff --git a/intern/memutil/MEM_NonCopyable.h b/intern/memutil/MEM_NonCopyable.h index da67ce6b3e3..635c61704cd 100644 --- a/intern/memutil/MEM_NonCopyable.h +++ b/intern/memutil/MEM_NonCopyable.h @@ -30,9 +30,13 @@ */ #ifndef NAN_INCLUDED_NonCopyable_h - #define NAN_INCLUDED_NonCopyable_h +#ifdef HAVE_CONFIG_H +#include <config.h> +#endif + + /** * Simple class that makes sure sub classes cannot * generate standard copy constructors. diff --git a/intern/memutil/MEM_RefCountPtr.h b/intern/memutil/MEM_RefCountPtr.h index 0888ad77e8b..8f90226688b 100644 --- a/intern/memutil/MEM_RefCountPtr.h +++ b/intern/memutil/MEM_RefCountPtr.h @@ -30,9 +30,12 @@ */ #ifndef NAN_INCLUDED_MEM_RefCountPtr_h - #define NAN_INCLUDED_MEM_RefCountPtr_h +#ifdef HAVE_CONFIG_H +#include <config.h> +#endif + /** * $Id$ * Copyright (C) 2001 NaN Technologies B.V. diff --git a/intern/memutil/MEM_RefCounted.h b/intern/memutil/MEM_RefCounted.h index 9cb1e755247..b72ba6590f9 100644 --- a/intern/memutil/MEM_RefCounted.h +++ b/intern/memutil/MEM_RefCounted.h @@ -40,6 +40,9 @@ #ifndef _H_MEM_REF_COUNTED #define _H_MEM_REF_COUNTED +#ifdef HAVE_CONFIG_H +#include <config.h> +#endif /** * An object with reference counting. diff --git a/intern/memutil/MEM_RefCountedC-Api.h b/intern/memutil/MEM_RefCountedC-Api.h index 0bba70388c5..373042ba350 100644 --- a/intern/memutil/MEM_RefCountedC-Api.h +++ b/intern/memutil/MEM_RefCountedC-Api.h @@ -41,6 +41,11 @@ #ifndef _H_MEM_REF_COUNTED_C_API #define _H_MEM_REF_COUNTED_C_API +#ifdef HAVE_CONFIG_H +#include <config.h> +#endif + + /** A pointer to a private object. */ typedef struct MEM_TOpaqueObject* MEM_TObjectPtr; /** A pointer to a shared object. */ diff --git a/intern/memutil/MEM_SmartPtr.h b/intern/memutil/MEM_SmartPtr.h index 93b545d9ced..144c4fd92c9 100644 --- a/intern/memutil/MEM_SmartPtr.h +++ b/intern/memutil/MEM_SmartPtr.h @@ -30,9 +30,12 @@ */ #ifndef NAN_INCLUDED_MEM_SmartPtr_h - #define NAN_INCLUDED_MEM_SmartPtr_h +#ifdef HAVE_CONFIG_H +#include <config.h> +#endif + /** * $Id$ * Copyright (C) 2001 NaN Technologies B.V. diff --git a/intern/memutil/intern/MEM_RefCountedC-Api.cpp b/intern/memutil/intern/MEM_RefCountedC-Api.cpp index 92f02ac78fa..87f7b0a6901 100644 --- a/intern/memutil/intern/MEM_RefCountedC-Api.cpp +++ b/intern/memutil/intern/MEM_RefCountedC-Api.cpp @@ -37,8 +37,11 @@ * @date Jun 17, 2001 */ -#include "MEM_RefCountedC-Api.h" +#ifdef HAVE_CONFIG_H +#include <config.h> +#endif +#include "MEM_RefCountedC-Api.h" #include "MEM_RefCounted.h" diff --git a/intern/moto/include/GEN_List.h b/intern/moto/include/GEN_List.h index 03d9463b2bb..fd209098342 100644 --- a/intern/moto/include/GEN_List.h +++ b/intern/moto/include/GEN_List.h @@ -64,6 +64,10 @@ #ifndef GEN_LIST_H #define GEN_LIST_H +#ifdef HAVE_CONFIG_H +#include <config.h> +#endif + class GEN_Link { public: GEN_Link() : m_next(0), m_prev(0) {} diff --git a/intern/moto/include/GEN_Map.h b/intern/moto/include/GEN_Map.h index 38b1500fd98..6459d75a090 100644 --- a/intern/moto/include/GEN_Map.h +++ b/intern/moto/include/GEN_Map.h @@ -30,9 +30,13 @@ */ #ifndef GEN_MAP_H - #define GEN_MAP_H +#ifdef HAVE_CONFIG_H +#include <config.h> +#endif + + template <class Key, class Value> class GEN_Map { private: diff --git a/intern/moto/include/MT_CmMatrix4x4.h b/intern/moto/include/MT_CmMatrix4x4.h index d0dcac6d023..2bebddd444a 100644 --- a/intern/moto/include/MT_CmMatrix4x4.h +++ b/intern/moto/include/MT_CmMatrix4x4.h @@ -30,9 +30,12 @@ */ #ifndef INCLUDED_MT_CmMatrix4x4 - #define INCLUDED_MT_CmMatrix4x4 +#ifdef HAVE_CONFIG_H +#include <config.h> +#endif + /** * A 4x4 matrix. This is an OpenGl style matrix (column major) meaning * that the vector {m[0][0],m[0][1],m[0][2],m[0][3]} is the first column of diff --git a/intern/moto/include/MT_Matrix3x3.h b/intern/moto/include/MT_Matrix3x3.h index c9597630ed1..949ecf73dd9 100755 --- a/intern/moto/include/MT_Matrix3x3.h +++ b/intern/moto/include/MT_Matrix3x3.h @@ -46,6 +46,10 @@ #ifndef MT_MATRIX3X3_H #define MT_MATRIX3X3_H +#ifdef HAVE_CONFIG_H +#include <config.h> +#endif + #include <MT_assert.h> #include "MT_Vector3.h" diff --git a/intern/moto/include/MT_Matrix4x4.h b/intern/moto/include/MT_Matrix4x4.h index b4f271000dd..a5428f50f0c 100755 --- a/intern/moto/include/MT_Matrix4x4.h +++ b/intern/moto/include/MT_Matrix4x4.h @@ -39,6 +39,10 @@ #ifndef MT_MATRIX4X4_H #define MT_MATRIX4X4_H +#ifdef HAVE_CONFIG_H +#include <config.h> +#endif + #include <MT_assert.h> #include "MT_Vector4.h" diff --git a/intern/moto/include/MT_MinMax.h b/intern/moto/include/MT_MinMax.h index 06f8a8d18c8..f06c86feae5 100755 --- a/intern/moto/include/MT_MinMax.h +++ b/intern/moto/include/MT_MinMax.h @@ -46,6 +46,10 @@ #ifndef MT_MINMAX_H #define MT_MINMAX_H +#ifdef HAVE_CONFIG_H +#include <config.h> +#endif + template <class T> inline const T& MT_min(const T& a, const T& b) { return b < a ? b : a; diff --git a/intern/moto/include/MT_Optimize.h b/intern/moto/include/MT_Optimize.h index bf54ca8cade..965bf30f7c9 100644 --- a/intern/moto/include/MT_Optimize.h +++ b/intern/moto/include/MT_Optimize.h @@ -30,9 +30,12 @@ */ #ifndef GEN_OPTIMIZE_H - #define GEN_OPTIMIZE_H +#ifdef HAVE_CONFIG_H +#include <config.h> +#endif + #ifdef GEN_INLINED #define GEN_INLINE inline #else diff --git a/intern/moto/include/MT_Plane3.h b/intern/moto/include/MT_Plane3.h index 85315af8f5f..002ef45933b 100644 --- a/intern/moto/include/MT_Plane3.h +++ b/intern/moto/include/MT_Plane3.h @@ -30,9 +30,12 @@ */ #ifndef MT_PLANE3 - #define MT_PLANE3 +#ifdef HAVE_CONFIG_H +#include <config.h> +#endif + #include "MT_Tuple4.h" #include "MT_Point3.h" diff --git a/intern/moto/include/MT_Point2.h b/intern/moto/include/MT_Point2.h index c6995f1ab0b..fd98d261029 100644 --- a/intern/moto/include/MT_Point2.h +++ b/intern/moto/include/MT_Point2.h @@ -46,6 +46,10 @@ #ifndef MT_POINT2_H #define MT_POINT2_H +#ifdef HAVE_CONFIG_H +#include <config.h> +#endif + #include "MT_Vector2.h" class MT_Point2 : public MT_Vector2 { diff --git a/intern/moto/include/MT_Point3.h b/intern/moto/include/MT_Point3.h index 90a1a37ed37..8e36906b166 100644 --- a/intern/moto/include/MT_Point3.h +++ b/intern/moto/include/MT_Point3.h @@ -46,6 +46,10 @@ #ifndef MT_POINT_H #define MT_POINT_H +#ifdef HAVE_CONFIG_H +#include <config.h> +#endif + #include "MT_Vector3.h" class MT_Point3 : public MT_Vector3 { diff --git a/intern/moto/include/MT_Quaternion.h b/intern/moto/include/MT_Quaternion.h index 045d346229c..1bc745ebe2d 100644 --- a/intern/moto/include/MT_Quaternion.h +++ b/intern/moto/include/MT_Quaternion.h @@ -46,6 +46,10 @@ #ifndef MT_QUATERNION_H #define MT_QUATERNION_H +#ifdef HAVE_CONFIG_H +#include <config.h> +#endif + #include <MT_assert.h> #include "MT_Vector3.h" diff --git a/intern/moto/include/MT_Scalar.h b/intern/moto/include/MT_Scalar.h index 0a72a52c20e..6a3429f69a6 100755 --- a/intern/moto/include/MT_Scalar.h +++ b/intern/moto/include/MT_Scalar.h @@ -49,6 +49,10 @@ #include <math.h> #include <float.h> +#ifdef HAVE_CONFIG_H +#include <config.h> +#endif + #include "MT_random.h" #include "NM_Scalar.h" diff --git a/intern/moto/include/MT_Stream.h b/intern/moto/include/MT_Stream.h index 75d61014df8..a2729ced817 100755 --- a/intern/moto/include/MT_Stream.h +++ b/intern/moto/include/MT_Stream.h @@ -30,9 +30,12 @@ */ #ifndef GEN_STREAM_H - #define GEN_STREAM_H +#ifdef HAVE_CONFIG_H +#include <config.h> +#endif + #ifdef __CUSTOM_STREAM class MT_OStream diff --git a/intern/moto/include/MT_Transform.h b/intern/moto/include/MT_Transform.h index e774b125d0e..f56927c525d 100644 --- a/intern/moto/include/MT_Transform.h +++ b/intern/moto/include/MT_Transform.h @@ -53,6 +53,10 @@ #ifndef MT_TRANSFORM_H #define MT_TRANSFORM_H +#ifdef HAVE_CONFIG_H +#include <config.h> +#endif + #include "MT_Point3.h" #include "MT_Matrix3x3.h" diff --git a/intern/moto/include/MT_Tuple2.h b/intern/moto/include/MT_Tuple2.h index 8a8334663ce..8229511020d 100755 --- a/intern/moto/include/MT_Tuple2.h +++ b/intern/moto/include/MT_Tuple2.h @@ -46,6 +46,10 @@ #ifndef MT_Tuple2_H #define MT_Tuple2_H +#ifdef HAVE_CONFIG_H +#include <config.h> +#endif + #include "MT_Stream.h" #include "MT_Scalar.h" diff --git a/intern/moto/include/MT_Tuple3.h b/intern/moto/include/MT_Tuple3.h index 13be54adb57..8029a92b173 100755 --- a/intern/moto/include/MT_Tuple3.h +++ b/intern/moto/include/MT_Tuple3.h @@ -46,6 +46,10 @@ #ifndef MT_TUPLE3_H #define MT_TUPLE3_H +#ifdef HAVE_CONFIG_H +#include <config.h> +#endif + #include "MT_Stream.h" #include "MT_Scalar.h" diff --git a/intern/moto/include/MT_Tuple4.h b/intern/moto/include/MT_Tuple4.h index 72b9e5f90a6..eccddb3229a 100755 --- a/intern/moto/include/MT_Tuple4.h +++ b/intern/moto/include/MT_Tuple4.h @@ -46,6 +46,10 @@ #ifndef MT_TUPLE4_H #define MT_TUPLE4_H +#ifdef HAVE_CONFIG_H +#include <config.h> +#endif + #include "MT_Stream.h" #include "MT_Scalar.h" diff --git a/intern/moto/include/MT_Vector2.h b/intern/moto/include/MT_Vector2.h index b65feeff8bf..a0f92f4ca80 100644 --- a/intern/moto/include/MT_Vector2.h +++ b/intern/moto/include/MT_Vector2.h @@ -46,6 +46,10 @@ #ifndef MT_VECTOR2_H #define MT_VECTOR2_H +#ifdef HAVE_CONFIG_H +#include <config.h> +#endif + #include <MT_assert.h> #include "MT_Tuple2.h" diff --git a/intern/moto/include/MT_Vector3.h b/intern/moto/include/MT_Vector3.h index e940e55d10c..b07bc8e3161 100644 --- a/intern/moto/include/MT_Vector3.h +++ b/intern/moto/include/MT_Vector3.h @@ -46,6 +46,10 @@ #ifndef MT_VECTOR3_H #define MT_VECTOR3_H +#ifdef HAVE_CONFIG_H +#include <config.h> +#endif + #include <MT_assert.h> #include "MT_Tuple3.h" diff --git a/intern/moto/include/MT_Vector4.h b/intern/moto/include/MT_Vector4.h index 32b71f950b8..127f716577a 100644 --- a/intern/moto/include/MT_Vector4.h +++ b/intern/moto/include/MT_Vector4.h @@ -46,6 +46,10 @@ #ifndef MT_VECTOR4_H #define MT_VECTOR4_H +#ifdef HAVE_CONFIG_H +#include <config.h> +#endif + #include <MT_assert.h> #include "MT_Tuple4.h" diff --git a/intern/moto/include/MT_assert.h b/intern/moto/include/MT_assert.h index 2f9f3c928db..7d37f950f31 100644 --- a/intern/moto/include/MT_assert.h +++ b/intern/moto/include/MT_assert.h @@ -30,9 +30,12 @@ */ #ifndef MT_ASSERT_H - #define MT_ASSERT_H +#ifdef HAVE_CONFIG_H +#include <config.h> +#endif + #ifdef MT_NDEBUG #define MT_assert(predicate) ((void)0) diff --git a/intern/moto/include/MT_random.h b/intern/moto/include/MT_random.h index adfe31f9c41..41a01cf05e2 100755 --- a/intern/moto/include/MT_random.h +++ b/intern/moto/include/MT_random.h @@ -30,9 +30,12 @@ */ #ifndef MT_RANDOM_H - #define MT_RANDOM_H +#ifdef HAVE_CONFIG_H +#include <config.h> +#endif + #include <limits.h> #define MT_RAND_MAX ULONG_MAX diff --git a/intern/moto/include/NM_Scalar.h b/intern/moto/include/NM_Scalar.h index 3224ef4ee18..33e5d477565 100644 --- a/intern/moto/include/NM_Scalar.h +++ b/intern/moto/include/NM_Scalar.h @@ -33,6 +33,10 @@ #include <iostream> +#ifdef HAVE_CONFIG_H +#include <config.h> +#endif + template <class T> class NM_Scalar { public: diff --git a/intern/moto/intern/MT_CmMatrix4x4.cpp b/intern/moto/intern/MT_CmMatrix4x4.cpp index 0cc830980a0..64ff3512c7a 100755 --- a/intern/moto/intern/MT_CmMatrix4x4.cpp +++ b/intern/moto/intern/MT_CmMatrix4x4.cpp @@ -60,6 +60,9 @@ * ***** END GPL/BL DUAL LICENSE BLOCK ***** */ +#ifdef HAVE_CONFIG_H +#include <config.h> +#endif #include "MT_CmMatrix4x4.h" #include "MT_Vector3.h" diff --git a/intern/moto/intern/MT_Matrix3x3.cpp b/intern/moto/intern/MT_Matrix3x3.cpp index ded09a6b851..61dcc3b2d02 100644 --- a/intern/moto/intern/MT_Matrix3x3.cpp +++ b/intern/moto/intern/MT_Matrix3x3.cpp @@ -29,6 +29,10 @@ * ***** END GPL/BL DUAL LICENSE BLOCK ***** */ +#ifdef HAVE_CONFIG_H +#include <config.h> +#endif + #include "MT_Matrix3x3.h" diff --git a/intern/moto/intern/MT_Matrix4x4.cpp b/intern/moto/intern/MT_Matrix4x4.cpp index ce2c3bcf616..ff0ad3caba7 100644 --- a/intern/moto/intern/MT_Matrix4x4.cpp +++ b/intern/moto/intern/MT_Matrix4x4.cpp @@ -29,6 +29,10 @@ * ***** END GPL/BL DUAL LICENSE BLOCK ***** */ +#ifdef HAVE_CONFIG_H +#include <config.h> +#endif + #include "MT_Matrix4x4.h" diff --git a/intern/moto/intern/MT_Plane3.cpp b/intern/moto/intern/MT_Plane3.cpp index 01d10dac5b9..054b09a48cc 100644 --- a/intern/moto/intern/MT_Plane3.cpp +++ b/intern/moto/intern/MT_Plane3.cpp @@ -60,6 +60,9 @@ * ***** END GPL/BL DUAL LICENSE BLOCK ***** */ +#ifdef HAVE_CONFIG_H +#include <config.h> +#endif #ifndef GEN_INLINED #include "MT_Plane3.h" diff --git a/intern/moto/intern/MT_Point3.cpp b/intern/moto/intern/MT_Point3.cpp index 4d704e4949a..1c585ad5eb4 100644 --- a/intern/moto/intern/MT_Point3.cpp +++ b/intern/moto/intern/MT_Point3.cpp @@ -29,6 +29,10 @@ * ***** END GPL/BL DUAL LICENSE BLOCK ***** */ +#ifdef HAVE_CONFIG_H +#include <config.h> +#endif + #include "MT_Point3.h" diff --git a/intern/moto/intern/MT_Quaternion.cpp b/intern/moto/intern/MT_Quaternion.cpp index eb55ed45f5d..6dd08ad484f 100644 --- a/intern/moto/intern/MT_Quaternion.cpp +++ b/intern/moto/intern/MT_Quaternion.cpp @@ -29,6 +29,10 @@ * ***** END GPL/BL DUAL LICENSE BLOCK ***** */ +#ifdef HAVE_CONFIG_H +#include <config.h> +#endif + #include "MT_Quaternion.h" diff --git a/intern/moto/intern/MT_Transform.cpp b/intern/moto/intern/MT_Transform.cpp index 31af8223a4f..1af52abca3b 100644 --- a/intern/moto/intern/MT_Transform.cpp +++ b/intern/moto/intern/MT_Transform.cpp @@ -50,6 +50,10 @@ */ +#ifdef HAVE_CONFIG_H +#include <config.h> +#endif + #include "MT_Transform.h" void MT_Transform::setValue(const float *m) { diff --git a/intern/moto/intern/MT_Vector2.cpp b/intern/moto/intern/MT_Vector2.cpp index 93284098195..c8ac08210e5 100644 --- a/intern/moto/intern/MT_Vector2.cpp +++ b/intern/moto/intern/MT_Vector2.cpp @@ -29,6 +29,10 @@ * ***** END GPL/BL DUAL LICENSE BLOCK ***** */ +#ifdef HAVE_CONFIG_H +#include <config.h> +#endif + #include "MT_Vector2.h" diff --git a/intern/moto/intern/MT_Vector3.cpp b/intern/moto/intern/MT_Vector3.cpp index fe5861b0a41..9285f2fcb19 100644 --- a/intern/moto/intern/MT_Vector3.cpp +++ b/intern/moto/intern/MT_Vector3.cpp @@ -29,6 +29,10 @@ * ***** END GPL/BL DUAL LICENSE BLOCK ***** */ +#ifdef HAVE_CONFIG_H +#include <config.h> +#endif + #include "MT_Vector3.h" diff --git a/intern/moto/intern/MT_Vector4.cpp b/intern/moto/intern/MT_Vector4.cpp index db77b20130c..efe7d3e7b04 100644 --- a/intern/moto/intern/MT_Vector4.cpp +++ b/intern/moto/intern/MT_Vector4.cpp @@ -29,6 +29,10 @@ * ***** END GPL/BL DUAL LICENSE BLOCK ***** */ +#ifdef HAVE_CONFIG_H +#include <config.h> +#endif + #include "MT_Vector4.h" diff --git a/intern/moto/intern/MT_random.cpp b/intern/moto/intern/MT_random.cpp index 72e7c373201..0c46211c3e8 100755 --- a/intern/moto/intern/MT_random.cpp +++ b/intern/moto/intern/MT_random.cpp @@ -58,6 +58,10 @@ /* When you use this, send an email to: matumoto@math.keio.ac.jp */ /* with an appropriate reference to your work. */ +#ifdef HAVE_CONFIG_H +#include <config.h> +#endif + #include "MT_random.h" /* Period parameters */ diff --git a/intern/python/freeze/dummy.cpp b/intern/python/freeze/dummy.cpp index 26d8dc08a18..c06d12c19db 100644 --- a/intern/python/freeze/dummy.cpp +++ b/intern/python/freeze/dummy.cpp @@ -39,6 +39,10 @@ * @date November 11, 2002 */ +#ifdef HAVE_CONFIG_H +#include <config.h> +#endif + void main(void) { -}
\ No newline at end of file +} diff --git a/intern/python/py_main.c b/intern/python/py_main.c index 308ab0266ff..fb50a84b2a2 100644 --- a/intern/python/py_main.c +++ b/intern/python/py_main.c @@ -36,6 +36,11 @@ /* $RCSfile$ */ /* $Revision$ */ +#ifdef HAVE_CONFIG_H +#include <config.h> +#endif + + /* Jan Walter's stuff */ #include "Python.h" #include "blender.h" diff --git a/intern/python/testmodule/testmodule.c b/intern/python/testmodule/testmodule.c index 8ad894d8aad..2bcafdad9ee 100644 --- a/intern/python/testmodule/testmodule.c +++ b/intern/python/testmodule/testmodule.c @@ -40,6 +40,10 @@ /* $RCSfile$ */ /* $Revision$ */ +#ifdef HAVE_CONFIG_H +#include <config.h> +#endif + #include "Python.h" /************************************/ diff --git a/intern/string/STR_HashedString.h b/intern/string/STR_HashedString.h index bf18a4e4da6..9ba8e98bb7b 100644 --- a/intern/string/STR_HashedString.h +++ b/intern/string/STR_HashedString.h @@ -40,6 +40,10 @@ #ifndef __STR_HASHSTRING #define __STR_HASHSTRING +#ifdef HAVE_CONFIG_H +#include <config.h> +#endif + #include "STR_String.h" diff --git a/intern/string/STR_String.h b/intern/string/STR_String.h index a7f91c3b377..01fe9f68816 100644 --- a/intern/string/STR_String.h +++ b/intern/string/STR_String.h @@ -40,6 +40,10 @@ #ifndef _STR_String_H_ #define _STR_String_H_ +#ifdef HAVE_CONFIG_H +#include <config.h> +#endif + #ifndef STR_NO_ASSERTD #undef assertd #define assertd(exp) ((void)NULL) diff --git a/intern/string/intern/STR_String.cpp b/intern/string/intern/STR_String.cpp index 074bdc7acea..506e241ecae 100644 --- a/intern/string/intern/STR_String.cpp +++ b/intern/string/intern/STR_String.cpp @@ -41,6 +41,10 @@ #include <stdarg.h> #include "STR_String.h" +#ifdef HAVE_CONFIG_H +#include <config.h> +#endif + /*------------------------------------------------------------------------------------------------- Construction / destruction -------------------------------------------------------------------------------------------------*/ |