Skip to content

Commit c59ecbc

Browse files
KethenKethen
committed
hand fixing VC project files, more build fixes
1 parent 9e7898d commit c59ecbc

File tree

8 files changed

+37
-6
lines changed

8 files changed

+37
-6
lines changed

‎VisualC-GDK/SDL/SDL.vcxproj

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -437,8 +437,10 @@
437437
<ClInclude Include="..\..\src\file\SDL_sysasyncio.h" />
438438
<ClInclude Include="..\..\src\haptic\SDL_haptic_c.h" />
439439
<ClInclude Include="..\..\src\haptic\SDL_syshaptic.h" />
440+
<ClInclude Include="..\..\src\haptic\SDL_hidapihaptic.h" />
440441
<ClInclude Include="..\..\src\haptic\windows\SDL_dinputhaptic_c.h" />
441442
<ClInclude Include="..\..\src\haptic\windows\SDL_windowshaptic_c.h" />
443+
<ClInclude Include="..\..\src\haptic\hidapi\SDL_hidapihaptic_c.h" />
442444
<ClInclude Include="..\..\src\hidapi\hidapi\hidapi.h" />
443445
<ClInclude Include="..\..\src\hidapi\SDL_hidapi_c.h" />
444446
<ClInclude Include="..\..\src\joystick\controller_type.h" />
@@ -683,6 +685,8 @@
683685
<LanguageStandard Condition="'$(Configuration)|$(Platform)'=='Release|Gaming.Xbox.Scarlett.x64'">stdcpp17</LanguageStandard>
684686
<LanguageStandard Condition="'$(Configuration)|$(Platform)'=='Release|Gaming.Xbox.XboxOne.x64'">stdcpp17</LanguageStandard>
685687
</ClCompile>
688+
<ClCompile Include="..\..\src\haptic\hidapi\SDL_hidapihaptic.c" />
689+
<ClCompile Include="..\..\src\haptic\hidapi\SDL_hidapihaptic_lg4ff.c" />
686690
<ClCompile Include="..\..\src\hidapi\SDL_hidapi.c" />
687691
<ClCompile Include="..\..\src\joystick\controller_type.c" />
688692
<ClCompile Include="..\..\src\joystick\dummy\SDL_sysjoystick.c" />
@@ -705,6 +709,7 @@
705709
<ClCompile Include="..\..\src\joystick\hidapi\SDL_hidapi_xbox360.c" />
706710
<ClCompile Include="..\..\src\joystick\hidapi\SDL_hidapi_xbox360w.c" />
707711
<ClCompile Include="..\..\src\joystick\hidapi\SDL_hidapi_xboxone.c" />
712+
<ClCompile Include="..\..\src\joystick\hidapi\SDL_hidapi_lg4ff.c" />
708713
<ClCompile Include="..\..\src\joystick\SDL_gamepad.c" />
709714
<ClCompile Include="..\..\src\joystick\SDL_joystick.c" />
710715
<ClCompile Include="..\..\src\joystick\SDL_steam_virtual_gamepad.c" />

‎VisualC-GDK/SDL/SDL.vcxproj.filters

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -55,6 +55,8 @@
5555
<ClCompile Include="..\..\src\haptic\SDL_haptic.c" />
5656
<ClCompile Include="..\..\src\haptic\windows\SDL_dinputhaptic.c" />
5757
<ClCompile Include="..\..\src\haptic\windows\SDL_windowshaptic.c" />
58+
<ClCompile Include="..\..\src\haptic\hidapi\SDL_hidapihaptic.c" />
59+
<ClCompile Include="..\..\src\haptic\hidapi\SDL_hidapihaptic_lg4ff.c" />
5860
<ClCompile Include="..\..\src\hidapi\SDL_hidapi.c" />
5961
<ClCompile Include="..\..\src\joystick\controller_type.c" />
6062
<ClCompile Include="..\..\src\joystick\dummy\SDL_sysjoystick.c" />
@@ -77,6 +79,7 @@
7779
<ClCompile Include="..\..\src\joystick\hidapi\SDL_hidapi_xbox360.c" />
7880
<ClCompile Include="..\..\src\joystick\hidapi\SDL_hidapi_xbox360w.c" />
7981
<ClCompile Include="..\..\src\joystick\hidapi\SDL_hidapi_xboxone.c" />
82+
<ClCompile Include="..\..\src\joystick\hidapi\SDL_hidapi_lg4ff.c" />
8083
<ClCompile Include="..\..\src\joystick\SDL_gamepad.c" />
8184
<ClCompile Include="..\..\src\joystick\SDL_joystick.c" />
8285
<ClCompile Include="..\..\src\joystick\SDL_steam_virtual_gamepad.c" />
@@ -335,8 +338,10 @@
335338
<ClInclude Include="..\..\src\gpu\SDL_sysgpu.h" />
336339
<ClInclude Include="..\..\src\haptic\SDL_haptic_c.h" />
337340
<ClInclude Include="..\..\src\haptic\SDL_syshaptic.h" />
341+
<ClInclude Include="..\..\src\haptic\SDL_hidapihaptic.h" />
338342
<ClInclude Include="..\..\src\haptic\windows\SDL_dinputhaptic_c.h" />
339343
<ClInclude Include="..\..\src\haptic\windows\SDL_windowshaptic_c.h" />
344+
<ClInclude Include="..\..\src\haptic\hidapi\SDL_hidapihaptic_c.h" />
340345
<ClInclude Include="..\..\src\hidapi\hidapi\hidapi.h" />
341346
<ClInclude Include="..\..\src\hidapi\SDL_hidapi_c.h" />
342347
<ClInclude Include="..\..\src\joystick\controller_type.h" />

‎VisualC/SDL/SDL.vcxproj

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -357,8 +357,10 @@
357357
<ClInclude Include="..\..\src\file\SDL_sysasyncio.h" />
358358
<ClInclude Include="..\..\src\haptic\SDL_haptic_c.h" />
359359
<ClInclude Include="..\..\src\haptic\SDL_syshaptic.h" />
360+
<ClInclude Include="..\..\src\haptic\SDL_hidapihaptic.h" />
360361
<ClInclude Include="..\..\src\haptic\windows\SDL_dinputhaptic_c.h" />
361362
<ClInclude Include="..\..\src\haptic\windows\SDL_windowshaptic_c.h" />
363+
<ClInclude Include="..\..\src\haptic\hidapi\SDL_hidapihaptic_c.h" />
362364
<ClInclude Include="..\..\src\hidapi\hidapi\hidapi.h" />
363365
<ClInclude Include="..\..\src\hidapi\SDL_hidapi_c.h" />
364366
<ClInclude Include="..\..\src\joystick\controller_type.h" />
@@ -560,6 +562,8 @@
560562
<ClCompile Include="..\..\src\haptic\SDL_haptic.c" />
561563
<ClCompile Include="..\..\src\haptic\windows\SDL_dinputhaptic.c" />
562564
<ClCompile Include="..\..\src\haptic\windows\SDL_windowshaptic.c" />
565+
<ClCompile Include="..\..\src\haptic\hidapi\SDL_hidapihaptic.c" />
566+
<ClCompile Include="..\..\src\haptic\hidapi\SDL_hidapihaptic_lg4ff.c" />
563567
<ClCompile Include="..\..\src\hidapi\SDL_hidapi.c" />
564568
<ClCompile Include="..\..\src\joystick\controller_type.c" />
565569
<ClCompile Include="..\..\src\joystick\dummy\SDL_sysjoystick.c" />
@@ -582,6 +586,7 @@
582586
<ClCompile Include="..\..\src\joystick\hidapi\SDL_hidapi_xbox360.c" />
583587
<ClCompile Include="..\..\src\joystick\hidapi\SDL_hidapi_xbox360w.c" />
584588
<ClCompile Include="..\..\src\joystick\hidapi\SDL_hidapi_xboxone.c" />
589+
<ClCompile Include="..\..\src\joystick\hidapi\SDL_hidapi_lg4ff.c" />
585590
<ClCompile Include="..\..\src\joystick\SDL_gamepad.c" />
586591
<ClCompile Include="..\..\src\joystick\SDL_joystick.c" />
587592
<ClCompile Include="..\..\src\joystick\SDL_steam_virtual_gamepad.c" />

‎VisualC/SDL/SDL.vcxproj.filters

Lines changed: 18 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -82,6 +82,9 @@
8282
<Filter Include="haptic\windows">
8383
<UniqueIdentifier>{ebc2fca3-3c26-45e3-815e-3e0581d5e226}</UniqueIdentifier>
8484
</Filter>
85+
<Filter Include="haptic\hidapi">
86+
<UniqueIdentifier>{06DB01C0-65B5-4DE7-8ADC-C0B0CA3A1E69}</UniqueIdentifier>
87+
</Filter>
8588
<Filter Include="haptic\dummy">
8689
<UniqueIdentifier>{47c445a2-7014-4e15-9660-7c89a27dddcf}</UniqueIdentifier>
8790
</Filter>
@@ -555,6 +558,9 @@
555558
<ClInclude Include="..\..\src\haptic\SDL_syshaptic.h">
556559
<Filter>haptic</Filter>
557560
</ClInclude>
561+
<ClInclude Include="..\..\src\haptic\SDL_hidapihaptic.h">
562+
<Filter>haptic</Filter>
563+
</ClInclude>
558564
<ClInclude Include="..\..\src\haptic\SDL_haptic_c.h">
559565
<Filter>haptic</Filter>
560566
</ClInclude>
@@ -612,6 +618,9 @@
612618
<ClInclude Include="..\..\src\haptic\windows\SDL_windowshaptic_c.h">
613619
<Filter>haptic\windows</Filter>
614620
</ClInclude>
621+
<ClInclude Include="..\..\src\haptic\hidapi\SDL_hidapihaptic_c.h">
622+
<Filter>haptic\hidapi</Filter>
623+
</ClInclude>
615624
<ClInclude Include="..\..\src\joystick\hidapi\SDL_hidapijoystick_c.h">
616625
<Filter>joystick\hidapi</Filter>
617626
</ClInclude>
@@ -1145,6 +1154,12 @@
11451154
<ClCompile Include="..\..\src\haptic\windows\SDL_windowshaptic.c">
11461155
<Filter>haptic\windows</Filter>
11471156
</ClCompile>
1157+
<ClCompile Include="..\..\src\haptic\hidapi\SDL_hidapihaptic.c">
1158+
<Filter>haptic\hidapi</Filter>
1159+
</ClCompile>
1160+
<ClCompile Include="..\..\src\haptic\hidapi\SDL_hidapihaptic_lg4ff.c">
1161+
<Filter>haptic\hidapi</Filter>
1162+
</ClCompile>
11481163
<ClCompile Include="..\..\src\haptic\dummy\SDL_syshaptic.c">
11491164
<Filter>haptic\dummy</Filter>
11501165
</ClCompile>
@@ -1205,6 +1220,9 @@
12051220
<ClCompile Include="..\..\src\joystick\hidapi\SDL_hidapi_xboxone.c">
12061221
<Filter>joystick\hidapi</Filter>
12071222
</ClCompile>
1223+
<ClCompile Include="..\..\src\joystick\hidapi\SDL_hidapi_lg4ff.c">
1224+
<Filter>joystick\hidapi</Filter>
1225+
</ClCompile>
12081226
<ClCompile Include="..\..\src\joystick\hidapi\SDL_hidapijoystick.c">
12091227
<Filter>joystick\hidapi</Filter>
12101228
</ClCompile>

‎src/haptic/hidapi/SDL_hidapihaptic.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@
1818
misrepresented as being the original software.
1919
3. This notice may not be removed or altered from any source distribution.
2020
*/
21-
#include "../../SDL_internal.h"
21+
#include "SDL_internal.h"
2222

2323
#ifdef SDL_JOYSTICK_HIDAPI
2424

‎src/haptic/hidapi/SDL_hidapihaptic_c.h

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -19,8 +19,6 @@
1919
3. This notice may not be removed or altered from any source distribution.
2020
*/
2121

22-
#include "../../SDL_internal.h"
23-
2422
#ifndef SDL_hidapihaptic_c_h_
2523
#define SDL_hidapihaptic_c_h_
2624

‎src/haptic/hidapi/SDL_hidapihaptic_lg4ff.c

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@
2323
All hid command sent and effect rendering are ported from https://github.com/berarma/new-lg4ff
2424
*/
2525

26-
#include "../../SDL_internal.h"
26+
#include "SDL_internal.h"
2727

2828
#ifdef SDL_JOYSTICK_HIDAPI
2929

@@ -838,7 +838,7 @@ static void *SDL_HIDAPI_HapticDriverLg4ff_Open(SDL_Joystick *joystick)
838838

839839
ctx->product_id = SDL_GetJoystickProduct(joystick);
840840

841-
sprintf(ctx->thread_name_buf, "SDL_hidapihaptic_lg4ff %d %04x:%04x", SDL_GetJoystickID(joystick), USB_VENDOR_ID_LOGITECH, ctx->product_id);
841+
SDL_snprintf(ctx->thread_name_buf, sizeof(ctx->thread_name_buf), "SDL_hidapihaptic_lg4ff %d %04x:%04x", SDL_GetJoystickID(joystick), USB_VENDOR_ID_LOGITECH, ctx->product_id);
842842
ctx->stop_thread = false;
843843
ctx->thread = SDL_CreateThread(SDL_HIDAPI_HapticDriverLg4ff_ThreadFunction, ctx->thread_name_buf, ctx);
844844

‎src/joystick/hidapi/SDL_hidapi_lg4ff.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@
2323
All hid command sent are based on https://github.com/berarma/new-lg4ff
2424
*/
2525

26-
#include "../../SDL_internal.h"
26+
#include "SDL_internal.h"
2727

2828
#ifdef SDL_JOYSTICK_HIDAPI
2929

0 commit comments

Comments
 (0)