From 020103af78c55a9e0d01fbabecbd4d2108801c4a Mon Sep 17 00:00:00 2001 From: Sameeh Jubran Date: Sun, 15 Jan 2017 11:40:57 +0200 Subject: [PATCH] Windows: Ditch UsbDk build configuration Previous patch introduced run-time UsbDk backend activation, therefore separate build configuration is not needed anymore. Signed-off-by: Sameeh Jubran --- configure.ac | 9 -- libusb/version_nano.h | 2 +- msvc/ddk_build.cmd | 8 -- msvc/libusb_2013.sln | 20 --- msvc/libusb_2015.sln | 20 --- msvc/libusb_2017.sln | 20 --- msvc/libusb_sources | 6 +- msvc/libusb_usbdk_dll_2013.vcxproj | 178 -------------------------- msvc/libusb_usbdk_dll_2015.vcxproj | 178 -------------------------- msvc/libusb_usbdk_dll_2017.vcxproj | 178 -------------------------- msvc/libusb_usbdk_static_2013.vcxproj | 162 ----------------------- msvc/libusb_usbdk_static_2015.vcxproj | 162 ----------------------- msvc/libusb_usbdk_static_2017.vcxproj | 162 ----------------------- 13 files changed, 2 insertions(+), 1103 deletions(-) delete mode 100644 msvc/libusb_usbdk_dll_2013.vcxproj delete mode 100644 msvc/libusb_usbdk_dll_2015.vcxproj delete mode 100644 msvc/libusb_usbdk_dll_2017.vcxproj delete mode 100644 msvc/libusb_usbdk_static_2013.vcxproj delete mode 100644 msvc/libusb_usbdk_static_2015.vcxproj delete mode 100644 msvc/libusb_usbdk_static_2017.vcxproj diff --git a/configure.ac b/configure.ac index b596eae..5b16c68 100644 --- a/configure.ac +++ b/configure.ac @@ -178,14 +178,6 @@ windows) AC_DEFINE([POLL_NFDS_TYPE],[unsigned int],[type of second poll() argument]) AC_DEFINE([WINVER], 0x0501, [Oldest Windows version supported]) AC_DEFINE([_WIN32_WINNT], 0x0501, [Oldest Windows version supported]) - - AC_ARG_ENABLE([usbdk], - [AC_HELP_STRING([--enable-usbdk], [use UsbDk Windows backend [default=no]])], - [], [enable_usbdk=no]) - if test "x$enable_usbdk" = xyes; then - AC_DEFINE(USE_USBDK, 1, [Use UsbDk Windows backend]) - fi - AC_SUBST(USE_USBDK) ;; haiku) AC_DEFINE(OS_HAIKU, 1, [Haiku backend]) @@ -208,7 +200,6 @@ AM_CONDITIONAL(OS_HAIKU, test "x$backend" = xhaiku) AM_CONDITIONAL(THREADS_POSIX, test "x$threads" = xposix) AM_CONDITIONAL(CREATE_IMPORT_LIB, test "x$create_import_lib" = xyes) AM_CONDITIONAL(USE_UDEV, test "x$enable_udev" = xyes) -AM_CONDITIONAL(USE_USBDK, test "x$enable_usbdk" = xyes) if test "x$threads" = xposix; then AC_DEFINE(THREADS_POSIX, 1, [Use POSIX Threads]) fi diff --git a/libusb/version_nano.h b/libusb/version_nano.h index fbe5f76..51876c7 100644 --- a/libusb/version_nano.h +++ b/libusb/version_nano.h @@ -1 +1 @@ -#define LIBUSB_NANO 11275 +#define LIBUSB_NANO 11276 diff --git a/msvc/ddk_build.cmd b/msvc/ddk_build.cmd index 48d7804..f11ff88 100644 --- a/msvc/ddk_build.cmd +++ b/msvc/ddk_build.cmd @@ -3,28 +3,20 @@ ::# you can pass the following arguments (case insensitive): ::# - "DLL" to build a DLL instead of a static library ::# - "/MT" to build a static library compatible with MSVC's /MT option (LIBCMT vs MSVCRT) -::# - "USBDK" to build with UsbDk backend if Test%BUILD_ALT_DIR%==Test goto usage ::# process commandline parameters set TARGET=LIBRARY set STATIC_LIBC= -set WITH_USBDK= set version=1.0 set PWD=%~dp0 set BUILD_CMD=build -bcwgZ -M2 -:more_args - if "%1" == "" goto no_more_args ::# /I for case insensitive if /I Test%1==TestDLL set TARGET=DYNLINK if /I Test%1==Test/MT set STATIC_LIBC=1 -if /I Test%1==TestUSBDK set WITH_USBDK=1 - -shift -goto more_args :no_more_args diff --git a/msvc/libusb_2013.sln b/msvc/libusb_2013.sln index c9ab819..0b4e9f1 100644 --- a/msvc/libusb_2013.sln +++ b/msvc/libusb_2013.sln @@ -12,10 +12,6 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libusb-1.0 (dll)", "libusb_ EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libusb-1.0 (static)", "libusb_static_2013.vcxproj", "{349EE8F9-7D25-4909-AAF5-FF3FADE72187}" EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libusb-usbdk-1.0 (dll)", "libusb_usbdk_dll_2013.vcxproj", "{F53A5974-2319-48EB-A67B-27933AEDF14A}" -EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libusb-usbdk-1.0 (static)", "libusb_usbdk_static_2013.vcxproj", "{0B3D86CF-5D70-41A9-B391-A2E7C5C969ED}" -EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "listdevs", "listdevs_2013.vcxproj", "{F4938DB0-3DE7-4737-9C5A-EAD1BE819F87}" EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "stress", "stress_2013.vcxproj", "{53942EFF-C810-458D-B3CB-EE5CE9F1E781}" @@ -72,22 +68,6 @@ Global {349EE8F9-7D25-4909-AAF5-FF3FADE72187}.Release|Win32.Build.0 = Release|Win32 {349EE8F9-7D25-4909-AAF5-FF3FADE72187}.Release|x64.ActiveCfg = Release|x64 {349EE8F9-7D25-4909-AAF5-FF3FADE72187}.Release|x64.Build.0 = Release|x64 - {F53A5974-2319-48EB-A67B-27933AEDF14A}.Debug|Win32.ActiveCfg = Debug|Win32 - {F53A5974-2319-48EB-A67B-27933AEDF14A}.Debug|Win32.Build.0 = Debug|Win32 - {F53A5974-2319-48EB-A67B-27933AEDF14A}.Debug|x64.ActiveCfg = Debug|x64 - {F53A5974-2319-48EB-A67B-27933AEDF14A}.Debug|x64.Build.0 = Debug|x64 - {F53A5974-2319-48EB-A67B-27933AEDF14A}.Release|Win32.ActiveCfg = Release|Win32 - {F53A5974-2319-48EB-A67B-27933AEDF14A}.Release|Win32.Build.0 = Release|Win32 - {F53A5974-2319-48EB-A67B-27933AEDF14A}.Release|x64.ActiveCfg = Release|x64 - {F53A5974-2319-48EB-A67B-27933AEDF14A}.Release|x64.Build.0 = Release|x64 - {0B3D86CF-5D70-41A9-B391-A2E7C5C969ED}.Debug|Win32.ActiveCfg = Debug|Win32 - {0B3D86CF-5D70-41A9-B391-A2E7C5C969ED}.Debug|Win32.Build.0 = Debug|Win32 - {0B3D86CF-5D70-41A9-B391-A2E7C5C969ED}.Debug|x64.ActiveCfg = Debug|x64 - {0B3D86CF-5D70-41A9-B391-A2E7C5C969ED}.Debug|x64.Build.0 = Debug|x64 - {0B3D86CF-5D70-41A9-B391-A2E7C5C969ED}.Release|Win32.ActiveCfg = Release|Win32 - {0B3D86CF-5D70-41A9-B391-A2E7C5C969ED}.Release|Win32.Build.0 = Release|Win32 - {0B3D86CF-5D70-41A9-B391-A2E7C5C969ED}.Release|x64.ActiveCfg = Release|x64 - {0B3D86CF-5D70-41A9-B391-A2E7C5C969ED}.Release|x64.Build.0 = Release|x64 {F4938DB0-3DE7-4737-9C5A-EAD1BE819F87}.Debug|Win32.ActiveCfg = Debug|Win32 {F4938DB0-3DE7-4737-9C5A-EAD1BE819F87}.Debug|Win32.Build.0 = Debug|Win32 {F4938DB0-3DE7-4737-9C5A-EAD1BE819F87}.Debug|x64.ActiveCfg = Debug|x64 diff --git a/msvc/libusb_2015.sln b/msvc/libusb_2015.sln index 7ca65f9..3e333ba 100644 --- a/msvc/libusb_2015.sln +++ b/msvc/libusb_2015.sln @@ -12,10 +12,6 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libusb-1.0 (dll)", "libusb_ EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libusb-1.0 (static)", "libusb_static_2015.vcxproj", "{349EE8F9-7D25-4909-AAF5-FF3FADE72187}" EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libusb-usbdk-1.0 (dll)", "libusb_usbdk_dll_2015.vcxproj", "{F53A5974-2319-48EB-A67B-27933AEDF14A}" -EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libusb-usbdk-1.0 (static)", "libusb_usbdk_static_2015.vcxproj", "{0B3D86CF-5D70-41A9-B391-A2E7C5C969ED}" -EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "listdevs", "listdevs_2015.vcxproj", "{F4938DB0-3DE7-4737-9C5A-EAD1BE819F87}" EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "stress", "stress_2015.vcxproj", "{53942EFF-C810-458D-B3CB-EE5CE9F1E781}" @@ -72,22 +68,6 @@ Global {349EE8F9-7D25-4909-AAF5-FF3FADE72187}.Release|Win32.Build.0 = Release|Win32 {349EE8F9-7D25-4909-AAF5-FF3FADE72187}.Release|x64.ActiveCfg = Release|x64 {349EE8F9-7D25-4909-AAF5-FF3FADE72187}.Release|x64.Build.0 = Release|x64 - {F53A5974-2319-48EB-A67B-27933AEDF14A}.Debug|Win32.ActiveCfg = Debug|Win32 - {F53A5974-2319-48EB-A67B-27933AEDF14A}.Debug|Win32.Build.0 = Debug|Win32 - {F53A5974-2319-48EB-A67B-27933AEDF14A}.Debug|x64.ActiveCfg = Debug|x64 - {F53A5974-2319-48EB-A67B-27933AEDF14A}.Debug|x64.Build.0 = Debug|x64 - {F53A5974-2319-48EB-A67B-27933AEDF14A}.Release|Win32.ActiveCfg = Release|Win32 - {F53A5974-2319-48EB-A67B-27933AEDF14A}.Release|Win32.Build.0 = Release|Win32 - {F53A5974-2319-48EB-A67B-27933AEDF14A}.Release|x64.ActiveCfg = Release|x64 - {F53A5974-2319-48EB-A67B-27933AEDF14A}.Release|x64.Build.0 = Release|x64 - {0B3D86CF-5D70-41A9-B391-A2E7C5C969ED}.Debug|Win32.ActiveCfg = Debug|Win32 - {0B3D86CF-5D70-41A9-B391-A2E7C5C969ED}.Debug|Win32.Build.0 = Debug|Win32 - {0B3D86CF-5D70-41A9-B391-A2E7C5C969ED}.Debug|x64.ActiveCfg = Debug|x64 - {0B3D86CF-5D70-41A9-B391-A2E7C5C969ED}.Debug|x64.Build.0 = Debug|x64 - {0B3D86CF-5D70-41A9-B391-A2E7C5C969ED}.Release|Win32.ActiveCfg = Release|Win32 - {0B3D86CF-5D70-41A9-B391-A2E7C5C969ED}.Release|Win32.Build.0 = Release|Win32 - {0B3D86CF-5D70-41A9-B391-A2E7C5C969ED}.Release|x64.ActiveCfg = Release|x64 - {0B3D86CF-5D70-41A9-B391-A2E7C5C969ED}.Release|x64.Build.0 = Release|x64 {F4938DB0-3DE7-4737-9C5A-EAD1BE819F87}.Debug|Win32.ActiveCfg = Debug|Win32 {F4938DB0-3DE7-4737-9C5A-EAD1BE819F87}.Debug|Win32.Build.0 = Debug|Win32 {F4938DB0-3DE7-4737-9C5A-EAD1BE819F87}.Debug|x64.ActiveCfg = Debug|x64 diff --git a/msvc/libusb_2017.sln b/msvc/libusb_2017.sln index b1ddcec..04c43cd 100644 --- a/msvc/libusb_2017.sln +++ b/msvc/libusb_2017.sln @@ -12,10 +12,6 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libusb-1.0 (dll)", "libusb_ EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libusb-1.0 (static)", "libusb_static_2017.vcxproj", "{349EE8F9-7D25-4909-AAF5-FF3FADE72187}" EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libusb-usbdk-1.0 (dll)", "libusb_usbdk_dll_2017.vcxproj", "{F53A5974-2319-48EB-A67B-27933AEDF14A}" -EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libusb-usbdk-1.0 (static)", "libusb_usbdk_static_2017.vcxproj", "{0B3D86CF-5D70-41A9-B391-A2E7C5C969ED}" -EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "listdevs", "listdevs_2017.vcxproj", "{F4938DB0-3DE7-4737-9C5A-EAD1BE819F87}" EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "stress", "stress_2017.vcxproj", "{53942EFF-C810-458D-B3CB-EE5CE9F1E781}" @@ -72,22 +68,6 @@ Global {349EE8F9-7D25-4909-AAF5-FF3FADE72187}.Release|Win32.Build.0 = Release|Win32 {349EE8F9-7D25-4909-AAF5-FF3FADE72187}.Release|x64.ActiveCfg = Release|x64 {349EE8F9-7D25-4909-AAF5-FF3FADE72187}.Release|x64.Build.0 = Release|x64 - {F53A5974-2319-48EB-A67B-27933AEDF14A}.Debug|Win32.ActiveCfg = Debug|Win32 - {F53A5974-2319-48EB-A67B-27933AEDF14A}.Debug|Win32.Build.0 = Debug|Win32 - {F53A5974-2319-48EB-A67B-27933AEDF14A}.Debug|x64.ActiveCfg = Debug|x64 - {F53A5974-2319-48EB-A67B-27933AEDF14A}.Debug|x64.Build.0 = Debug|x64 - {F53A5974-2319-48EB-A67B-27933AEDF14A}.Release|Win32.ActiveCfg = Release|Win32 - {F53A5974-2319-48EB-A67B-27933AEDF14A}.Release|Win32.Build.0 = Release|Win32 - {F53A5974-2319-48EB-A67B-27933AEDF14A}.Release|x64.ActiveCfg = Release|x64 - {F53A5974-2319-48EB-A67B-27933AEDF14A}.Release|x64.Build.0 = Release|x64 - {0B3D86CF-5D70-41A9-B391-A2E7C5C969ED}.Debug|Win32.ActiveCfg = Debug|Win32 - {0B3D86CF-5D70-41A9-B391-A2E7C5C969ED}.Debug|Win32.Build.0 = Debug|Win32 - {0B3D86CF-5D70-41A9-B391-A2E7C5C969ED}.Debug|x64.ActiveCfg = Debug|x64 - {0B3D86CF-5D70-41A9-B391-A2E7C5C969ED}.Debug|x64.Build.0 = Debug|x64 - {0B3D86CF-5D70-41A9-B391-A2E7C5C969ED}.Release|Win32.ActiveCfg = Release|Win32 - {0B3D86CF-5D70-41A9-B391-A2E7C5C969ED}.Release|Win32.Build.0 = Release|Win32 - {0B3D86CF-5D70-41A9-B391-A2E7C5C969ED}.Release|x64.ActiveCfg = Release|x64 - {0B3D86CF-5D70-41A9-B391-A2E7C5C969ED}.Release|x64.Build.0 = Release|x64 {F4938DB0-3DE7-4737-9C5A-EAD1BE819F87}.Debug|Win32.ActiveCfg = Debug|Win32 {F4938DB0-3DE7-4737-9C5A-EAD1BE819F87}.Debug|Win32.Build.0 = Debug|Win32 {F4938DB0-3DE7-4737-9C5A-EAD1BE819F87}.Debug|x64.ActiveCfg = Debug|x64 diff --git a/msvc/libusb_sources b/msvc/libusb_sources index 56960f9..d497711 100644 --- a/msvc/libusb_sources +++ b/msvc/libusb_sources @@ -12,12 +12,8 @@ USE_LIBCMT=1 USE_MSVCRT=1 !ENDIF -!IFDEF WITH_USBDK -BACKEND_DEFINES="/DUSE_USBDK" -!ENDIF - INCLUDES=..;..\..\msvc;$(DDK_INC_PATH) -C_DEFINES= $(C_DEFINES) $(LIBUSB_DEFINES) $(BACKEND_DEFINES) /DDDKBUILD +C_DEFINES= $(C_DEFINES) $(LIBUSB_DEFINES) /DDDKBUILD # http://jpassing.com/2009/10/21/ltcg-issues-with-the-win7amd64-environment-of-wdk-7600/ # prevents the following error when using the 64 bit static lib with Visual Studio 2010: diff --git a/msvc/libusb_usbdk_dll_2013.vcxproj b/msvc/libusb_usbdk_dll_2013.vcxproj deleted file mode 100644 index 6d9018f..0000000 --- a/msvc/libusb_usbdk_dll_2013.vcxproj +++ /dev/null @@ -1,178 +0,0 @@ - - - - - Debug - Win32 - - - Debug - x64 - - - Release - Win32 - - - Release - x64 - - - - libusb-usbdk-1.0 (dll) - {F53A5974-2319-48EB-A67B-27933AEDF14A} - libusbdll - - - - DynamicLibrary - Unicode - true - v120 - - - DynamicLibrary - Unicode - v120 - - - DynamicLibrary - Unicode - true - v120 - - - DynamicLibrary - Unicode - v120 - - - - - - - - - - - - - - - - - - - <_ProjectFileVersion>10.0.30319.1 - $(SolutionDir)..\$(Platform)\$(Configuration)\dll\ - $(SolutionDir)..\$(Platform)\$(Configuration)\dll\libusb-usbdk-1.0\ - $(SolutionDir)..\$(Platform)\$(Configuration)\dll\ - $(SolutionDir)..\$(Platform)\$(Configuration)\dll\libusb-usbdk-1.0\ - $(SolutionDir)..\$(Platform)\$(Configuration)\dll\ - $(SolutionDir)..\$(Platform)\$(Configuration)\dll\libusb-usbdk-1.0\ - $(SolutionDir)..\$(Platform)\$(Configuration)\dll\ - $(SolutionDir)..\$(Platform)\$(Configuration)\dll\libusb-usbdk-1.0\ - libusb-usbdk-1.0 - libusb-usbdk-1.0 - libusb-usbdk-1.0 - libusb-usbdk-1.0 - - - - Disabled - .;..\libusb;%(AdditionalIncludeDirectories) - _WIN32;_DEBUG;_LIB;_CRT_SECURE_NO_WARNINGS;USE_USBDK;%(PreprocessorDefinitions) - MultiThreadedDebugDLL - Level4 - ProgramDatabase - - - $(OutDir)libusb-usbdk-1.0.dll - ..\libusb\libusb-1.0.def - libusb-1.0.rc;%(EmbedManagedResourceFile) - true - - - - - X64 - - - Disabled - .;..\libusb;%(AdditionalIncludeDirectories) - _WIN32;_WIN64;_DEBUG;_CRT_SECURE_NO_WARNINGS;USE_USBDK;%(PreprocessorDefinitions) - MultiThreadedDebugDLL - Level4 - ProgramDatabase - - - $(OutDir)libusb-usbdk-1.0.dll - ..\libusb\libusb-1.0.def - libusb-1.0.rc;%(EmbedManagedResourceFile) - true - - - - - .;..\libusb;%(AdditionalIncludeDirectories) - _WIN32;_LIB;_CRT_SECURE_NO_WARNINGS;USE_USBDK;%(PreprocessorDefinitions) - MultiThreadedDLL - Level4 - - - $(OutDir)libusb-usbdk-1.0.dll - ..\libusb\libusb-1.0.def - libusb-1.0.rc;%(EmbedManagedResourceFile) - - - - - X64 - - - .;..\libusb;%(AdditionalIncludeDirectories) - _WIN32;_WIN64;_LIB;_CRT_SECURE_NO_WARNINGS;USE_USBDK;%(PreprocessorDefinitions) - MultiThreadedDLL - Level4 - - - $(OutDir)libusb-usbdk-1.0.dll - ..\libusb\libusb-1.0.def - libusb-1.0.rc;%(EmbedManagedResourceFile) - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/msvc/libusb_usbdk_dll_2015.vcxproj b/msvc/libusb_usbdk_dll_2015.vcxproj deleted file mode 100644 index a19c17e..0000000 --- a/msvc/libusb_usbdk_dll_2015.vcxproj +++ /dev/null @@ -1,178 +0,0 @@ - - - - - Debug - Win32 - - - Debug - x64 - - - Release - Win32 - - - Release - x64 - - - - libusb-usbdk-1.0 (dll) - {F53A5974-2319-48EB-A67B-27933AEDF14A} - libusbdll - - - - DynamicLibrary - Unicode - true - v140 - - - DynamicLibrary - Unicode - v140 - - - DynamicLibrary - Unicode - true - v140 - - - DynamicLibrary - Unicode - v140 - - - - - - - - - - - - - - - - - - - <_ProjectFileVersion>10.0.30319.1 - $(SolutionDir)..\$(Platform)\$(Configuration)\dll\ - $(SolutionDir)..\$(Platform)\$(Configuration)\dll\libusb-usbdk-1.0\ - $(SolutionDir)..\$(Platform)\$(Configuration)\dll\ - $(SolutionDir)..\$(Platform)\$(Configuration)\dll\libusb-usbdk-1.0\ - $(SolutionDir)..\$(Platform)\$(Configuration)\dll\ - $(SolutionDir)..\$(Platform)\$(Configuration)\dll\libusb-usbdk-1.0\ - $(SolutionDir)..\$(Platform)\$(Configuration)\dll\ - $(SolutionDir)..\$(Platform)\$(Configuration)\dll\libusb-usbdk-1.0\ - libusb-usbdk-1.0 - libusb-usbdk-1.0 - libusb-usbdk-1.0 - libusb-usbdk-1.0 - - - - Disabled - .;..\libusb;%(AdditionalIncludeDirectories) - _WIN32;_DEBUG;_LIB;_CRT_SECURE_NO_WARNINGS;USE_USBDK;%(PreprocessorDefinitions) - MultiThreadedDebugDLL - Level4 - ProgramDatabase - - - $(OutDir)libusb-usbdk-1.0.dll - ..\libusb\libusb-1.0.def - libusb-1.0.rc;%(EmbedManagedResourceFile) - true - - - - - X64 - - - Disabled - .;..\libusb;%(AdditionalIncludeDirectories) - _WIN32;_WIN64;_DEBUG;_CRT_SECURE_NO_WARNINGS;USE_USBDK;%(PreprocessorDefinitions) - MultiThreadedDebugDLL - Level4 - ProgramDatabase - - - $(OutDir)libusb-usbdk-1.0.dll - ..\libusb\libusb-1.0.def - libusb-1.0.rc;%(EmbedManagedResourceFile) - true - - - - - .;..\libusb;%(AdditionalIncludeDirectories) - _WIN32;_LIB;_CRT_SECURE_NO_WARNINGS;USE_USBDK;%(PreprocessorDefinitions) - MultiThreadedDLL - Level4 - - - $(OutDir)libusb-usbdk-1.0.dll - ..\libusb\libusb-1.0.def - libusb-1.0.rc;%(EmbedManagedResourceFile) - - - - - X64 - - - .;..\libusb;%(AdditionalIncludeDirectories) - _WIN32;_WIN64;_LIB;_CRT_SECURE_NO_WARNINGS;USE_USBDK;%(PreprocessorDefinitions) - MultiThreadedDLL - Level4 - - - $(OutDir)libusb-usbdk-1.0.dll - ..\libusb\libusb-1.0.def - libusb-1.0.rc;%(EmbedManagedResourceFile) - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/msvc/libusb_usbdk_dll_2017.vcxproj b/msvc/libusb_usbdk_dll_2017.vcxproj deleted file mode 100644 index 73274fe..0000000 --- a/msvc/libusb_usbdk_dll_2017.vcxproj +++ /dev/null @@ -1,178 +0,0 @@ - - - - - Debug - Win32 - - - Debug - x64 - - - Release - Win32 - - - Release - x64 - - - - libusb-usbdk-1.0 (dll) - {F53A5974-2319-48EB-A67B-27933AEDF14A} - libusbdll - - - - DynamicLibrary - Unicode - true - v141 - - - DynamicLibrary - Unicode - v141 - - - DynamicLibrary - Unicode - true - v141 - - - DynamicLibrary - Unicode - v141 - - - - - - - - - - - - - - - - - - - <_ProjectFileVersion>10.0.30319.1 - $(SolutionDir)..\$(Platform)\$(Configuration)\dll\ - $(SolutionDir)..\$(Platform)\$(Configuration)\dll\libusb-usbdk-1.0\ - $(SolutionDir)..\$(Platform)\$(Configuration)\dll\ - $(SolutionDir)..\$(Platform)\$(Configuration)\dll\libusb-usbdk-1.0\ - $(SolutionDir)..\$(Platform)\$(Configuration)\dll\ - $(SolutionDir)..\$(Platform)\$(Configuration)\dll\libusb-usbdk-1.0\ - $(SolutionDir)..\$(Platform)\$(Configuration)\dll\ - $(SolutionDir)..\$(Platform)\$(Configuration)\dll\libusb-usbdk-1.0\ - libusb-usbdk-1.0 - libusb-usbdk-1.0 - libusb-usbdk-1.0 - libusb-usbdk-1.0 - - - - Disabled - .;..\libusb;%(AdditionalIncludeDirectories) - _WIN32;_DEBUG;_LIB;_CRT_SECURE_NO_WARNINGS;USE_USBDK;%(PreprocessorDefinitions) - MultiThreadedDebugDLL - Level4 - ProgramDatabase - - - $(OutDir)libusb-usbdk-1.0.dll - ..\libusb\libusb-1.0.def - libusb-1.0.rc;%(EmbedManagedResourceFile) - true - - - - - X64 - - - Disabled - .;..\libusb;%(AdditionalIncludeDirectories) - _WIN32;_WIN64;_DEBUG;_CRT_SECURE_NO_WARNINGS;USE_USBDK;%(PreprocessorDefinitions) - MultiThreadedDebugDLL - Level4 - ProgramDatabase - - - $(OutDir)libusb-usbdk-1.0.dll - ..\libusb\libusb-1.0.def - libusb-1.0.rc;%(EmbedManagedResourceFile) - true - - - - - .;..\libusb;%(AdditionalIncludeDirectories) - _WIN32;_LIB;_CRT_SECURE_NO_WARNINGS;USE_USBDK;%(PreprocessorDefinitions) - MultiThreadedDLL - Level4 - - - $(OutDir)libusb-usbdk-1.0.dll - ..\libusb\libusb-1.0.def - libusb-1.0.rc;%(EmbedManagedResourceFile) - - - - - X64 - - - .;..\libusb;%(AdditionalIncludeDirectories) - _WIN32;_WIN64;_LIB;_CRT_SECURE_NO_WARNINGS;USE_USBDK;%(PreprocessorDefinitions) - MultiThreadedDLL - Level4 - - - $(OutDir)libusb-usbdk-1.0.dll - ..\libusb\libusb-1.0.def - libusb-1.0.rc;%(EmbedManagedResourceFile) - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/msvc/libusb_usbdk_static_2013.vcxproj b/msvc/libusb_usbdk_static_2013.vcxproj deleted file mode 100644 index 5cc42d4..0000000 --- a/msvc/libusb_usbdk_static_2013.vcxproj +++ /dev/null @@ -1,162 +0,0 @@ - - - - - Debug - Win32 - - - Debug - x64 - - - Release - Win32 - - - Release - x64 - - - - libusb-usbdk-1.0 (static) - {0B3D86CF-5D70-41A9-B391-A2E7C5C969ED} - libusb - - - - StaticLibrary - Unicode - true - v120 - - - StaticLibrary - Unicode - v120 - - - StaticLibrary - Unicode - true - v120 - - - StaticLibrary - Unicode - v120 - - - - - - - - - - - - - - - - - - - <_ProjectFileVersion>10.0.30319.1 - $(SolutionDir)..\$(Platform)\$(Configuration)\lib\ - $(SolutionDir)..\$(Platform)\$(Configuration)\lib\libusb-usbdk-1.0\ - $(SolutionDir)..\$(Platform)\$(Configuration)\lib\ - $(SolutionDir)..\$(Platform)\$(Configuration)\lib\libusb-usbdk-1.0\ - $(SolutionDir)..\$(Platform)\$(Configuration)\lib\ - $(SolutionDir)..\$(Platform)\$(Configuration)\lib\libusb-usbdk-1.0\ - $(SolutionDir)..\$(Platform)\$(Configuration)\lib\ - $(SolutionDir)..\$(Platform)\$(Configuration)\lib\libusb-usbdk-1.0\ - libusb-usbdk-1.0 - libusb-usbdk-1.0 - libusb-usbdk-1.0 - libusb-usbdk-1.0 - - - - Disabled - .;..\libusb;%(AdditionalIncludeDirectories) - _WIN32;_DEBUG;_LIB;_CRT_SECURE_NO_WARNINGS;USE_USBDK;%(PreprocessorDefinitions) - MultiThreadedDebug - Level4 - ProgramDatabase - - - $(OutDir)libusb-usbdk-1.0.lib - - - - - X64 - - - Disabled - .;..\libusb;%(AdditionalIncludeDirectories) - _WIN32;_WIN64;_DEBUG;_LIB;_CRT_SECURE_NO_WARNINGS;USE_USBDK;%(PreprocessorDefinitions) - MultiThreadedDebug - Level4 - ProgramDatabase - - - $(OutDir)libusb-usbdk-1.0.lib - - - - - .;..\libusb;%(AdditionalIncludeDirectories) - _WIN32;_LIB;_CRT_SECURE_NO_WARNINGS;USE_USBDK;%(PreprocessorDefinitions) - MultiThreaded - Level4 - - - $(OutDir)libusb-usbdk-1.0.lib - - - - - X64 - - - .;..\libusb;%(AdditionalIncludeDirectories) - _WIN32;_WIN64;_LIB;_CRT_SECURE_NO_WARNINGS;USE_USBDK;%(PreprocessorDefinitions) - MultiThreaded - Level4 - - - $(OutDir)libusb-usbdk-1.0.lib - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/msvc/libusb_usbdk_static_2015.vcxproj b/msvc/libusb_usbdk_static_2015.vcxproj deleted file mode 100644 index eec20ee..0000000 --- a/msvc/libusb_usbdk_static_2015.vcxproj +++ /dev/null @@ -1,162 +0,0 @@ - - - - - Debug - Win32 - - - Debug - x64 - - - Release - Win32 - - - Release - x64 - - - - libusb-usbdk-1.0 (static) - {0B3D86CF-5D70-41A9-B391-A2E7C5C969ED} - libusb - - - - StaticLibrary - Unicode - true - v140 - - - StaticLibrary - Unicode - v140 - - - StaticLibrary - Unicode - true - v140 - - - StaticLibrary - Unicode - v140 - - - - - - - - - - - - - - - - - - - <_ProjectFileVersion>10.0.30319.1 - $(SolutionDir)..\$(Platform)\$(Configuration)\lib\ - $(SolutionDir)..\$(Platform)\$(Configuration)\lib\libusb-usbdk-1.0\ - $(SolutionDir)..\$(Platform)\$(Configuration)\lib\ - $(SolutionDir)..\$(Platform)\$(Configuration)\lib\libusb-usbdk-1.0\ - $(SolutionDir)..\$(Platform)\$(Configuration)\lib\ - $(SolutionDir)..\$(Platform)\$(Configuration)\lib\libusb-usbdk-1.0\ - $(SolutionDir)..\$(Platform)\$(Configuration)\lib\ - $(SolutionDir)..\$(Platform)\$(Configuration)\lib\libusb-usbdk-1.0\ - libusb-usbdk-1.0 - libusb-usbdk-1.0 - libusb-usbdk-1.0 - libusb-usbdk-1.0 - - - - Disabled - .;..\libusb;%(AdditionalIncludeDirectories) - _WIN32;_DEBUG;_LIB;_CRT_SECURE_NO_WARNINGS;USE_USBDK;%(PreprocessorDefinitions) - MultiThreadedDebug - Level4 - ProgramDatabase - - - $(OutDir)libusb-usbdk-1.0.lib - - - - - X64 - - - Disabled - .;..\libusb;%(AdditionalIncludeDirectories) - _WIN32;_WIN64;_DEBUG;_LIB;_CRT_SECURE_NO_WARNINGS;USE_USBDK;%(PreprocessorDefinitions) - MultiThreadedDebug - Level4 - ProgramDatabase - - - $(OutDir)libusb-usbdk-1.0.lib - - - - - .;..\libusb;%(AdditionalIncludeDirectories) - _WIN32;_LIB;_CRT_SECURE_NO_WARNINGS;USE_USBDK;%(PreprocessorDefinitions) - MultiThreaded - Level4 - - - $(OutDir)libusb-usbdk-1.0.lib - - - - - X64 - - - .;..\libusb;%(AdditionalIncludeDirectories) - _WIN32;_WIN64;_LIB;_CRT_SECURE_NO_WARNINGS;USE_USBDK;%(PreprocessorDefinitions) - MultiThreaded - Level4 - - - $(OutDir)libusb-usbdk-1.0.lib - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/msvc/libusb_usbdk_static_2017.vcxproj b/msvc/libusb_usbdk_static_2017.vcxproj deleted file mode 100644 index beb0b2c..0000000 --- a/msvc/libusb_usbdk_static_2017.vcxproj +++ /dev/null @@ -1,162 +0,0 @@ - - - - - Debug - Win32 - - - Debug - x64 - - - Release - Win32 - - - Release - x64 - - - - libusb-usbdk-1.0 (static) - {0B3D86CF-5D70-41A9-B391-A2E7C5C969ED} - libusb - - - - StaticLibrary - Unicode - true - v141 - - - StaticLibrary - Unicode - v141 - - - StaticLibrary - Unicode - true - v141 - - - StaticLibrary - Unicode - v141 - - - - - - - - - - - - - - - - - - - <_ProjectFileVersion>10.0.30319.1 - $(SolutionDir)..\$(Platform)\$(Configuration)\lib\ - $(SolutionDir)..\$(Platform)\$(Configuration)\lib\libusb-usbdk-1.0\ - $(SolutionDir)..\$(Platform)\$(Configuration)\lib\ - $(SolutionDir)..\$(Platform)\$(Configuration)\lib\libusb-usbdk-1.0\ - $(SolutionDir)..\$(Platform)\$(Configuration)\lib\ - $(SolutionDir)..\$(Platform)\$(Configuration)\lib\libusb-usbdk-1.0\ - $(SolutionDir)..\$(Platform)\$(Configuration)\lib\ - $(SolutionDir)..\$(Platform)\$(Configuration)\lib\libusb-usbdk-1.0\ - libusb-usbdk-1.0 - libusb-usbdk-1.0 - libusb-usbdk-1.0 - libusb-usbdk-1.0 - - - - Disabled - .;..\libusb;%(AdditionalIncludeDirectories) - _WIN32;_DEBUG;_LIB;_CRT_SECURE_NO_WARNINGS;USE_USBDK;%(PreprocessorDefinitions) - MultiThreadedDebug - Level4 - ProgramDatabase - - - $(OutDir)libusb-usbdk-1.0.lib - - - - - X64 - - - Disabled - .;..\libusb;%(AdditionalIncludeDirectories) - _WIN32;_WIN64;_DEBUG;_LIB;_CRT_SECURE_NO_WARNINGS;USE_USBDK;%(PreprocessorDefinitions) - MultiThreadedDebug - Level4 - ProgramDatabase - - - $(OutDir)libusb-usbdk-1.0.lib - - - - - .;..\libusb;%(AdditionalIncludeDirectories) - _WIN32;_LIB;_CRT_SECURE_NO_WARNINGS;USE_USBDK;%(PreprocessorDefinitions) - MultiThreaded - Level4 - - - $(OutDir)libusb-usbdk-1.0.lib - - - - - X64 - - - .;..\libusb;%(AdditionalIncludeDirectories) - _WIN32;_WIN64;_LIB;_CRT_SECURE_NO_WARNINGS;USE_USBDK;%(PreprocessorDefinitions) - MultiThreaded - Level4 - - - $(OutDir)libusb-usbdk-1.0.lib - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file