diff options
Diffstat (limited to 'intern/ghost')
70 files changed, 280 insertions, 20 deletions
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; |