Moved SDL includes to Common.hpp

Xottab-DUTY · Xottab-DUTY · commit c4d4dd12a2d5 · 2018-08-04T03:46:14.000+05:00
xrEngine/Device_Initialize.cpp: resource.h is not used anymore
diff --git a/src/Common/Common.hpp b/src/Common/Common.hpp
@@ -5,3 +5,11 @@
 #include "Common/CommonImportExport.inl"
 #include "Common/FSMacros.hpp"
 #include "Include/xrAPI/xrAPI.h"
+
+#if __has_include(<SDL.h>)
+#include <SDL.h>
+#endif
+
+#if __has_include(<SDL_syswm.h>)
+#include <SDL_syswm.h>
+#endif
diff --git a/src/Layers/xrRender/HW.h b/src/Layers/xrRender/HW.h
@@ -2,8 +2,6 @@
 
 #include "HWCaps.h"
 #include "xrCore/ModuleLookup.hpp"
-#include "SDL.h"
-#include "SDL_syswm.h"
 
 #if !defined(_MAYA_EXPORT) && !defined(USE_OGL)
 #include "stats_manager.h"
diff --git a/src/editors/xrEditor/entry_point.cpp b/src/editors/xrEditor/entry_point.cpp
@@ -5,8 +5,6 @@
 #include "xrEngine/device.h"
 #include "xrEngine/XR_IOConsole.h"
 #include "xrEngine/xr_ioc_cmd.h"
-#include "SDL.h"
-
 
 using namespace XRay;
 using namespace XRay::Editor;
diff --git a/src/xrCore/os_clipboard.cpp b/src/xrCore/os_clipboard.cpp
@@ -10,7 +10,7 @@
 
 #include "stdafx.h"
 #pragma hdrstop
-#include <SDL.h>
+
 #include "os_clipboard.h"
 #include "xrCore/_std_extensions.h"
 
diff --git a/src/xrCore/xrCore.cpp b/src/xrCore/xrCore.cpp
@@ -3,8 +3,6 @@
 #include "stdafx.h"
 #pragma hdrstop
 
-#include <SDL.h>
-
 #if defined(WINDOWS)
 #include <mmsystem.h>
 #include <objbase.h>
diff --git a/src/xrCore/xrDebug.cpp b/src/xrCore/xrDebug.cpp
@@ -1,9 +1,6 @@
 #include "stdafx.h"
 #pragma hdrstop
 
-#include "SDL.h"
-#include "SDL_syswm.h"
-
 #include "xrDebug.h"
 #include "os_clipboard.h"
 #include "log.h"
diff --git a/src/xrEngine/Device_Initialize.cpp b/src/xrEngine/Device_Initialize.cpp
@@ -1,6 +1,4 @@
 #include "stdafx.h"
-#include "xr_3da/resource.h"
-#include <SDL.h>
 
 #include "Include/editor/ide.hpp"
 #include "engine_impl.hpp"
diff --git a/src/xrEngine/Device_create.cpp b/src/xrEngine/Device_create.cpp
@@ -4,8 +4,6 @@
 #include "xrCore/xr_token.h"
 #include "xrCDB/xrXRC.h"
 #include "XR_IOConsole.h"
-#include <SDL.h>
-#include <SDL_syswm.h>
 
 extern u32 Vid_SelectedMonitor;
 extern u32 Vid_SelectedRefreshRate;
diff --git a/src/xrEngine/Device_destroy.cpp b/src/xrEngine/Device_destroy.cpp
@@ -4,8 +4,6 @@
 #include "IGame_Persistent.h"
 #include "XR_IOConsole.h"
 #include "xr_input.h"
-#include <SDL.h>
-#include <SDL_syswm.h>
 
 extern void FreeMonitorsToken();
 extern void FreeVidModesToken();
diff --git a/src/xrEngine/IInputReceiver.cpp b/src/xrEngine/IInputReceiver.cpp
@@ -3,7 +3,6 @@
 
 #include "xr_input.h"
 #include "IInputReceiver.h"
-#include "SDL_syswm.h"
 
 void IInputReceiver::IR_Capture(void)
 {
diff --git a/src/xrEngine/Render.h b/src/xrEngine/Render.h
@@ -5,7 +5,6 @@
 #include "vis_common.h"
 #include "Include/xrRender/FactoryPtr.h"
 #include "xrCore/xr_resource.h"
-#include <SDL.h>
 
 class IUIShader;
 typedef FactoryPtr<IUIShader> wm_shader;
diff --git a/src/xrEngine/Text_Console.cpp b/src/xrEngine/Text_Console.cpp
@@ -1,7 +1,6 @@
 #include "stdafx.h"
 #include "Text_Console.h"
 #include "line_editor.h"
-#include "SDL_syswm.h"
 
 extern char const* const ioc_prompt;
 extern char const* const ch_cursor;
diff --git a/src/xrEngine/XR_IOConsole_callback.cpp b/src/xrEngine/XR_IOConsole_callback.cpp
@@ -11,7 +11,6 @@
 #include "line_editor.h"
 #include "xr_input.h"
 #include "xr_ioc_cmd.h"
-#include "SDL.h"
 
 void CConsole::Register_callbacks()
 {
diff --git a/src/xrEngine/device.cpp b/src/xrEngine/device.cpp
@@ -12,7 +12,6 @@
 #if defined(WINDOWS)
 #include <mmsystem.h>
 #endif
-#include <SDL.h>
 #pragma warning(pop)
 
 #include "x_ray.h"
diff --git a/src/xrEngine/device.h b/src/xrEngine/device.h
@@ -25,7 +25,6 @@
 #include "Include/editor/interfaces.hpp"
 #include "Include/xrRender/FactoryPtr.h"
 #include "Render.h"
-#include <SDL.h>
 
 class engine_impl;
 
diff --git a/src/xrEngine/line_edit_control.cpp b/src/xrEngine/line_edit_control.cpp
@@ -12,7 +12,6 @@
 #include "xrCore/buffer_vector.h"
 #include "Common/object_broker.h"
 #include "xr_input.h"
-#include "SDL.h"
 
 #include "edit_actions.h"
 
diff --git a/src/xrEngine/xr_input.h b/src/xrEngine/xr_input.h
@@ -1,8 +1,6 @@
 #ifndef __XR_INPUT__
 #define __XR_INPUT__
 
-#include <SDL.h>
-
 // SDL_NUM_SCANCODES - max vavue in SDL_SCANCODE_* enum
 #define MOUSE_1 (SDL_NUM_SCANCODES + SDL_BUTTON_LEFT)
 #define MOUSE_2 (SDL_NUM_SCANCODES + SDL_BUTTON_RIGHT)
diff --git a/src/xrGame/MainMenu.cpp b/src/xrGame/MainMenu.cpp
@@ -8,7 +8,6 @@
 #include "xr_Level_controller.h"
 #include "ui\UITextureMaster.h"
 #include "ui\UIXmlInit.h"
-#include <SDL.h>
 #include "ui\UIBtnHint.h"
 #include "UICursor.h"
 #include "xrGameSpy/GameSpy_Full.h"
diff --git a/src/xrGame/UICursor.cpp b/src/xrGame/UICursor.cpp
@@ -5,7 +5,6 @@
 #include "ui/UIBtnHint.h"
 #include "xrEngine/IInputReceiver.h"
 #include "xrEngine/xr_input.h"
-#include "SDL_syswm.h"
 
 #define C_DEFAULT color_xrgb(0xff, 0xff, 0xff)
 
diff --git a/src/xrGame/UIDialogHolder.h b/src/xrGame/UIDialogHolder.h
@@ -2,7 +2,6 @@
 #include "xrCore/_flags.h"
 #include "xrEngine/pure.h"
 #include "xrCommon/xr_vector.h"
-#include "SDL.h"
 
 class CUIDialogWnd;
 class CUIWindow;
diff --git a/src/xrGame/xr_level_controller.cpp b/src/xrGame/xr_level_controller.cpp
@@ -1,5 +1,4 @@
 #include "stdafx.h"
-#include <SDL.h>
 #include "xrEngine/xr_ioconsole.h"
 #include "xrEngine/xr_input.h"
 #include "xrEngine/xr_ioc_cmd.h"

Original file line number	Diff line number	Diff line change
`@@ -3,7 +3,6 @@`
`3`	`3`
`4`	`4`	`#include "xr_input.h"`
`5`	`5`	`#include "IInputReceiver.h"`
`6`		`-#include "SDL_syswm.h"`
`7`	`6`
`8`	`7`	`void IInputReceiver::IR_Capture(void)`
`9`	`8`	`{`