Skip to content

Commit 4d73bb3

Browse files
committed
xrEngine/xr_input.h|cpp: cleanup
Removed xr_input_xinput.h|cpp, they are not needed anymore
1 parent 28d317f commit 4d73bb3

File tree

6 files changed

+3
-206
lines changed

6 files changed

+3
-206
lines changed

src/xrEngine/xrEngine.vcxproj

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -276,7 +276,6 @@
276276
<ClInclude Include="xr_collide_form.h" />
277277
<ClInclude Include="xr_efflensflare.h" />
278278
<ClInclude Include="xr_input.h" />
279-
<ClInclude Include="xr_input_xinput.h" />
280279
<ClInclude Include="XR_IOConsole.h" />
281280
<ClInclude Include="xr_ioc_cmd.h" />
282281
<ClInclude Include="xr_object.h" />
@@ -383,8 +382,7 @@
383382
<ClCompile Include="xrTheora_Surface.cpp" />
384383
<ClCompile Include="xr_collide_form.cpp" />
385384
<ClCompile Include="xr_efflensflare.cpp" />
386-
<ClCompile Include="Xr_input.cpp" />
387-
<ClCompile Include="xr_input_xinput.cpp" />
385+
<ClCompile Include="xr_input.cpp" />
388386
<ClCompile Include="XR_IOConsole.cpp" />
389387
<ClCompile Include="XR_IOConsole_callback.cpp" />
390388
<ClCompile Include="XR_IOConsole_control.cpp" />

src/xrEngine/xrEngine.vcxproj.filters

Lines changed: 1 addition & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -258,9 +258,6 @@
258258
<ClInclude Include="xr_input.h">
259259
<Filter>Interfaces\Input</Filter>
260260
</ClInclude>
261-
<ClInclude Include="xr_input_xinput.h">
262-
<Filter>Interfaces\Input</Filter>
263-
</ClInclude>
264261
<ClInclude Include="ISheduled.h">
265262
<Filter>Interfaces\Sheduler</Filter>
266263
</ClInclude>
@@ -590,10 +587,7 @@
590587
<ClCompile Include="IInputReceiver.cpp">
591588
<Filter>Interfaces\Input</Filter>
592589
</ClCompile>
593-
<ClCompile Include="Xr_input.cpp">
594-
<Filter>Interfaces\Input</Filter>
595-
</ClCompile>
596-
<ClCompile Include="xr_input_xinput.cpp">
590+
<ClCompile Include="xr_input.cpp">
597591
<Filter>Interfaces\Input</Filter>
598592
</ClCompile>
599593
<ClCompile Include="ISheduled.cpp">

src/xrEngine/xr_input.cpp

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -8,9 +8,6 @@
88
#include "PerformanceAlert.hpp"
99
#include "xrCore/Text/StringConversion.hpp"
1010

11-
#ifndef _EDITOR
12-
#include "xr_input_xinput.h"
13-
#endif
1411
CInput* pInput = NULL;
1512
IInputReceiver dummyController;
1613

src/xrEngine/xr_input.h

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,4 @@
1-
#ifndef __XR_INPUT__
2-
#define __XR_INPUT__
1+
#pragma once
32

43
// SDL_NUM_SCANCODES - max vavue in SDL_SCANCODE_* enum
54
#define MOUSE_1 (SDL_NUM_SCANCODES + SDL_BUTTON_LEFT)
@@ -110,5 +109,3 @@ class ENGINE_API CInput
110109
};
111110

112111
extern ENGINE_API CInput* pInput;
113-
114-
#endif //__XR_INPUT__

src/xrEngine/xr_input_xinput.cpp

Lines changed: 0 additions & 137 deletions
This file was deleted.

src/xrEngine/xr_input_xinput.h

Lines changed: 0 additions & 52 deletions
This file was deleted.

0 commit comments

Comments
 (0)