diff options
| author | mwturvey <michael.w.turvey@intel.com> | 2017-03-17 14:41:59 -0700 |
|---|---|---|
| committer | mwturvey <michael.w.turvey@intel.com> | 2017-03-17 14:41:59 -0700 |
| commit | b6981854dff11022e3de56e56cbf4633f1c49598 (patch) | |
| tree | f5b8f4ff1425f704d791d5b9af9c8af65455868d /winbuild/libsurvive/libsurvive.vcxproj.filters | |
| parent | 94be8ccdbfb2f44c9bc569428537444030ba8eeb (diff) | |
| parent | a53c520c2d1a3bb9faa4cb5e4ee9ccc48bb1835f (diff) | |
| download | libsurvive-b6981854dff11022e3de56e56cbf4633f1c49598.tar.gz libsurvive-b6981854dff11022e3de56e56cbf4633f1c49598.tar.bz2 | |
Merge branch 'master' into UsbTrackerOnWin
# Conflicts:
# src/survive_vive.c
Diffstat (limited to 'winbuild/libsurvive/libsurvive.vcxproj.filters')
| -rw-r--r-- | winbuild/libsurvive/libsurvive.vcxproj.filters | 26 |
1 files changed, 13 insertions, 13 deletions
diff --git a/winbuild/libsurvive/libsurvive.vcxproj.filters b/winbuild/libsurvive/libsurvive.vcxproj.filters index 370ce14..0bb9d1b 100644 --- a/winbuild/libsurvive/libsurvive.vcxproj.filters +++ b/winbuild/libsurvive/libsurvive.vcxproj.filters @@ -60,12 +60,6 @@ <ClCompile Include="..\..\redist\puff.c"> <Filter>Source Files</Filter> </ClCompile> - <ClCompile Include="..\..\redist\DrawFunctions.c"> - <Filter>Source Files</Filter> - </ClCompile> - <ClCompile Include="..\..\redist\WinDriver.c"> - <Filter>Source Files</Filter> - </ClCompile> <ClCompile Include="..\..\redist\json_helpers.c"> <Filter>Source Files</Filter> </ClCompile> @@ -78,10 +72,16 @@ <ClCompile Include="..\..\redist\symbol_enumerator.c"> <Filter>Source Files</Filter> </ClCompile> - <ClCompile Include="..\..\windows\hid.c"> + <ClCompile Include="..\..\redist\linmath.c"> <Filter>Source Files</Filter> </ClCompile> - <ClCompile Include="..\..\redist\linmath.c"> + <ClCompile Include="..\..\redist\hid-windows.c"> + <Filter>Source Files</Filter> + </ClCompile> + <ClCompile Include="..\..\redist\CNFGFunctions.c"> + <Filter>Source Files</Filter> + </ClCompile> + <ClCompile Include="..\..\redist\CNFGWinDriver.c"> <Filter>Source Files</Filter> </ClCompile> </ItemGroup> @@ -110,9 +110,6 @@ <ClInclude Include="..\..\redist\os_generic.h"> <Filter>Header Files</Filter> </ClInclude> - <ClInclude Include="..\..\redist\DrawFunctions.h"> - <Filter>Header Files</Filter> - </ClInclude> <ClInclude Include="..\..\redist\json_helpers.h"> <Filter>Header Files</Filter> </ClInclude> @@ -125,10 +122,13 @@ <ClInclude Include="..\..\redist\symbol_enumerator.h"> <Filter>Header Files</Filter> </ClInclude> - <ClInclude Include="..\..\windows\hidapi.h"> + <ClInclude Include="..\..\redist\linmath.h"> <Filter>Header Files</Filter> </ClInclude> - <ClInclude Include="..\..\redist\linmath.h"> + <ClInclude Include="..\hidapi.h"> + <Filter>Header Files</Filter> + </ClInclude> + <ClInclude Include="..\..\redist\CNFGFunctions.h"> <Filter>Header Files</Filter> </ClInclude> </ItemGroup> |