From 4c2750112e89bf579e7752285ad56e69d15549df Mon Sep 17 00:00:00 2001 From: Zangetsu38 Date: Sat, 29 Apr 2017 03:41:05 +0200 Subject: [PATCH] Update in VS 2017 --- .gitignore | 2 + windows/hidapi.sln | 31 +++-- windows/hidapi.vcproj | 201 -------------------------------- windows/hidapi.vcxproj | 6 +- windows/hidtest.vcproj | 196 ------------------------------- windows/hidtest.vcxproj | 179 ++++++++++++++++++++++++++++ windows/hidtest.vcxproj.filters | 22 ++++ 7 files changed, 226 insertions(+), 411 deletions(-) delete mode 100644 windows/hidapi.vcproj delete mode 100644 windows/hidtest.vcproj create mode 100644 windows/hidtest.vcxproj create mode 100644 windows/hidtest.vcxproj.filters diff --git a/.gitignore b/.gitignore index b43ca58..6bb55fd 100644 --- a/.gitignore +++ b/.gitignore @@ -18,3 +18,5 @@ windows/Makefile.in Makefile stamp-h1 libtool +/windows/.vs/hidapi/v15 +/windows/tmp/hidapi-Release-x64 diff --git a/windows/hidapi.sln b/windows/hidapi.sln index d45c397..5dd26d3 100644 --- a/windows/hidapi.sln +++ b/windows/hidapi.sln @@ -1,27 +1,36 @@  -Microsoft Visual Studio Solution File, Format Version 10.00 -# Visual C++ Express 2008 -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "hidapi", "hidapi.vcproj", "{A107C21C-418A-4697-BB10-20C3AA60E2E4}" +Microsoft Visual Studio Solution File, Format Version 12.00 +# Visual Studio 15 +VisualStudioVersion = 15.0.26403.7 +MinimumVisualStudioVersion = 10.0.40219.1 +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "hidapi", "hidapi.vcxproj", "{A107C21C-418A-4697-BB10-20C3AA60E2E4}" EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "hidtest", "hidtest.vcproj", "{23E9FF6A-49D1-4993-B2B5-BBB992C6C712}" - ProjectSection(ProjectDependencies) = postProject - {A107C21C-418A-4697-BB10-20C3AA60E2E4} = {A107C21C-418A-4697-BB10-20C3AA60E2E4} - EndProjectSection +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "hidtest", "hidtest.vcxproj", "{23E9FF6A-49D1-4993-B2B5-BBB992C6C712}" EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution Debug|Win32 = Debug|Win32 + Debug|x64 = Debug|x64 Release|Win32 = Release|Win32 + Release|x64 = Release|x64 EndGlobalSection GlobalSection(ProjectConfigurationPlatforms) = postSolution - {A107C21C-418A-4697-BB10-20C3AA60E2E4}.Debug|Win32.ActiveCfg = Debug|Win32 - {A107C21C-418A-4697-BB10-20C3AA60E2E4}.Debug|Win32.Build.0 = Debug|Win32 + {A107C21C-418A-4697-BB10-20C3AA60E2E4}.Debug|Win32.ActiveCfg = Debug|x64 + {A107C21C-418A-4697-BB10-20C3AA60E2E4}.Debug|Win32.Build.0 = Debug|x64 + {A107C21C-418A-4697-BB10-20C3AA60E2E4}.Debug|x64.ActiveCfg = Debug|x64 + {A107C21C-418A-4697-BB10-20C3AA60E2E4}.Debug|x64.Build.0 = Debug|x64 {A107C21C-418A-4697-BB10-20C3AA60E2E4}.Release|Win32.ActiveCfg = Release|Win32 {A107C21C-418A-4697-BB10-20C3AA60E2E4}.Release|Win32.Build.0 = Release|Win32 - {23E9FF6A-49D1-4993-B2B5-BBB992C6C712}.Debug|Win32.ActiveCfg = Debug|Win32 - {23E9FF6A-49D1-4993-B2B5-BBB992C6C712}.Debug|Win32.Build.0 = Debug|Win32 + {A107C21C-418A-4697-BB10-20C3AA60E2E4}.Release|x64.ActiveCfg = Release|x64 + {A107C21C-418A-4697-BB10-20C3AA60E2E4}.Release|x64.Build.0 = Release|x64 + {23E9FF6A-49D1-4993-B2B5-BBB992C6C712}.Debug|Win32.ActiveCfg = Debug|x64 + {23E9FF6A-49D1-4993-B2B5-BBB992C6C712}.Debug|Win32.Build.0 = Debug|x64 + {23E9FF6A-49D1-4993-B2B5-BBB992C6C712}.Debug|x64.ActiveCfg = Debug|x64 + {23E9FF6A-49D1-4993-B2B5-BBB992C6C712}.Debug|x64.Build.0 = Debug|x64 {23E9FF6A-49D1-4993-B2B5-BBB992C6C712}.Release|Win32.ActiveCfg = Release|Win32 {23E9FF6A-49D1-4993-B2B5-BBB992C6C712}.Release|Win32.Build.0 = Release|Win32 + {23E9FF6A-49D1-4993-B2B5-BBB992C6C712}.Release|x64.ActiveCfg = Release|x64 + {23E9FF6A-49D1-4993-B2B5-BBB992C6C712}.Release|x64.Build.0 = Release|x64 EndGlobalSection GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE diff --git a/windows/hidapi.vcproj b/windows/hidapi.vcproj deleted file mode 100644 index ee9569c..0000000 --- a/windows/hidapi.vcproj +++ /dev/null @@ -1,201 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/windows/hidapi.vcxproj b/windows/hidapi.vcxproj index ae3ea43..69b3dee 100644 --- a/windows/hidapi.vcxproj +++ b/windows/hidapi.vcxproj @@ -19,12 +19,12 @@ StaticLibrary - v140 + v141 Unicode StaticLibrary - v140 + v141 MultiByte @@ -38,7 +38,7 @@ - <_ProjectFileVersion>14.0.25431.1 + <_ProjectFileVersion>15.0.26323.1 true diff --git a/windows/hidtest.vcproj b/windows/hidtest.vcproj deleted file mode 100644 index db64f96..0000000 --- a/windows/hidtest.vcproj +++ /dev/null @@ -1,196 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/windows/hidtest.vcxproj b/windows/hidtest.vcxproj new file mode 100644 index 0000000..4dce7f4 --- /dev/null +++ b/windows/hidtest.vcxproj @@ -0,0 +1,179 @@ + + + + + Debug + Win32 + + + Debug + x64 + + + Release + Win32 + + + Release + x64 + + + + {23E9FF6A-49D1-4993-B2B5-BBB992C6C712} + hidtest + + + + Application + v141 + MultiByte + true + + + Application + v141 + MultiByte + true + + + Application + v141 + MultiByte + + + Application + v141 + MultiByte + + + + + + + + + + + + + + + + + + + <_ProjectFileVersion>15.0.26323.1 + + + $(SolutionDir)$(Configuration)\ + $(Configuration)\ + + + + $(SolutionDir)$(Configuration)\ + $(Configuration)\ + + + + Disabled + ..\hidapi;%(AdditionalIncludeDirectories) + true + EnableFastChecks + MultiThreadedDebugDLL + Level3 + EditAndContinue + + + hidapi.lib;%(AdditionalDependencies) + ..\windows\Debug;%(AdditionalLibraryDirectories) + true + Console + MachineX86 + + + Copying hidapi.dll to the local direcotry. + + + + + + Disabled + ..\hidapi;%(AdditionalIncludeDirectories) + EnableFastChecks + MultiThreadedDebugDLL + Level3 + ProgramDatabase + + + hidapi.lib;%(AdditionalDependencies) + ..\windows\Debug;%(AdditionalLibraryDirectories) + true + Console + + + Copying hidapi.dll to the local direcotry. + + + + + + + MaxSpeed + true + ..\hidapi;%(AdditionalIncludeDirectories) + MultiThreadedDLL + true + Level3 + ProgramDatabase + + + hidapi.lib;%(AdditionalDependencies) + ..\windows\Release;%(AdditionalLibraryDirectories) + true + Console + true + true + MachineX86 + + + Copying hidapi.dll to the local direcotry. + + + + + + MaxSpeed + true + ..\hidapi;%(AdditionalIncludeDirectories) + MultiThreadedDLL + true + Level3 + ProgramDatabase + + + hidapi.lib;%(AdditionalDependencies) + ..\windows\Release;%(AdditionalLibraryDirectories) + true + Console + true + true + + + Copying hidapi.dll to the local direcotry. + + + + + + + + + + {a107c21c-418a-4697-bb10-20c3aa60e2e4} + false + + + + + + \ No newline at end of file diff --git a/windows/hidtest.vcxproj.filters b/windows/hidtest.vcxproj.filters new file mode 100644 index 0000000..8392ec8 --- /dev/null +++ b/windows/hidtest.vcxproj.filters @@ -0,0 +1,22 @@ + + + + + {4FC737F1-C7A5-4376-A066-2A32D752A2FF} + cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx + + + {93995380-89BD-4b04-88EB-625FBE52EBFB} + h;hpp;hxx;hm;inl;inc;xsd + + + {67DA6AB6-F800-4c08-8B7A-83BB121AAD01} + rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;tiff;tif;png;wav + + + + + Source Files + + + \ No newline at end of file