diff options
-rw-r--r-- | redist/hid-windows.c (renamed from winbuild/hid.c) | 0 | ||||
-rw-r--r-- | redist/json_helpers.c | 2 | ||||
-rw-r--r-- | winbuild/build_tcc.bat | 2 | ||||
-rw-r--r-- | winbuild/libsurvive/libsurvive.vcxproj | 2 | ||||
-rw-r--r-- | winbuild/libsurvive/libsurvive.vcxproj.filters | 2 |
5 files changed, 4 insertions, 4 deletions
diff --git a/winbuild/hid.c b/redist/hid-windows.c index 6c379b5..6c379b5 100644 --- a/winbuild/hid.c +++ b/redist/hid-windows.c diff --git a/redist/json_helpers.c b/redist/json_helpers.c index eb3600b..0267932 100644 --- a/redist/json_helpers.c +++ b/redist/json_helpers.c @@ -173,7 +173,7 @@ void json_load_file(const char* path) { int16_t children = -1; - for (i=0; i<items; i+=2) + for (i=0; i<(int)items; i+=2) { //increment i on each successful tag + values combination, not individual tokens jsmntok_t* tag_t = tokens+i; diff --git a/winbuild/build_tcc.bat b/winbuild/build_tcc.bat index 753ba7c..46f4beb 100644 --- a/winbuild/build_tcc.bat +++ b/winbuild/build_tcc.bat @@ -11,4 +11,4 @@ set EXEC=..\calibrate.c %RD%WinDriver.c %RD%os_generic.c %RD%DrawFunctions.c set CFLAGS=-DNOZLIB -DTCC -DWINDOWS -DHIDAPI -DWIN32 -DRUNTIME_SYMNUM -O0 -g -rdynamic -I..\redist -I..\include\libsurvive -I..\src -I. set LDFLAGS=-lkernel32 -lgdi32 -luser32 -lsetupapi -ldbghelp @echo on -%TCC% -v %CFLAGS% %SOURCES% %REDIST% %EXEC% %LDFLAGS% tcc_stubs.c hid.c -o calibrate.exe +%TCC% -v %CFLAGS% %SOURCES% %REDIST% %EXEC% %LDFLAGS% tcc_stubs.c %RD%hid-windows.c -o calibrate.exe diff --git a/winbuild/libsurvive/libsurvive.vcxproj b/winbuild/libsurvive/libsurvive.vcxproj index c19beda..996f342 100644 --- a/winbuild/libsurvive/libsurvive.vcxproj +++ b/winbuild/libsurvive/libsurvive.vcxproj @@ -141,6 +141,7 @@ <ItemGroup> <ClCompile Include="..\..\redist\crc32.c" /> <ClCompile Include="..\..\redist\DrawFunctions.c" /> + <ClCompile Include="..\..\redist\hid-windows.c" /> <ClCompile Include="..\..\redist\jsmn.c" /> <ClCompile Include="..\..\redist\json_helpers.c" /> <ClCompile Include="..\..\redist\linmath.c" /> @@ -160,7 +161,6 @@ <ClCompile Include="..\..\src\survive_process.c" /> <ClCompile Include="..\..\src\survive_usb.c" /> <ClCompile Include="..\..\src\survive_vive.c" /> - <ClCompile Include="..\hid.c" /> </ItemGroup> <ItemGroup> <ClInclude Include="..\..\include\libsurvive\poser.h" /> diff --git a/winbuild/libsurvive/libsurvive.vcxproj.filters b/winbuild/libsurvive/libsurvive.vcxproj.filters index 8cb8a3d..8be02f1 100644 --- a/winbuild/libsurvive/libsurvive.vcxproj.filters +++ b/winbuild/libsurvive/libsurvive.vcxproj.filters @@ -81,7 +81,7 @@ <ClCompile Include="..\..\redist\linmath.c"> <Filter>Source Files</Filter> </ClCompile> - <ClCompile Include="..\hid.c"> + <ClCompile Include="..\..\redist\hid-windows.c"> <Filter>Source Files</Filter> </ClCompile> </ItemGroup> |