diff --git a/libusb/libusb-1.0.def b/libusb/libusb-1.0.def index d1f4230..3fd4b6b 100644 --- a/libusb/libusb-1.0.def +++ b/libusb/libusb-1.0.def @@ -151,7 +151,7 @@ EXPORTS libusb_set_interface_alt_setting libusb_set_interface_alt_setting@12 = libusb_set_interface_alt_setting libusb_set_option - libusb_set_option = libusb_set_option + _libusb_set_option = libusb_set_option libusb_set_pollfd_notifiers libusb_set_pollfd_notifiers@16 = libusb_set_pollfd_notifiers libusb_setlocale diff --git a/libusb/os/poll_windows.c b/libusb/os/poll_windows.c index bb3d178..4d28333 100644 --- a/libusb/os/poll_windows.c +++ b/libusb/os/poll_windows.c @@ -185,7 +185,7 @@ int usbi_poll(struct pollfd *fds, unsigned int nfds, int timeout) if ((nready == 0) && (nb_wait_handles != 0) && (timeout != 0)) { ret = WaitForMultipleObjects(nb_wait_handles, wait_handles, FALSE, (timeout < 0) ? INFINITE : (DWORD)timeout); - if ((ret >= WAIT_OBJECT_0) && (ret < (WAIT_OBJECT_0 + nb_wait_handles))) { + if (ret < (WAIT_OBJECT_0 + nb_wait_handles)) { nready = check_pollfds(fds, nfds, NULL, NULL); } else if (ret != WAIT_TIMEOUT) { if (ret == WAIT_FAILED) diff --git a/libusb/version_nano.h b/libusb/version_nano.h index 92f2e78..346d835 100644 --- a/libusb/version_nano.h +++ b/libusb/version_nano.h @@ -1 +1 @@ -#define LIBUSB_NANO 11306 +#define LIBUSB_NANO 11307 diff --git a/msvc/config.h b/msvc/config.h index c6d7836..b20d99b 100644 --- a/msvc/config.h +++ b/msvc/config.h @@ -5,10 +5,6 @@ #error "Please make sure the msvc/ directory is removed from your build path." #endif -/* Only support Windows XP and later */ -#define WINVER 0x0501 -#define _WIN32_WINNT 0x0501 - /* Visual Studio 2015 and later defines timespec */ #if (_MSC_VER >= 1900) #define _TIMESPEC_DEFINED 1 diff --git a/msvc/ddk_build.cmd b/msvc/ddk_build.cmd index f11ff88..bb071e1 100644 --- a/msvc/ddk_build.cmd +++ b/msvc/ddk_build.cmd @@ -11,7 +11,7 @@ set TARGET=LIBRARY set STATIC_LIBC= set version=1.0 set PWD=%~dp0 -set BUILD_CMD=build -bcwgZ -M2 +set BUILD_CMD=build /bcwgZ /M2 if "%1" == "" goto no_more_args ::# /I for case insensitive @@ -59,6 +59,9 @@ md %dstPath%\lib if exist %dstPath%\examples goto md6 md %dstPath%\examples :md6 +if exist %dstPath%\tests goto md7 +md %dstPath%\tests +:md7 @echo on if %TARGET%==LIBRARY goto copylib @@ -69,49 +72,9 @@ copy %srcPath%\libusb-%version%.lib %dstPath%\lib @echo off -if exist examples\listdevs_ddkbuild goto md7 -md examples\listdevs_ddkbuild -:md7 - -cd examples\listdevs_ddkbuild -copy ..\..\msvc\listdevs_sources sources >NUL 2>&1 -@echo on -%BUILD_CMD% -@echo off -if errorlevel 1 goto builderror -cd ..\.. - -set srcPath=examples\listdevs_ddkbuild\obj%BUILD_ALT_DIR%\%cpudir% -@echo on - -copy %srcPath%\listdevs.exe %dstPath%\examples -copy %srcPath%\listdevs.pdb %dstPath%\examples - -@echo off - -if exist examples\xusb_ddkbuild goto md8 -md examples\xusb_ddkbuild -:md8 - -cd examples\xusb_ddkbuild -copy ..\..\msvc\xusb_sources sources >NUL 2>&1 -@echo on -%BUILD_CMD% -@echo off -if errorlevel 1 goto builderror -cd ..\.. - -set srcPath=examples\xusb_ddkbuild\obj%BUILD_ALT_DIR%\%cpudir% -@echo on - -copy %srcPath%\xusb.exe %dstPath%\examples -copy %srcPath%\xusb.pdb %dstPath%\examples - -@echo off - -if exist examples\getopt\getopt_ddkbuild goto md9 +if exist examples\getopt\getopt_ddkbuild goto md8 md examples\getopt\getopt_ddkbuild -:md9 +:md8 cd examples\getopt\getopt_ddkbuild copy ..\..\..\msvc\getopt_sources sources >NUL 2>&1 @@ -121,9 +84,9 @@ copy ..\..\..\msvc\getopt_sources sources >NUL 2>&1 if errorlevel 1 goto builderror cd ..\..\.. -if exist examples\fxload_ddkbuild goto md10 +if exist examples\fxload_ddkbuild goto md9 md examples\fxload_ddkbuild -:md10 +:md9 cd examples\fxload_ddkbuild copy ..\..\msvc\fxload_sources sources >NUL 2>&1 @@ -141,9 +104,9 @@ copy %srcPath%\fxload.pdb %dstPath%\examples @echo off -if exist examples\hotplugtest_ddkbuild goto md11 +if exist examples\hotplugtest_ddkbuild goto md10 md examples\hotplugtest_ddkbuild -:md11 +:md10 cd examples\hotplugtest_ddkbuild copy ..\..\msvc\hotplugtest_sources sources >NUL 2>&1 @@ -161,6 +124,86 @@ copy %srcPath%\hotplugtest.pdb %dstPath%\examples @echo off +if exist examples\listdevs_ddkbuild goto md11 +md examples\listdevs_ddkbuild +:md11 + +cd examples\listdevs_ddkbuild +copy ..\..\msvc\listdevs_sources sources >NUL 2>&1 +@echo on +%BUILD_CMD% +@echo off +if errorlevel 1 goto builderror +cd ..\.. + +set srcPath=examples\listdevs_ddkbuild\obj%BUILD_ALT_DIR%\%cpudir% +@echo on + +copy %srcPath%\listdevs.exe %dstPath%\examples +copy %srcPath%\listdevs.pdb %dstPath%\examples + +@echo off + +if exist examples\testlibusb_ddkbuild goto md12 +md examples\testlibusb_ddkbuild +:md12 + +cd examples\testlibusb_ddkbuild +copy ..\..\msvc\testlibusb_sources sources >NUL 2>&1 +@echo on +%BUILD_CMD% +@echo off +if errorlevel 1 goto builderror +cd ..\.. + +set srcPath=examples\testlibusb_ddkbuild\obj%BUILD_ALT_DIR%\%cpudir% +@echo on + +copy %srcPath%\testlibusb.exe %dstPath%\examples +copy %srcPath%\testlibusb.pdb %dstPath%\examples + +@echo off + +if exist examples\xusb_ddkbuild goto md13 +md examples\xusb_ddkbuild +:md13 + +cd examples\xusb_ddkbuild +copy ..\..\msvc\xusb_sources sources >NUL 2>&1 +@echo on +%BUILD_CMD% +@echo off +if errorlevel 1 goto builderror +cd ..\.. + +set srcPath=examples\xusb_ddkbuild\obj%BUILD_ALT_DIR%\%cpudir% +@echo on + +copy %srcPath%\xusb.exe %dstPath%\examples +copy %srcPath%\xusb.pdb %dstPath%\examples + +@echo off + +if exist tests\stress_ddkbuild goto md14 +md tests\stress_ddkbuild +:md14 + +cd tests\stress_ddkbuild +copy ..\..\msvc\stress_sources sources >NUL 2>&1 +@echo on +%BUILD_CMD% +@echo off +if errorlevel 1 goto builderror +cd ..\.. + +set srcPath=tests\stress_ddkbuild\obj%BUILD_ALT_DIR%\%cpudir% +@echo on + +copy %srcPath%\stress.exe %dstPath%\tests +copy %srcPath%\stress.pdb %dstPath%\tests + +@echo off + cd msvc goto done diff --git a/msvc/fxload_2010.vcxproj b/msvc/fxload_2010.vcxproj index f4f1cfc..65f97a1 100644 --- a/msvc/fxload_2010.vcxproj +++ b/msvc/fxload_2010.vcxproj @@ -25,133 +25,54 @@ Win32Proj - - Application - Unicode - true - - - Application - Unicode - - - Application - Unicode - true - - + Application Unicode + true - - - - - - - - - - + <_ProjectFileVersion>10.0.30319.1 - $(SolutionDir)..\$(Platform)\$(Configuration)\examples\ - $(SolutionDir)..\$(Platform)\$(Configuration)\examples\$(ProjectName)\ - $(SolutionDir)..\$(Platform)\$(Configuration)\examples\ - $(SolutionDir)..\$(Platform)\$(Configuration)\examples\$(ProjectName)\ - $(SolutionDir)..\$(Platform)\$(Configuration)\examples\ - $(SolutionDir)..\$(Platform)\$(Configuration)\examples\$(ProjectName)\ - $(SolutionDir)..\$(Platform)\$(Configuration)\examples\ - $(SolutionDir)..\$(Platform)\$(Configuration)\examples\$(ProjectName)\ + $(SolutionDir)..\$(Platform)\$(Configuration)\examples\$(ProjectName)\ + $(SolutionDir)..\$(Platform)\$(Configuration)\examples\ - - - $(IntDir)$(ProjectName).htm - + - Disabled .;..\examples\getopt;..\libusb;%(AdditionalIncludeDirectories) - WIN32;__GNU_LIBRARY__;_DEBUG;_CONSOLE;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) - true - MultiThreadedDebug + __GNU_LIBRARY__;_CONSOLE;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) Level3 + + ProgramDatabase - - - %(AdditionalLibraryDirectories) - true - Console - MachineX86 - - - - - $(IntDir)$(ProjectName).htm - - - X64 - - - Disabled - .;..\examples\getopt;..\libusb;%(AdditionalIncludeDirectories) - WIN32;__GNU_LIBRARY__;_DEBUG;_CONSOLE;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) true + Disabled MultiThreadedDebug - Level3 - ProgramDatabase + + + NDEBUG;%(PreprocessorDefinitions) + MultiThreaded - %(AdditionalLibraryDirectories) + $(TargetDir)$(ProjectName).pdb + Console + + true - Console - MachineX64 - - - - - $(IntDir)$(ProjectName).htm - - - .;..\examples\getopt;..\libusb;%(AdditionalIncludeDirectories) - WIN32;__GNU_LIBRARY__;NDEBUG;_CONSOLE;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) - MultiThreaded - Level3 - - - %(AdditionalLibraryDirectories) - Console - MachineX86 - - - - - $(IntDir)$(ProjectName).htm - - - X64 - - - .;..\examples\getopt;..\libusb;%(AdditionalIncludeDirectories) - WIN32;__GNU_LIBRARY__;NDEBUG;_CONSOLE;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) - MultiThreaded - Level3 - - - %(AdditionalLibraryDirectories) - Console - MachineX64 + + + {ae83e1b4-ce06-47ee-b7a3-c3a1d7c2d71e} @@ -162,10 +83,7 @@ false - - - - \ No newline at end of file + diff --git a/msvc/fxload_2010.vcxproj.filters b/msvc/fxload_2010.vcxproj.filters deleted file mode 100644 index c274b23..0000000 --- a/msvc/fxload_2010.vcxproj.filters +++ /dev/null @@ -1,25 +0,0 @@ - - - - - {4FC737F1-C7A5-4376-A066-2A32D752A2FF} - cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx - - - {651ff73d-037b-4903-8dd3-56e9950be25c} - - - - - Source Files - - - Source Files - - - - - Header Files - - - \ No newline at end of file diff --git a/msvc/fxload_2012.vcxproj b/msvc/fxload_2012.vcxproj index af1a376..122ec24 100644 --- a/msvc/fxload_2012.vcxproj +++ b/msvc/fxload_2012.vcxproj @@ -25,137 +25,55 @@ Win32Proj - - Application - Unicode - true - v110 - - - Application - Unicode - v110 - - - Application - Unicode - true - v110 - - + Application Unicode v110 + true - - - - - - - - - - + <_ProjectFileVersion>10.0.30319.1 - $(SolutionDir)..\$(Platform)\$(Configuration)\examples\ - $(SolutionDir)..\$(Platform)\$(Configuration)\examples\$(ProjectName)\ - $(SolutionDir)..\$(Platform)\$(Configuration)\examples\ - $(SolutionDir)..\$(Platform)\$(Configuration)\examples\$(ProjectName)\ - $(SolutionDir)..\$(Platform)\$(Configuration)\examples\ - $(SolutionDir)..\$(Platform)\$(Configuration)\examples\$(ProjectName)\ - $(SolutionDir)..\$(Platform)\$(Configuration)\examples\ - $(SolutionDir)..\$(Platform)\$(Configuration)\examples\$(ProjectName)\ + $(SolutionDir)..\$(Platform)\$(Configuration)\examples\$(ProjectName)\ + $(SolutionDir)..\$(Platform)\$(Configuration)\examples\ - - - $(IntDir)$(ProjectName).htm - + - Disabled .;..\examples\getopt;..\libusb;%(AdditionalIncludeDirectories) - WIN32;__GNU_LIBRARY__;_DEBUG;_CONSOLE;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) - true - MultiThreadedDebug + __GNU_LIBRARY__;_CONSOLE;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) Level3 + + ProgramDatabase - - - %(AdditionalLibraryDirectories) - true - Console - MachineX86 - - - - - $(IntDir)$(ProjectName).htm - - - X64 - - - Disabled - .;..\examples\getopt;..\libusb;%(AdditionalIncludeDirectories) - WIN32;__GNU_LIBRARY__;_DEBUG;_CONSOLE;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) true + Disabled MultiThreadedDebug - Level3 - ProgramDatabase + + + NDEBUG;%(PreprocessorDefinitions) + MultiThreaded - %(AdditionalLibraryDirectories) + $(TargetDir)$(ProjectName).pdb + Console + + true - Console - MachineX64 - - - - - $(IntDir)$(ProjectName).htm - - - .;..\examples\getopt;..\libusb;%(AdditionalIncludeDirectories) - WIN32;__GNU_LIBRARY__;NDEBUG;_CONSOLE;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) - MultiThreaded - Level3 - - - %(AdditionalLibraryDirectories) - Console - MachineX86 - - - - - $(IntDir)$(ProjectName).htm - - - X64 - - - .;..\examples\getopt;..\libusb;%(AdditionalIncludeDirectories) - WIN32;__GNU_LIBRARY__;NDEBUG;_CONSOLE;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) - MultiThreaded - Level3 - - - %(AdditionalLibraryDirectories) - Console - MachineX64 + + + {ae83e1b4-ce06-47ee-b7a3-c3a1d7c2d71e} @@ -166,10 +84,7 @@ false - - - - \ No newline at end of file + diff --git a/msvc/fxload_2012.vcxproj.filters b/msvc/fxload_2012.vcxproj.filters deleted file mode 100644 index c274b23..0000000 --- a/msvc/fxload_2012.vcxproj.filters +++ /dev/null @@ -1,25 +0,0 @@ - - - - - {4FC737F1-C7A5-4376-A066-2A32D752A2FF} - cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx - - - {651ff73d-037b-4903-8dd3-56e9950be25c} - - - - - Source Files - - - Source Files - - - - - Header Files - - - \ No newline at end of file diff --git a/msvc/fxload_2013.vcxproj b/msvc/fxload_2013.vcxproj index 8268d30..5b5d223 100644 --- a/msvc/fxload_2013.vcxproj +++ b/msvc/fxload_2013.vcxproj @@ -25,137 +25,55 @@ Win32Proj - - Application - Unicode - true - v120 - - - Application - Unicode - v120 - - - Application - Unicode - true - v120 - - + Application Unicode v120 + true - - - - - - - - - - + <_ProjectFileVersion>10.0.30319.1 - $(SolutionDir)..\$(Platform)\$(Configuration)\examples\ - $(SolutionDir)..\$(Platform)\$(Configuration)\examples\$(ProjectName)\ - $(SolutionDir)..\$(Platform)\$(Configuration)\examples\ - $(SolutionDir)..\$(Platform)\$(Configuration)\examples\$(ProjectName)\ - $(SolutionDir)..\$(Platform)\$(Configuration)\examples\ - $(SolutionDir)..\$(Platform)\$(Configuration)\examples\$(ProjectName)\ - $(SolutionDir)..\$(Platform)\$(Configuration)\examples\ - $(SolutionDir)..\$(Platform)\$(Configuration)\examples\$(ProjectName)\ + $(SolutionDir)..\$(Platform)\$(Configuration)\examples\$(ProjectName)\ + $(SolutionDir)..\$(Platform)\$(Configuration)\examples\ - - - $(IntDir)$(ProjectName).htm - + - Disabled .;..\examples\getopt;..\libusb;%(AdditionalIncludeDirectories) - WIN32;__GNU_LIBRARY__;_DEBUG;_CONSOLE;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) - true - MultiThreadedDebug + __GNU_LIBRARY__;_CONSOLE;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) Level3 + + ProgramDatabase - - - %(AdditionalLibraryDirectories) - true - Console - MachineX86 - - - - - $(IntDir)$(ProjectName).htm - - - X64 - - - Disabled - .;..\examples\getopt;..\libusb;%(AdditionalIncludeDirectories) - WIN32;__GNU_LIBRARY__;_DEBUG;_CONSOLE;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) true + Disabled MultiThreadedDebug - Level3 - ProgramDatabase + + + NDEBUG;%(PreprocessorDefinitions) + MultiThreaded - %(AdditionalLibraryDirectories) + $(TargetDir)$(ProjectName).pdb + Console + + true - Console - MachineX64 - - - - - $(IntDir)$(ProjectName).htm - - - .;..\examples\getopt;..\libusb;%(AdditionalIncludeDirectories) - WIN32;__GNU_LIBRARY__;NDEBUG;_CONSOLE;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) - MultiThreaded - Level3 - - - %(AdditionalLibraryDirectories) - Console - MachineX86 - - - - - $(IntDir)$(ProjectName).htm - - - X64 - - - .;..\examples\getopt;..\libusb;%(AdditionalIncludeDirectories) - WIN32;__GNU_LIBRARY__;NDEBUG;_CONSOLE;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) - MultiThreaded - Level3 - - - %(AdditionalLibraryDirectories) - Console - MachineX64 + + + {ae83e1b4-ce06-47ee-b7a3-c3a1d7c2d71e} @@ -166,10 +84,7 @@ false - - - - \ No newline at end of file + diff --git a/msvc/fxload_2015.vcxproj b/msvc/fxload_2015.vcxproj index 44f7e1c..0447c2a 100644 --- a/msvc/fxload_2015.vcxproj +++ b/msvc/fxload_2015.vcxproj @@ -25,137 +25,55 @@ Win32Proj - - Application - Unicode - true - v140 - - - Application - Unicode - v140 - - - Application - Unicode - true - v140 - - + Application Unicode v140 + true - - - - - - - - - - + <_ProjectFileVersion>10.0.30319.1 - $(SolutionDir)..\$(Platform)\$(Configuration)\examples\ - $(SolutionDir)..\$(Platform)\$(Configuration)\examples\$(ProjectName)\ - $(SolutionDir)..\$(Platform)\$(Configuration)\examples\ - $(SolutionDir)..\$(Platform)\$(Configuration)\examples\$(ProjectName)\ - $(SolutionDir)..\$(Platform)\$(Configuration)\examples\ - $(SolutionDir)..\$(Platform)\$(Configuration)\examples\$(ProjectName)\ - $(SolutionDir)..\$(Platform)\$(Configuration)\examples\ - $(SolutionDir)..\$(Platform)\$(Configuration)\examples\$(ProjectName)\ + $(SolutionDir)..\$(Platform)\$(Configuration)\examples\$(ProjectName)\ + $(SolutionDir)..\$(Platform)\$(Configuration)\examples\ - - - $(IntDir)$(ProjectName).htm - + - Disabled .;..\examples\getopt;..\libusb;%(AdditionalIncludeDirectories) - WIN32;__GNU_LIBRARY__;_DEBUG;_CONSOLE;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) - true - MultiThreadedDebug + __GNU_LIBRARY__;_CONSOLE;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) Level3 + + ProgramDatabase - - - %(AdditionalLibraryDirectories) - true - Console - MachineX86 - - - - - $(IntDir)$(ProjectName).htm - - - X64 - - - Disabled - .;..\examples\getopt;..\libusb;%(AdditionalIncludeDirectories) - WIN32;__GNU_LIBRARY__;_DEBUG;_CONSOLE;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) true + Disabled MultiThreadedDebug - Level3 - ProgramDatabase + + + NDEBUG;%(PreprocessorDefinitions) + MultiThreaded - %(AdditionalLibraryDirectories) + $(TargetDir)$(ProjectName).pdb + Console + + true - Console - MachineX64 - - - - - $(IntDir)$(ProjectName).htm - - - .;..\examples\getopt;..\libusb;%(AdditionalIncludeDirectories) - WIN32;__GNU_LIBRARY__;NDEBUG;_CONSOLE;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) - MultiThreaded - Level3 - - - %(AdditionalLibraryDirectories) - Console - MachineX86 - - - - - $(IntDir)$(ProjectName).htm - - - X64 - - - .;..\examples\getopt;..\libusb;%(AdditionalIncludeDirectories) - WIN32;__GNU_LIBRARY__;NDEBUG;_CONSOLE;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) - MultiThreaded - Level3 - - - %(AdditionalLibraryDirectories) - Console - MachineX64 + + + {ae83e1b4-ce06-47ee-b7a3-c3a1d7c2d71e} @@ -166,10 +84,7 @@ false - - - - \ No newline at end of file + diff --git a/msvc/fxload_2017.vcxproj b/msvc/fxload_2017.vcxproj index c2065d3..a3f4d8d 100644 --- a/msvc/fxload_2017.vcxproj +++ b/msvc/fxload_2017.vcxproj @@ -25,137 +25,55 @@ Win32Proj - - Application - Unicode - true - v141 - - - Application - Unicode - v141 - - - Application - Unicode - true - v141 - - + Application Unicode v141 + true - - - - - - - - - - + <_ProjectFileVersion>10.0.30319.1 - $(SolutionDir)..\$(Platform)\$(Configuration)\examples\ - $(SolutionDir)..\$(Platform)\$(Configuration)\examples\$(ProjectName)\ - $(SolutionDir)..\$(Platform)\$(Configuration)\examples\ - $(SolutionDir)..\$(Platform)\$(Configuration)\examples\$(ProjectName)\ - $(SolutionDir)..\$(Platform)\$(Configuration)\examples\ - $(SolutionDir)..\$(Platform)\$(Configuration)\examples\$(ProjectName)\ - $(SolutionDir)..\$(Platform)\$(Configuration)\examples\ - $(SolutionDir)..\$(Platform)\$(Configuration)\examples\$(ProjectName)\ + $(SolutionDir)..\$(Platform)\$(Configuration)\examples\$(ProjectName)\ + $(SolutionDir)..\$(Platform)\$(Configuration)\examples\ - - - $(IntDir)$(ProjectName).htm - + - Disabled .;..\examples\getopt;..\libusb;%(AdditionalIncludeDirectories) - WIN32;__GNU_LIBRARY__;_DEBUG;_CONSOLE;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) - true - MultiThreadedDebug + __GNU_LIBRARY__;_CONSOLE;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) Level3 + + ProgramDatabase - - - %(AdditionalLibraryDirectories) - true - Console - MachineX86 - - - - - $(IntDir)$(ProjectName).htm - - - X64 - - - Disabled - .;..\examples\getopt;..\libusb;%(AdditionalIncludeDirectories) - WIN32;__GNU_LIBRARY__;_DEBUG;_CONSOLE;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) true + Disabled MultiThreadedDebug - Level3 - ProgramDatabase + + + NDEBUG;%(PreprocessorDefinitions) + MultiThreaded - %(AdditionalLibraryDirectories) + $(TargetDir)$(ProjectName).pdb + Console + + true - Console - MachineX64 - - - - - $(IntDir)$(ProjectName).htm - - - .;..\examples\getopt;..\libusb;%(AdditionalIncludeDirectories) - WIN32;__GNU_LIBRARY__;NDEBUG;_CONSOLE;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) - MultiThreaded - Level3 - - - %(AdditionalLibraryDirectories) - Console - MachineX86 - - - - - $(IntDir)$(ProjectName).htm - - - X64 - - - .;..\examples\getopt;..\libusb;%(AdditionalIncludeDirectories) - WIN32;__GNU_LIBRARY__;NDEBUG;_CONSOLE;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) - MultiThreaded - Level3 - - - %(AdditionalLibraryDirectories) - Console - MachineX64 + + + {ae83e1b4-ce06-47ee-b7a3-c3a1d7c2d71e} @@ -166,9 +84,6 @@ false - - - diff --git a/msvc/fxload_sources b/msvc/fxload_sources index d6e31d6..9f5dbd9 100644 --- a/msvc/fxload_sources +++ b/msvc/fxload_sources @@ -2,7 +2,7 @@ TARGETNAME=fxload TARGETTYPE=PROGRAM 386_STDCALL=0 -_NT_TARGET_VERSION= $(_NT_TARGET_VERSION_WINXP) +_NT_TARGET_VERSION=$(_NT_TARGET_VERSION_WINXP) !IFNDEF MSC_WARNING_LEVEL MSC_WARNING_LEVEL=/W3 diff --git a/msvc/getopt_2010.vcxproj b/msvc/getopt_2010.vcxproj index e1f0040..6e2a33a 100644 --- a/msvc/getopt_2010.vcxproj +++ b/msvc/getopt_2010.vcxproj @@ -19,108 +19,44 @@ + getopt {AE83E1B4-CE06-47EE-B7A3-C3A1D7C2D71E} getopt - - StaticLibrary - Unicode - true - - - StaticLibrary - Unicode - - - StaticLibrary - Unicode - true - - + StaticLibrary Unicode + true - - - - - - - - - - + <_ProjectFileVersion>10.0.30319.1 - $(SolutionDir)..\$(Platform)\$(Configuration)\lib\ - $(SolutionDir)..\$(Platform)\$(Configuration)\lib\getopt\ - $(SolutionDir)..\$(Platform)\$(Configuration)\lib\ - $(SolutionDir)..\$(Platform)\$(Configuration)\lib\getopt\ - $(SolutionDir)..\$(Platform)\$(Configuration)\lib\ - $(SolutionDir)..\$(Platform)\$(Configuration)\lib\getopt\ - $(SolutionDir)..\$(Platform)\$(Configuration)\lib\ - $(SolutionDir)..\$(Platform)\$(Configuration)\lib\getopt\ - getopt - getopt - getopt - getopt + $(SolutionDir)..\$(Platform)\$(Configuration)\lib\$(ProjectName)\ + $(SolutionDir)..\$(Platform)\$(Configuration)\lib\ - + - HAVE_STRING_H;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) - MultiThreadedDebug + .;%(AdditionalIncludeDirectories) + HAVE_STRING_H;_LIB;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) Level3 + + ProgramDatabase - - - $(OutDir)getopt.lib - - - - - X64 - - - HAVE_STRING_H;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) + Disabled MultiThreadedDebug - Level3 - ProgramDatabase - - $(OutDir)getopt.lib - - - - + MaxSpeed - HAVE_STRING_H;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) + NDEBUG;%(PreprocessorDefinitions) MultiThreaded - Level3 - - $(OutDir)getopt.lib - - - - - X64 - - - MaxSpeed - HAVE_STRING_H;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) - MultiThreaded - Level3 - - - $(OutDir)getopt.lib - @@ -132,4 +68,4 @@ - \ No newline at end of file + diff --git a/msvc/getopt_2010.vcxproj.filters b/msvc/getopt_2010.vcxproj.filters deleted file mode 100644 index d5f4518..0000000 --- a/msvc/getopt_2010.vcxproj.filters +++ /dev/null @@ -1,26 +0,0 @@ - - - - - {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 - - - - - Source Files - - - Source Files - - - - - Header Files - - - \ No newline at end of file diff --git a/msvc/getopt_2012.vcxproj b/msvc/getopt_2012.vcxproj index 3f3dff4..30508ea 100644 --- a/msvc/getopt_2012.vcxproj +++ b/msvc/getopt_2012.vcxproj @@ -19,113 +19,45 @@ + getopt {AE83E1B4-CE06-47EE-B7A3-C3A1D7C2D71E} getopt - getopt - - StaticLibrary - Unicode - true - v110 - - - StaticLibrary - Unicode - v110 - - - StaticLibrary - Unicode - true - v110 - - + StaticLibrary Unicode v110 + true - - - - - - - - - - + <_ProjectFileVersion>10.0.30319.1 - $(SolutionDir)..\$(Platform)\$(Configuration)\lib\ - $(SolutionDir)..\$(Platform)\$(Configuration)\lib\getopt\ - $(SolutionDir)..\$(Platform)\$(Configuration)\lib\ - $(SolutionDir)..\$(Platform)\$(Configuration)\lib\getopt\ - $(SolutionDir)..\$(Platform)\$(Configuration)\lib\ - $(SolutionDir)..\$(Platform)\$(Configuration)\lib\getopt\ - $(SolutionDir)..\$(Platform)\$(Configuration)\lib\ - $(SolutionDir)..\$(Platform)\$(Configuration)\lib\getopt\ - getopt - getopt - getopt - getopt + $(SolutionDir)..\$(Platform)\$(Configuration)\lib\$(ProjectName)\ + $(SolutionDir)..\$(Platform)\$(Configuration)\lib\ - + - HAVE_STRING_H;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) - MultiThreadedDebug + .;%(AdditionalIncludeDirectories) + HAVE_STRING_H;_LIB;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) Level3 + + ProgramDatabase - - - $(OutDir)getopt.lib - - - - - X64 - - - HAVE_STRING_H;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) + Disabled MultiThreadedDebug - Level3 - ProgramDatabase - - $(OutDir)getopt.lib - - - - + MaxSpeed - HAVE_STRING_H;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) + NDEBUG;%(PreprocessorDefinitions) MultiThreaded - Level3 - - $(OutDir)getopt.lib - - - - - X64 - - - MaxSpeed - HAVE_STRING_H;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) - MultiThreaded - Level3 - - - $(OutDir)getopt.lib - @@ -137,4 +69,4 @@ - \ No newline at end of file + diff --git a/msvc/getopt_2012.vcxproj.filters b/msvc/getopt_2012.vcxproj.filters deleted file mode 100644 index d5f4518..0000000 --- a/msvc/getopt_2012.vcxproj.filters +++ /dev/null @@ -1,26 +0,0 @@ - - - - - {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 - - - - - Source Files - - - Source Files - - - - - Header Files - - - \ No newline at end of file diff --git a/msvc/getopt_2013.vcxproj b/msvc/getopt_2013.vcxproj index c711354..7c18f65 100644 --- a/msvc/getopt_2013.vcxproj +++ b/msvc/getopt_2013.vcxproj @@ -19,113 +19,45 @@ + getopt {AE83E1B4-CE06-47EE-B7A3-C3A1D7C2D71E} getopt - getopt - - StaticLibrary - Unicode - true - v120 - - - StaticLibrary - Unicode - v120 - - - StaticLibrary - Unicode - true - v120 - - + StaticLibrary Unicode v120 + true - - - - - - - - - - + <_ProjectFileVersion>10.0.30319.1 - $(SolutionDir)..\$(Platform)\$(Configuration)\lib\ - $(SolutionDir)..\$(Platform)\$(Configuration)\lib\getopt\ - $(SolutionDir)..\$(Platform)\$(Configuration)\lib\ - $(SolutionDir)..\$(Platform)\$(Configuration)\lib\getopt\ - $(SolutionDir)..\$(Platform)\$(Configuration)\lib\ - $(SolutionDir)..\$(Platform)\$(Configuration)\lib\getopt\ - $(SolutionDir)..\$(Platform)\$(Configuration)\lib\ - $(SolutionDir)..\$(Platform)\$(Configuration)\lib\getopt\ - getopt - getopt - getopt - getopt + $(SolutionDir)..\$(Platform)\$(Configuration)\lib\$(ProjectName)\ + $(SolutionDir)..\$(Platform)\$(Configuration)\lib\ - + - HAVE_STRING_H;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) - MultiThreadedDebug + .;%(AdditionalIncludeDirectories) + HAVE_STRING_H;_LIB;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) Level3 + + ProgramDatabase - - - $(OutDir)getopt.lib - - - - - X64 - - - HAVE_STRING_H;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) + Disabled MultiThreadedDebug - Level3 - ProgramDatabase - - $(OutDir)getopt.lib - - - - + MaxSpeed - HAVE_STRING_H;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) + NDEBUG;%(PreprocessorDefinitions) MultiThreaded - Level3 - - $(OutDir)getopt.lib - - - - - X64 - - - MaxSpeed - HAVE_STRING_H;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) - MultiThreaded - Level3 - - - $(OutDir)getopt.lib - @@ -137,4 +69,4 @@ - \ No newline at end of file + diff --git a/msvc/getopt_2015.vcxproj b/msvc/getopt_2015.vcxproj index 771799a..381ffa4 100644 --- a/msvc/getopt_2015.vcxproj +++ b/msvc/getopt_2015.vcxproj @@ -19,113 +19,45 @@ + getopt {AE83E1B4-CE06-47EE-B7A3-C3A1D7C2D71E} getopt - getopt - - StaticLibrary - Unicode - true - v140 - - - StaticLibrary - Unicode - v140 - - - StaticLibrary - Unicode - true - v140 - - + StaticLibrary Unicode v140 + true - - - - - - - - - - + <_ProjectFileVersion>10.0.30319.1 - $(SolutionDir)..\$(Platform)\$(Configuration)\lib\ - $(SolutionDir)..\$(Platform)\$(Configuration)\lib\getopt\ - $(SolutionDir)..\$(Platform)\$(Configuration)\lib\ - $(SolutionDir)..\$(Platform)\$(Configuration)\lib\getopt\ - $(SolutionDir)..\$(Platform)\$(Configuration)\lib\ - $(SolutionDir)..\$(Platform)\$(Configuration)\lib\getopt\ - $(SolutionDir)..\$(Platform)\$(Configuration)\lib\ - $(SolutionDir)..\$(Platform)\$(Configuration)\lib\getopt\ - getopt - getopt - getopt - getopt + $(SolutionDir)..\$(Platform)\$(Configuration)\lib\$(ProjectName)\ + $(SolutionDir)..\$(Platform)\$(Configuration)\lib\ - + - HAVE_STRING_H;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) - MultiThreadedDebug + .;%(AdditionalIncludeDirectories) + HAVE_STRING_H;_LIB;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) Level3 + + ProgramDatabase - - - $(OutDir)getopt.lib - - - - - X64 - - - HAVE_STRING_H;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) + Disabled MultiThreadedDebug - Level3 - ProgramDatabase - - $(OutDir)getopt.lib - - - - + MaxSpeed - HAVE_STRING_H;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) + NDEBUG;%(PreprocessorDefinitions) MultiThreaded - Level3 - - $(OutDir)getopt.lib - - - - - X64 - - - MaxSpeed - HAVE_STRING_H;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) - MultiThreaded - Level3 - - - $(OutDir)getopt.lib - @@ -137,4 +69,4 @@ - \ No newline at end of file + diff --git a/msvc/getopt_2017.vcxproj b/msvc/getopt_2017.vcxproj index 4447e74..9049243 100644 --- a/msvc/getopt_2017.vcxproj +++ b/msvc/getopt_2017.vcxproj @@ -19,113 +19,45 @@ + getopt {AE83E1B4-CE06-47EE-B7A3-C3A1D7C2D71E} getopt - getopt - - StaticLibrary - Unicode - true - v141 - - - StaticLibrary - Unicode - v141 - - - StaticLibrary - Unicode - true - v141 - - + StaticLibrary Unicode v141 + true - - - - - - - - - - + <_ProjectFileVersion>10.0.30319.1 - $(SolutionDir)..\$(Platform)\$(Configuration)\lib\ - $(SolutionDir)..\$(Platform)\$(Configuration)\lib\getopt\ - $(SolutionDir)..\$(Platform)\$(Configuration)\lib\ - $(SolutionDir)..\$(Platform)\$(Configuration)\lib\getopt\ - $(SolutionDir)..\$(Platform)\$(Configuration)\lib\ - $(SolutionDir)..\$(Platform)\$(Configuration)\lib\getopt\ - $(SolutionDir)..\$(Platform)\$(Configuration)\lib\ - $(SolutionDir)..\$(Platform)\$(Configuration)\lib\getopt\ - getopt - getopt - getopt - getopt + $(SolutionDir)..\$(Platform)\$(Configuration)\lib\$(ProjectName)\ + $(SolutionDir)..\$(Platform)\$(Configuration)\lib\ - + - HAVE_STRING_H;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) - MultiThreadedDebug + .;%(AdditionalIncludeDirectories) + HAVE_STRING_H;_LIB;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) Level3 + + ProgramDatabase - - - $(OutDir)getopt.lib - - - - - X64 - - - HAVE_STRING_H;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) + Disabled MultiThreadedDebug - Level3 - ProgramDatabase - - $(OutDir)getopt.lib - - - - + MaxSpeed - HAVE_STRING_H;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) + NDEBUG;%(PreprocessorDefinitions) MultiThreaded - Level3 - - $(OutDir)getopt.lib - - - - - X64 - - - MaxSpeed - HAVE_STRING_H;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) - MultiThreaded - Level3 - - - $(OutDir)getopt.lib - @@ -137,4 +69,4 @@ - \ No newline at end of file + diff --git a/msvc/getopt_sources b/msvc/getopt_sources index b9adc1b..3f96899 100644 --- a/msvc/getopt_sources +++ b/msvc/getopt_sources @@ -2,16 +2,20 @@ TARGETTYPE=LIBRARY TARGETNAME=getopt 386_STDCALL=0 -_NT_TARGET_VERSION= $(_NT_TARGET_VERSION_WINXP) +_NT_TARGET_VERSION=$(_NT_TARGET_VERSION_WINXP) !IFNDEF MSC_WARNING_LEVEL MSC_WARNING_LEVEL=/W3 !ENDIF +!IFDEF STATIC_LIBC +USE_LIBCMT=1 +!ELSE USE_MSVCRT=1 +!ENDIF INCLUDES=$(DDK_INC_PATH) -C_DEFINES = $(C_DEFINES) /DDDKBUILD /DHAVE_STRING_H +C_DEFINES=$(C_DEFINES) /DDDKBUILD /DHAVE_STRING_H TARGETLIBS=$(SDK_LIB_PATH)\kernel32.lib \ $(SDK_LIB_PATH)\user32.lib diff --git a/msvc/hotplugtest_2010.vcxproj b/msvc/hotplugtest_2010.vcxproj index 90584ed..35a42bc 100644 --- a/msvc/hotplugtest_2010.vcxproj +++ b/msvc/hotplugtest_2010.vcxproj @@ -25,127 +25,45 @@ Win32Proj - - Application - Unicode - true - - - Application - Unicode - - - Application - Unicode - true - - + Application Unicode + true - - - - - - - - - - + <_ProjectFileVersion>10.0.30319.1 - $(SolutionDir)..\$(Platform)\$(Configuration)\examples\ - $(SolutionDir)..\$(Platform)\$(Configuration)\examples\$(ProjectName)\ - $(SolutionDir)..\$(Platform)\$(Configuration)\examples\ - $(SolutionDir)..\$(Platform)\$(Configuration)\examples\$(ProjectName)\ - $(SolutionDir)..\$(Platform)\$(Configuration)\examples\ - $(SolutionDir)..\$(Platform)\$(Configuration)\examples\$(ProjectName)\ - $(SolutionDir)..\$(Platform)\$(Configuration)\examples\ - $(SolutionDir)..\$(Platform)\$(Configuration)\examples\$(ProjectName)\ + $(SolutionDir)..\$(Platform)\$(Configuration)\examples\$(ProjectName)\ + $(SolutionDir)..\$(Platform)\$(Configuration)\examples\ - - - $(IntDir)$(ProjectName).htm - + - Disabled - .;..\libusb;%(AdditionalIncludeDirectories) - WIN32;_DEBUG;_CONSOLE;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) - true - MultiThreadedDebug + ..\libusb;%(AdditionalIncludeDirectories) + _CONSOLE;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) Level3 + + ProgramDatabase - - - %(AdditionalLibraryDirectories) - true - Console - MachineX86 - - - - - $(IntDir)$(ProjectName).htm - - - X64 - - - Disabled - .;..\libusb;%(AdditionalIncludeDirectories) - WIN32;_DEBUG;_CONSOLE;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) true + Disabled MultiThreadedDebug - Level3 - ProgramDatabase + + + NDEBUG;%(PreprocessorDefinitions) + MultiThreaded - %(AdditionalLibraryDirectories) + $(TargetDir)$(ProjectName).pdb + Console + + true - Console - MachineX64 - - - - - $(IntDir)$(ProjectName).htm - - - .;..\libusb;%(AdditionalIncludeDirectories) - WIN32;NDEBUG;_CONSOLE;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) - MultiThreaded - Level3 - - - %(AdditionalLibraryDirectories) - Console - MachineX86 - - - - - $(IntDir)$(ProjectName).htm - - - X64 - - - .;..\libusb;%(AdditionalIncludeDirectories) - WIN32;NDEBUG;_CONSOLE;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) - MultiThreaded - Level3 - - - %(AdditionalLibraryDirectories) - Console - MachineX64 @@ -160,4 +78,4 @@ - \ No newline at end of file + diff --git a/msvc/hotplugtest_2010.vcxproj.filters b/msvc/hotplugtest_2010.vcxproj.filters deleted file mode 100644 index 1c9a880..0000000 --- a/msvc/hotplugtest_2010.vcxproj.filters +++ /dev/null @@ -1,14 +0,0 @@ - - - - - {4FC737F1-C7A5-4376-A066-2A32D752A2FF} - cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx - - - - - Source Files - - - \ No newline at end of file diff --git a/msvc/hotplugtest_2012.vcxproj b/msvc/hotplugtest_2012.vcxproj index 9045585..4bd0643 100644 --- a/msvc/hotplugtest_2012.vcxproj +++ b/msvc/hotplugtest_2012.vcxproj @@ -25,131 +25,46 @@ Win32Proj - - Application - Unicode - true - v110 - - - Application - Unicode - v110 - - - Application - Unicode - true - v110 - - + Application Unicode v110 + true - - - - - - - - - - + <_ProjectFileVersion>10.0.30319.1 - $(SolutionDir)..\$(Platform)\$(Configuration)\examples\ - $(SolutionDir)..\$(Platform)\$(Configuration)\examples\$(ProjectName)\ - $(SolutionDir)..\$(Platform)\$(Configuration)\examples\ - $(SolutionDir)..\$(Platform)\$(Configuration)\examples\$(ProjectName)\ - $(SolutionDir)..\$(Platform)\$(Configuration)\examples\ - $(SolutionDir)..\$(Platform)\$(Configuration)\examples\$(ProjectName)\ - $(SolutionDir)..\$(Platform)\$(Configuration)\examples\ - $(SolutionDir)..\$(Platform)\$(Configuration)\examples\$(ProjectName)\ + $(SolutionDir)..\$(Platform)\$(Configuration)\examples\$(ProjectName)\ + $(SolutionDir)..\$(Platform)\$(Configuration)\examples\ - - - $(IntDir)$(ProjectName).htm - + - Disabled - .;..\libusb;%(AdditionalIncludeDirectories) - WIN32;_DEBUG;_CONSOLE;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) - true - MultiThreadedDebug + ..\libusb;%(AdditionalIncludeDirectories) + _CONSOLE;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) Level3 + + ProgramDatabase - - - %(AdditionalLibraryDirectories) - true - Console - MachineX86 - - - - - $(IntDir)$(ProjectName).htm - - - X64 - - - Disabled - .;..\libusb;%(AdditionalIncludeDirectories) - WIN32;_DEBUG;_CONSOLE;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) true + Disabled MultiThreadedDebug - Level3 - ProgramDatabase + + + NDEBUG;%(PreprocessorDefinitions) + MultiThreaded - %(AdditionalLibraryDirectories) + $(TargetDir)$(ProjectName).pdb + Console + + true - Console - MachineX64 - - - - - $(IntDir)$(ProjectName).htm - - - .;..\libusb;%(AdditionalIncludeDirectories) - WIN32;NDEBUG;_CONSOLE;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) - MultiThreaded - Level3 - - - %(AdditionalLibraryDirectories) - Console - MachineX86 - - - - - $(IntDir)$(ProjectName).htm - - - X64 - - - .;..\libusb;%(AdditionalIncludeDirectories) - WIN32;NDEBUG;_CONSOLE;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) - MultiThreaded - Level3 - - - %(AdditionalLibraryDirectories) - Console - MachineX64 @@ -164,4 +79,4 @@ - \ No newline at end of file + diff --git a/msvc/hotplugtest_2012.vcxproj.filters b/msvc/hotplugtest_2012.vcxproj.filters deleted file mode 100644 index 1c9a880..0000000 --- a/msvc/hotplugtest_2012.vcxproj.filters +++ /dev/null @@ -1,14 +0,0 @@ - - - - - {4FC737F1-C7A5-4376-A066-2A32D752A2FF} - cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx - - - - - Source Files - - - \ No newline at end of file diff --git a/msvc/hotplugtest_2013.vcxproj b/msvc/hotplugtest_2013.vcxproj index 835b5f4..802b28f 100644 --- a/msvc/hotplugtest_2013.vcxproj +++ b/msvc/hotplugtest_2013.vcxproj @@ -25,131 +25,46 @@ Win32Proj - - Application - Unicode - true - v120 - - - Application - Unicode - v120 - - - Application - Unicode - true - v120 - - + Application Unicode v120 + true - - - - - - - - - - + <_ProjectFileVersion>10.0.30319.1 - $(SolutionDir)..\$(Platform)\$(Configuration)\examples\ - $(SolutionDir)..\$(Platform)\$(Configuration)\examples\$(ProjectName)\ - $(SolutionDir)..\$(Platform)\$(Configuration)\examples\ - $(SolutionDir)..\$(Platform)\$(Configuration)\examples\$(ProjectName)\ - $(SolutionDir)..\$(Platform)\$(Configuration)\examples\ - $(SolutionDir)..\$(Platform)\$(Configuration)\examples\$(ProjectName)\ - $(SolutionDir)..\$(Platform)\$(Configuration)\examples\ - $(SolutionDir)..\$(Platform)\$(Configuration)\examples\$(ProjectName)\ + $(SolutionDir)..\$(Platform)\$(Configuration)\examples\$(ProjectName)\ + $(SolutionDir)..\$(Platform)\$(Configuration)\examples\ - - - $(IntDir)$(ProjectName).htm - + - Disabled - .;..\libusb;%(AdditionalIncludeDirectories) - WIN32;_DEBUG;_CONSOLE;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) - true - MultiThreadedDebug + ..\libusb;%(AdditionalIncludeDirectories) + _CONSOLE;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) Level3 + + ProgramDatabase - - - %(AdditionalLibraryDirectories) - true - Console - MachineX86 - - - - - $(IntDir)$(ProjectName).htm - - - X64 - - - Disabled - .;..\libusb;%(AdditionalIncludeDirectories) - WIN32;_DEBUG;_CONSOLE;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) true + Disabled MultiThreadedDebug - Level3 - ProgramDatabase + + + NDEBUG;%(PreprocessorDefinitions) + MultiThreaded - %(AdditionalLibraryDirectories) + $(TargetDir)$(ProjectName).pdb + Console + + true - Console - MachineX64 - - - - - $(IntDir)$(ProjectName).htm - - - .;..\libusb;%(AdditionalIncludeDirectories) - WIN32;NDEBUG;_CONSOLE;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) - MultiThreaded - Level3 - - - %(AdditionalLibraryDirectories) - Console - MachineX86 - - - - - $(IntDir)$(ProjectName).htm - - - X64 - - - .;..\libusb;%(AdditionalIncludeDirectories) - WIN32;NDEBUG;_CONSOLE;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) - MultiThreaded - Level3 - - - %(AdditionalLibraryDirectories) - Console - MachineX64 @@ -164,4 +79,4 @@ - \ No newline at end of file + diff --git a/msvc/hotplugtest_2015.vcxproj b/msvc/hotplugtest_2015.vcxproj index 238d1f7..e80a981 100644 --- a/msvc/hotplugtest_2015.vcxproj +++ b/msvc/hotplugtest_2015.vcxproj @@ -25,131 +25,46 @@ Win32Proj - - Application - Unicode - true - v140 - - - Application - Unicode - v140 - - - Application - Unicode - true - v140 - - + Application Unicode v140 + true - - - - - - - - - - + <_ProjectFileVersion>10.0.30319.1 - $(SolutionDir)..\$(Platform)\$(Configuration)\examples\ - $(SolutionDir)..\$(Platform)\$(Configuration)\examples\$(ProjectName)\ - $(SolutionDir)..\$(Platform)\$(Configuration)\examples\ - $(SolutionDir)..\$(Platform)\$(Configuration)\examples\$(ProjectName)\ - $(SolutionDir)..\$(Platform)\$(Configuration)\examples\ - $(SolutionDir)..\$(Platform)\$(Configuration)\examples\$(ProjectName)\ - $(SolutionDir)..\$(Platform)\$(Configuration)\examples\ - $(SolutionDir)..\$(Platform)\$(Configuration)\examples\$(ProjectName)\ + $(SolutionDir)..\$(Platform)\$(Configuration)\examples\$(ProjectName)\ + $(SolutionDir)..\$(Platform)\$(Configuration)\examples\ - - - $(IntDir)$(ProjectName).htm - + - Disabled - .;..\libusb;%(AdditionalIncludeDirectories) - WIN32;_DEBUG;_CONSOLE;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) - true - MultiThreadedDebug + ..\libusb;%(AdditionalIncludeDirectories) + _CONSOLE;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) Level3 + + ProgramDatabase - - - %(AdditionalLibraryDirectories) - true - Console - MachineX86 - - - - - $(IntDir)$(ProjectName).htm - - - X64 - - - Disabled - .;..\libusb;%(AdditionalIncludeDirectories) - WIN32;_DEBUG;_CONSOLE;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) true + Disabled MultiThreadedDebug - Level3 - ProgramDatabase + + + NDEBUG;%(PreprocessorDefinitions) + MultiThreaded - %(AdditionalLibraryDirectories) + $(TargetDir)$(ProjectName).pdb + Console + + true - Console - MachineX64 - - - - - $(IntDir)$(ProjectName).htm - - - .;..\libusb;%(AdditionalIncludeDirectories) - WIN32;NDEBUG;_CONSOLE;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) - MultiThreaded - Level3 - - - %(AdditionalLibraryDirectories) - Console - MachineX86 - - - - - $(IntDir)$(ProjectName).htm - - - X64 - - - .;..\libusb;%(AdditionalIncludeDirectories) - WIN32;NDEBUG;_CONSOLE;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) - MultiThreaded - Level3 - - - %(AdditionalLibraryDirectories) - Console - MachineX64 @@ -164,4 +79,4 @@ - \ No newline at end of file + diff --git a/msvc/hotplugtest_2017.vcxproj b/msvc/hotplugtest_2017.vcxproj index 1945724..8e4df1e 100644 --- a/msvc/hotplugtest_2017.vcxproj +++ b/msvc/hotplugtest_2017.vcxproj @@ -25,131 +25,46 @@ Win32Proj - - Application - Unicode - true - v141 - - - Application - Unicode - v141 - - - Application - Unicode - true - v141 - - + Application Unicode v141 + true - - - - - - - - - - + <_ProjectFileVersion>10.0.30319.1 - $(SolutionDir)..\$(Platform)\$(Configuration)\examples\ - $(SolutionDir)..\$(Platform)\$(Configuration)\examples\$(ProjectName)\ - $(SolutionDir)..\$(Platform)\$(Configuration)\examples\ - $(SolutionDir)..\$(Platform)\$(Configuration)\examples\$(ProjectName)\ - $(SolutionDir)..\$(Platform)\$(Configuration)\examples\ - $(SolutionDir)..\$(Platform)\$(Configuration)\examples\$(ProjectName)\ - $(SolutionDir)..\$(Platform)\$(Configuration)\examples\ - $(SolutionDir)..\$(Platform)\$(Configuration)\examples\$(ProjectName)\ + $(SolutionDir)..\$(Platform)\$(Configuration)\examples\$(ProjectName)\ + $(SolutionDir)..\$(Platform)\$(Configuration)\examples\ - - - $(IntDir)$(ProjectName).htm - + - Disabled - .;..\libusb;%(AdditionalIncludeDirectories) - WIN32;_DEBUG;_CONSOLE;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) - true - MultiThreadedDebug + ..\libusb;%(AdditionalIncludeDirectories) + _CONSOLE;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) Level3 + + ProgramDatabase - - - %(AdditionalLibraryDirectories) - true - Console - MachineX86 - - - - - $(IntDir)$(ProjectName).htm - - - X64 - - - Disabled - .;..\libusb;%(AdditionalIncludeDirectories) - WIN32;_DEBUG;_CONSOLE;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) true + Disabled MultiThreadedDebug - Level3 - ProgramDatabase + + + NDEBUG;%(PreprocessorDefinitions) + MultiThreaded - %(AdditionalLibraryDirectories) + $(TargetDir)$(ProjectName).pdb + Console + + true - Console - MachineX64 - - - - - $(IntDir)$(ProjectName).htm - - - .;..\libusb;%(AdditionalIncludeDirectories) - WIN32;NDEBUG;_CONSOLE;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) - MultiThreaded - Level3 - - - %(AdditionalLibraryDirectories) - Console - MachineX86 - - - - - $(IntDir)$(ProjectName).htm - - - X64 - - - .;..\libusb;%(AdditionalIncludeDirectories) - WIN32;NDEBUG;_CONSOLE;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) - MultiThreaded - Level3 - - - %(AdditionalLibraryDirectories) - Console - MachineX64 diff --git a/msvc/hotplugtest_sources b/msvc/hotplugtest_sources index 1b27cad..0282d95 100644 --- a/msvc/hotplugtest_sources +++ b/msvc/hotplugtest_sources @@ -2,7 +2,7 @@ TARGETNAME=hotplugtest TARGETTYPE=PROGRAM 386_STDCALL=0 -_NT_TARGET_VERSION= $(_NT_TARGET_VERSION_WINXP) +_NT_TARGET_VERSION=$(_NT_TARGET_VERSION_WINXP) !IFNDEF MSC_WARNING_LEVEL MSC_WARNING_LEVEL=/W3 diff --git a/msvc/libusb_dll_2010.vcxproj b/msvc/libusb_dll_2010.vcxproj index 0663aa2..1655bc8 100644 --- a/msvc/libusb_dll_2010.vcxproj +++ b/msvc/libusb_dll_2010.vcxproj @@ -24,119 +24,43 @@ libusbdll - - DynamicLibrary - Unicode - true - - - DynamicLibrary - Unicode - - - DynamicLibrary - Unicode - true - - + DynamicLibrary Unicode + true - - - - - - - - - - + <_ProjectFileVersion>10.0.30319.1 - $(SolutionDir)..\$(Platform)\$(Configuration)\dll\ - $(SolutionDir)..\$(Platform)\$(Configuration)\dll\libusb-1.0\ - $(SolutionDir)..\$(Platform)\$(Configuration)\dll\ - $(SolutionDir)..\$(Platform)\$(Configuration)\dll\libusb-1.0\ - $(SolutionDir)..\$(Platform)\$(Configuration)\dll\ - $(SolutionDir)..\$(Platform)\$(Configuration)\dll\libusb-1.0\ - $(SolutionDir)..\$(Platform)\$(Configuration)\dll\ - $(SolutionDir)..\$(Platform)\$(Configuration)\dll\libusb-1.0\ - libusb-1.0 - libusb-1.0 - libusb-1.0 - libusb-1.0 + $(SolutionDir)..\$(Platform)\$(Configuration)\dll\$(TargetName)\ + $(SolutionDir)..\$(Platform)\$(Configuration)\dll\ + libusb-1.0 - + - Disabled .;..\libusb;%(AdditionalIncludeDirectories) - _WIN32;_DEBUG;_LIB;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) - MultiThreadedDebugDLL + WINVER=0x0501;_WIN32_WINNT=0x0501;_LIB;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) Level4 + + ProgramDatabase - - - $(OutDir)libusb-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;%(PreprocessorDefinitions) MultiThreadedDebugDLL - Level4 - ProgramDatabase - - $(OutDir)libusb-1.0.dll - ..\libusb\libusb-1.0.def - libusb-1.0.rc;%(EmbedManagedResourceFile) + + NDEBUG;%(PreprocessorDefinitions) + MultiThreadedDLL + + true - - - .;..\libusb;%(AdditionalIncludeDirectories) - _WIN32;_LIB;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) - MultiThreadedDLL - Level4 - - - $(OutDir)libusb-1.0.dll - ..\libusb\libusb-1.0.def - libusb-1.0.rc;%(EmbedManagedResourceFile) - - - - - X64 - - - .;..\libusb;%(AdditionalIncludeDirectories) - _WIN32;_WIN64;_LIB;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) - MultiThreadedDLL - Level4 - - - $(OutDir)libusb-1.0.dll - ..\libusb\libusb-1.0.def - libusb-1.0.rc;%(EmbedManagedResourceFile) - - @@ -174,4 +98,4 @@ - \ No newline at end of file + diff --git a/msvc/libusb_dll_2010.vcxproj.filters b/msvc/libusb_dll_2010.vcxproj.filters deleted file mode 100644 index ae65ec2..0000000 --- a/msvc/libusb_dll_2010.vcxproj.filters +++ /dev/null @@ -1,102 +0,0 @@ - - - - - {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 - - - {d81e81ca-b13e-4a15-b54b-b12b41361e6b} - - - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - - - Resource Files - - - - - Resource Files - - - \ No newline at end of file diff --git a/msvc/libusb_dll_2012.vcxproj b/msvc/libusb_dll_2012.vcxproj index 90a1a8b..f20b35b 100644 --- a/msvc/libusb_dll_2012.vcxproj +++ b/msvc/libusb_dll_2012.vcxproj @@ -24,123 +24,44 @@ libusbdll - - DynamicLibrary - Unicode - true - v110 - - - DynamicLibrary - Unicode - v110 - - - DynamicLibrary - Unicode - true - v110 - - + DynamicLibrary Unicode v110 + true - - - - - - - - - - + <_ProjectFileVersion>10.0.30319.1 - $(SolutionDir)..\$(Platform)\$(Configuration)\dll\ - $(SolutionDir)..\$(Platform)\$(Configuration)\dll\libusb-1.0\ - $(SolutionDir)..\$(Platform)\$(Configuration)\dll\ - $(SolutionDir)..\$(Platform)\$(Configuration)\dll\libusb-1.0\ - $(SolutionDir)..\$(Platform)\$(Configuration)\dll\ - $(SolutionDir)..\$(Platform)\$(Configuration)\dll\libusb-1.0\ - $(SolutionDir)..\$(Platform)\$(Configuration)\dll\ - $(SolutionDir)..\$(Platform)\$(Configuration)\dll\libusb-1.0\ - libusb-1.0 - libusb-1.0 - libusb-1.0 - libusb-1.0 + $(SolutionDir)..\$(Platform)\$(Configuration)\dll\$(TargetName)\ + $(SolutionDir)..\$(Platform)\$(Configuration)\dll\ + libusb-1.0 - + - Disabled .;..\libusb;%(AdditionalIncludeDirectories) - _WIN32;_DEBUG;_LIB;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) - MultiThreadedDebugDLL + WINVER=0x0501;_WIN32_WINNT=0x0501;_LIB;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) Level4 + + ProgramDatabase - - - $(OutDir)libusb-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;%(PreprocessorDefinitions) MultiThreadedDebugDLL - Level4 - ProgramDatabase - - $(OutDir)libusb-1.0.dll - ..\libusb\libusb-1.0.def - libusb-1.0.rc;%(EmbedManagedResourceFile) + + NDEBUG;%(PreprocessorDefinitions) + MultiThreadedDLL + + true - - - .;..\libusb;%(AdditionalIncludeDirectories) - _WIN32;_LIB;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) - MultiThreadedDLL - Level4 - - - $(OutDir)libusb-1.0.dll - ..\libusb\libusb-1.0.def - libusb-1.0.rc;%(EmbedManagedResourceFile) - - - - - X64 - - - .;..\libusb;%(AdditionalIncludeDirectories) - _WIN32;_WIN64;_LIB;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) - MultiThreadedDLL - Level4 - - - $(OutDir)libusb-1.0.dll - ..\libusb\libusb-1.0.def - libusb-1.0.rc;%(EmbedManagedResourceFile) - - @@ -178,4 +99,4 @@ - \ No newline at end of file + diff --git a/msvc/libusb_dll_2012.vcxproj.filters b/msvc/libusb_dll_2012.vcxproj.filters deleted file mode 100644 index ae65ec2..0000000 --- a/msvc/libusb_dll_2012.vcxproj.filters +++ /dev/null @@ -1,102 +0,0 @@ - - - - - {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 - - - {d81e81ca-b13e-4a15-b54b-b12b41361e6b} - - - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - - - Resource Files - - - - - Resource Files - - - \ No newline at end of file diff --git a/msvc/libusb_dll_2013.vcxproj b/msvc/libusb_dll_2013.vcxproj index f43a9c3..3c84bd9 100644 --- a/msvc/libusb_dll_2013.vcxproj +++ b/msvc/libusb_dll_2013.vcxproj @@ -24,123 +24,44 @@ libusbdll - - DynamicLibrary - Unicode - true - v120 - - - DynamicLibrary - Unicode - v120 - - - DynamicLibrary - Unicode - true - v120 - - + DynamicLibrary Unicode v120 + true - - - - - - - - - - + <_ProjectFileVersion>10.0.30319.1 - $(SolutionDir)..\$(Platform)\$(Configuration)\dll\ - $(SolutionDir)..\$(Platform)\$(Configuration)\dll\libusb-1.0\ - $(SolutionDir)..\$(Platform)\$(Configuration)\dll\ - $(SolutionDir)..\$(Platform)\$(Configuration)\dll\libusb-1.0\ - $(SolutionDir)..\$(Platform)\$(Configuration)\dll\ - $(SolutionDir)..\$(Platform)\$(Configuration)\dll\libusb-1.0\ - $(SolutionDir)..\$(Platform)\$(Configuration)\dll\ - $(SolutionDir)..\$(Platform)\$(Configuration)\dll\libusb-1.0\ - libusb-1.0 - libusb-1.0 - libusb-1.0 - libusb-1.0 + $(SolutionDir)..\$(Platform)\$(Configuration)\dll\$(TargetName)\ + $(SolutionDir)..\$(Platform)\$(Configuration)\dll\ + libusb-1.0 - + - Disabled .;..\libusb;%(AdditionalIncludeDirectories) - _WIN32;_DEBUG;_LIB;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) - MultiThreadedDebugDLL + WINVER=0x0501;_WIN32_WINNT=0x0501;_LIB;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) Level4 + + ProgramDatabase - - - $(OutDir)libusb-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;%(PreprocessorDefinitions) MultiThreadedDebugDLL - Level4 - ProgramDatabase - - $(OutDir)libusb-1.0.dll - ..\libusb\libusb-1.0.def - libusb-1.0.rc;%(EmbedManagedResourceFile) + + NDEBUG;%(PreprocessorDefinitions) + MultiThreadedDLL + + true - - - .;..\libusb;%(AdditionalIncludeDirectories) - _WIN32;_LIB;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) - MultiThreadedDLL - Level4 - - - $(OutDir)libusb-1.0.dll - ..\libusb\libusb-1.0.def - libusb-1.0.rc;%(EmbedManagedResourceFile) - - - - - X64 - - - .;..\libusb;%(AdditionalIncludeDirectories) - _WIN32;_WIN64;_LIB;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) - MultiThreadedDLL - Level4 - - - $(OutDir)libusb-1.0.dll - ..\libusb\libusb-1.0.def - libusb-1.0.rc;%(EmbedManagedResourceFile) - - @@ -178,4 +99,4 @@ - \ No newline at end of file + diff --git a/msvc/libusb_dll_2015.vcxproj b/msvc/libusb_dll_2015.vcxproj index f0744f6..611b09b 100644 --- a/msvc/libusb_dll_2015.vcxproj +++ b/msvc/libusb_dll_2015.vcxproj @@ -24,123 +24,44 @@ libusbdll - - DynamicLibrary - Unicode - true - v140 - - - DynamicLibrary - Unicode - v140 - - - DynamicLibrary - Unicode - true - v140 - - + DynamicLibrary Unicode v140 + true - - - - - - - - - - + <_ProjectFileVersion>10.0.30319.1 - $(SolutionDir)..\$(Platform)\$(Configuration)\dll\ - $(SolutionDir)..\$(Platform)\$(Configuration)\dll\libusb-1.0\ - $(SolutionDir)..\$(Platform)\$(Configuration)\dll\ - $(SolutionDir)..\$(Platform)\$(Configuration)\dll\libusb-1.0\ - $(SolutionDir)..\$(Platform)\$(Configuration)\dll\ - $(SolutionDir)..\$(Platform)\$(Configuration)\dll\libusb-1.0\ - $(SolutionDir)..\$(Platform)\$(Configuration)\dll\ - $(SolutionDir)..\$(Platform)\$(Configuration)\dll\libusb-1.0\ - libusb-1.0 - libusb-1.0 - libusb-1.0 - libusb-1.0 + $(SolutionDir)..\$(Platform)\$(Configuration)\dll\$(TargetName)\ + $(SolutionDir)..\$(Platform)\$(Configuration)\dll\ + libusb-1.0 - + - Disabled .;..\libusb;%(AdditionalIncludeDirectories) - _WIN32;_DEBUG;_LIB;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) - MultiThreadedDebugDLL + WINVER=0x0501;_WIN32_WINNT=0x0501;_LIB;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) Level4 + + ProgramDatabase - - - $(OutDir)libusb-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;%(PreprocessorDefinitions) MultiThreadedDebugDLL - Level4 - ProgramDatabase - - $(OutDir)libusb-1.0.dll - ..\libusb\libusb-1.0.def - libusb-1.0.rc;%(EmbedManagedResourceFile) + + NDEBUG;%(PreprocessorDefinitions) + MultiThreadedDLL + + true - - - .;..\libusb;%(AdditionalIncludeDirectories) - _WIN32;_LIB;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) - MultiThreadedDLL - Level4 - - - $(OutDir)libusb-1.0.dll - ..\libusb\libusb-1.0.def - libusb-1.0.rc;%(EmbedManagedResourceFile) - - - - - X64 - - - .;..\libusb;%(AdditionalIncludeDirectories) - _WIN32;_WIN64;_LIB;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) - MultiThreadedDLL - Level4 - - - $(OutDir)libusb-1.0.dll - ..\libusb\libusb-1.0.def - libusb-1.0.rc;%(EmbedManagedResourceFile) - - @@ -178,4 +99,4 @@ - \ No newline at end of file + diff --git a/msvc/libusb_dll_2017.vcxproj b/msvc/libusb_dll_2017.vcxproj index 723c6b3..bcc9a55 100644 --- a/msvc/libusb_dll_2017.vcxproj +++ b/msvc/libusb_dll_2017.vcxproj @@ -24,123 +24,44 @@ libusbdll - - DynamicLibrary - Unicode - true - v141 - - - DynamicLibrary - Unicode - v141 - - - DynamicLibrary - Unicode - true - v141 - - + DynamicLibrary Unicode v141 + true - - - - - - - - - - + <_ProjectFileVersion>10.0.30319.1 - $(SolutionDir)..\$(Platform)\$(Configuration)\dll\ - $(SolutionDir)..\$(Platform)\$(Configuration)\dll\libusb-1.0\ - $(SolutionDir)..\$(Platform)\$(Configuration)\dll\ - $(SolutionDir)..\$(Platform)\$(Configuration)\dll\libusb-1.0\ - $(SolutionDir)..\$(Platform)\$(Configuration)\dll\ - $(SolutionDir)..\$(Platform)\$(Configuration)\dll\libusb-1.0\ - $(SolutionDir)..\$(Platform)\$(Configuration)\dll\ - $(SolutionDir)..\$(Platform)\$(Configuration)\dll\libusb-1.0\ - libusb-1.0 - libusb-1.0 - libusb-1.0 - libusb-1.0 + $(SolutionDir)..\$(Platform)\$(Configuration)\dll\$(TargetName)\ + $(SolutionDir)..\$(Platform)\$(Configuration)\dll\ + libusb-1.0 - + - Disabled .;..\libusb;%(AdditionalIncludeDirectories) - _WIN32;_DEBUG;_LIB;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) - MultiThreadedDebugDLL + WINVER=0x0501;_WIN32_WINNT=0x0501;_LIB;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) Level4 + + ProgramDatabase - - - $(OutDir)libusb-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;%(PreprocessorDefinitions) MultiThreadedDebugDLL - Level4 - ProgramDatabase - - $(OutDir)libusb-1.0.dll - ..\libusb\libusb-1.0.def - libusb-1.0.rc;%(EmbedManagedResourceFile) + + NDEBUG;%(PreprocessorDefinitions) + MultiThreadedDLL + + true - - - .;..\libusb;%(AdditionalIncludeDirectories) - _WIN32;_LIB;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) - MultiThreadedDLL - Level4 - - - $(OutDir)libusb-1.0.dll - ..\libusb\libusb-1.0.def - libusb-1.0.rc;%(EmbedManagedResourceFile) - - - - - X64 - - - .;..\libusb;%(AdditionalIncludeDirectories) - _WIN32;_WIN64;_LIB;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) - MultiThreadedDLL - Level4 - - - $(OutDir)libusb-1.0.dll - ..\libusb\libusb-1.0.def - libusb-1.0.rc;%(EmbedManagedResourceFile) - - @@ -178,4 +99,4 @@ - \ No newline at end of file + diff --git a/msvc/libusb_sources b/msvc/libusb_sources index d497711..fcb1f77 100644 --- a/msvc/libusb_sources +++ b/msvc/libusb_sources @@ -2,6 +2,8 @@ TARGETNAME=libusb-1.0 DLLDEF=..\libusb-1.0.def +_NT_TARGET_VERSION=$(_NT_TARGET_VERSION_WINXP) + !IFNDEF MSC_WARNING_LEVEL MSC_WARNING_LEVEL=/W3 !ENDIF @@ -13,7 +15,7 @@ USE_MSVCRT=1 !ENDIF INCLUDES=..;..\..\msvc;$(DDK_INC_PATH) -C_DEFINES= $(C_DEFINES) $(LIBUSB_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: @@ -24,16 +26,17 @@ C_DEFINES= $(C_DEFINES) $(LIBUSB_DEFINES) /DDDKBUILD # an older compiler than other objects; rebuild old objects and libraries" USER_C_FLAGS=/GL- -TARGETLIBS=$(SDK_LIB_PATH)\kernel32.lib +TARGETLIBS=$(SDK_LIB_PATH)\advapi32.lib \ + $(SDK_LIB_PATH)\kernel32.lib SOURCES=..\core.c \ ..\descriptor.c \ ..\hotplug.c \ ..\io.c \ + poll_windows.c \ ..\strerror.c \ ..\sync.c \ threads_windows.c \ - poll_windows.c \ windows_nt_common.c \ windows_usbdk.c \ windows_winusb.c \ diff --git a/msvc/libusb_static_2010.vcxproj b/msvc/libusb_static_2010.vcxproj index cb031fc..4915dea 100644 --- a/msvc/libusb_static_2010.vcxproj +++ b/msvc/libusb_static_2010.vcxproj @@ -24,104 +24,39 @@ libusb - - StaticLibrary - Unicode - true - - - StaticLibrary - Unicode - - - StaticLibrary - Unicode - true - - + StaticLibrary Unicode + true - - - - - - - - - - + <_ProjectFileVersion>10.0.30319.1 - $(SolutionDir)..\$(Platform)\$(Configuration)\lib\ - $(SolutionDir)..\$(Platform)\$(Configuration)\lib\libusb-1.0\ - $(SolutionDir)..\$(Platform)\$(Configuration)\lib\ - $(SolutionDir)..\$(Platform)\$(Configuration)\lib\libusb-1.0\ - $(SolutionDir)..\$(Platform)\$(Configuration)\lib\ - $(SolutionDir)..\$(Platform)\$(Configuration)\lib\libusb-1.0\ - $(SolutionDir)..\$(Platform)\$(Configuration)\lib\ - $(SolutionDir)..\$(Platform)\$(Configuration)\lib\libusb-1.0\ - libusb-1.0 - libusb-1.0 - libusb-1.0 - libusb-1.0 + $(SolutionDir)..\$(Platform)\$(Configuration)\lib\$(TargetName)\ + $(SolutionDir)..\$(Platform)\$(Configuration)\lib\ + libusb-1.0 - + - Disabled .;..\libusb;%(AdditionalIncludeDirectories) - _WIN32;_DEBUG;_LIB;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) - MultiThreadedDebug + WINVER=0x0501;_WIN32_WINNT=0x0501;_LIB;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) + $(IntDir)$(TargetName).pdb Level4 + + ProgramDatabase - - - $(OutDir)libusb-1.0.lib - - - - - X64 - - Disabled - .;..\libusb;%(AdditionalIncludeDirectories) - _WIN32;_WIN64;_DEBUG;_LIB;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) MultiThreadedDebug - Level4 - ProgramDatabase - - $(OutDir)libusb-1.0.lib - - - - - .;..\libusb;%(AdditionalIncludeDirectories) - _WIN32;_LIB;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) + + NDEBUG;%(PreprocessorDefinitions) MultiThreaded - Level4 - - - $(OutDir)libusb-1.0.lib - - - - - X64 - - - .;..\libusb;%(AdditionalIncludeDirectories) - _WIN32;_WIN64;_LIB;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) - MultiThreaded - Level4 $(OutDir)libusb-1.0.lib @@ -158,4 +93,4 @@ - \ No newline at end of file + diff --git a/msvc/libusb_static_2010.vcxproj.filters b/msvc/libusb_static_2010.vcxproj.filters deleted file mode 100644 index c04af66..0000000 --- a/msvc/libusb_static_2010.vcxproj.filters +++ /dev/null @@ -1,89 +0,0 @@ - - - - - {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 - - - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - \ No newline at end of file diff --git a/msvc/libusb_static_2012.vcxproj b/msvc/libusb_static_2012.vcxproj index 3e91df2..ec653d8 100644 --- a/msvc/libusb_static_2012.vcxproj +++ b/msvc/libusb_static_2012.vcxproj @@ -24,108 +24,40 @@ libusb - - StaticLibrary - Unicode - true - v110 - - - StaticLibrary - Unicode - v110 - - - StaticLibrary - Unicode - true - v110 - - + StaticLibrary Unicode v110 + true - - - - - - - - - - + <_ProjectFileVersion>10.0.30319.1 - $(SolutionDir)..\$(Platform)\$(Configuration)\lib\ - $(SolutionDir)..\$(Platform)\$(Configuration)\lib\libusb-1.0\ - $(SolutionDir)..\$(Platform)\$(Configuration)\lib\ - $(SolutionDir)..\$(Platform)\$(Configuration)\lib\libusb-1.0\ - $(SolutionDir)..\$(Platform)\$(Configuration)\lib\ - $(SolutionDir)..\$(Platform)\$(Configuration)\lib\libusb-1.0\ - $(SolutionDir)..\$(Platform)\$(Configuration)\lib\ - $(SolutionDir)..\$(Platform)\$(Configuration)\lib\libusb-1.0\ - libusb-1.0 - libusb-1.0 - libusb-1.0 - libusb-1.0 + $(SolutionDir)..\$(Platform)\$(Configuration)\lib\$(TargetName)\ + $(SolutionDir)..\$(Platform)\$(Configuration)\lib\ + libusb-1.0 - + - Disabled .;..\libusb;%(AdditionalIncludeDirectories) - _WIN32;_DEBUG;_LIB;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) - MultiThreadedDebug + WINVER=0x0501;_WIN32_WINNT=0x0501;_LIB;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) + $(IntDir)$(TargetName).pdb Level4 + + ProgramDatabase - - - $(OutDir)libusb-1.0.lib - - - - - X64 - - Disabled - .;..\libusb;%(AdditionalIncludeDirectories) - _WIN32;_WIN64;_DEBUG;_LIB;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) MultiThreadedDebug - Level4 - ProgramDatabase - - $(OutDir)libusb-1.0.lib - - - - - .;..\libusb;%(AdditionalIncludeDirectories) - _WIN32;_LIB;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) + + NDEBUG;%(PreprocessorDefinitions) MultiThreaded - Level4 - - - $(OutDir)libusb-1.0.lib - - - - - X64 - - - .;..\libusb;%(AdditionalIncludeDirectories) - _WIN32;_WIN64;_LIB;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) - MultiThreaded - Level4 $(OutDir)libusb-1.0.lib @@ -162,4 +94,4 @@ - \ No newline at end of file + diff --git a/msvc/libusb_static_2012.vcxproj.filters b/msvc/libusb_static_2012.vcxproj.filters deleted file mode 100644 index c04af66..0000000 --- a/msvc/libusb_static_2012.vcxproj.filters +++ /dev/null @@ -1,89 +0,0 @@ - - - - - {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 - - - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - \ No newline at end of file diff --git a/msvc/libusb_static_2013.vcxproj b/msvc/libusb_static_2013.vcxproj index 813686f..c97fb01 100644 --- a/msvc/libusb_static_2013.vcxproj +++ b/msvc/libusb_static_2013.vcxproj @@ -24,108 +24,40 @@ libusb - - StaticLibrary - Unicode - true - v120 - - - StaticLibrary - Unicode - v120 - - - StaticLibrary - Unicode - true - v120 - - + StaticLibrary Unicode v120 + true - - - - - - - - - - + <_ProjectFileVersion>10.0.30319.1 - $(SolutionDir)..\$(Platform)\$(Configuration)\lib\ - $(SolutionDir)..\$(Platform)\$(Configuration)\lib\libusb-1.0\ - $(SolutionDir)..\$(Platform)\$(Configuration)\lib\ - $(SolutionDir)..\$(Platform)\$(Configuration)\lib\libusb-1.0\ - $(SolutionDir)..\$(Platform)\$(Configuration)\lib\ - $(SolutionDir)..\$(Platform)\$(Configuration)\lib\libusb-1.0\ - $(SolutionDir)..\$(Platform)\$(Configuration)\lib\ - $(SolutionDir)..\$(Platform)\$(Configuration)\lib\libusb-1.0\ - libusb-1.0 - libusb-1.0 - libusb-1.0 - libusb-1.0 + $(SolutionDir)..\$(Platform)\$(Configuration)\lib\$(TargetName)\ + $(SolutionDir)..\$(Platform)\$(Configuration)\lib\ + libusb-1.0 - + - Disabled .;..\libusb;%(AdditionalIncludeDirectories) - _WIN32;_DEBUG;_LIB;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) - MultiThreadedDebug + WINVER=0x0501;_WIN32_WINNT=0x0501;_LIB;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) + $(IntDir)$(TargetName).pdb Level4 + + ProgramDatabase - - - $(OutDir)libusb-1.0.lib - - - - - X64 - - Disabled - .;..\libusb;%(AdditionalIncludeDirectories) - _WIN32;_WIN64;_DEBUG;_LIB;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) MultiThreadedDebug - Level4 - ProgramDatabase - - $(OutDir)libusb-1.0.lib - - - - - .;..\libusb;%(AdditionalIncludeDirectories) - _WIN32;_LIB;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) + + NDEBUG;%(PreprocessorDefinitions) MultiThreaded - Level4 - - - $(OutDir)libusb-1.0.lib - - - - - X64 - - - .;..\libusb;%(AdditionalIncludeDirectories) - _WIN32;_WIN64;_LIB;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) - MultiThreaded - Level4 $(OutDir)libusb-1.0.lib @@ -162,4 +94,4 @@ - \ No newline at end of file + diff --git a/msvc/libusb_static_2015.vcxproj b/msvc/libusb_static_2015.vcxproj index 2b9af09..a182171 100644 --- a/msvc/libusb_static_2015.vcxproj +++ b/msvc/libusb_static_2015.vcxproj @@ -24,112 +24,40 @@ libusb - - StaticLibrary - Unicode - true - v140 - - - StaticLibrary - Unicode - v140 - - - StaticLibrary - Unicode - true - v140 - - + StaticLibrary Unicode v140 + true - - - - - - - - - - + <_ProjectFileVersion>10.0.30319.1 - $(SolutionDir)..\$(Platform)\$(Configuration)\lib\ - $(SolutionDir)..\$(Platform)\$(Configuration)\lib\libusb-1.0\ - $(SolutionDir)..\$(Platform)\$(Configuration)\lib\ - $(SolutionDir)..\$(Platform)\$(Configuration)\lib\libusb-1.0\ - $(SolutionDir)..\$(Platform)\$(Configuration)\lib\ - $(SolutionDir)..\$(Platform)\$(Configuration)\lib\libusb-1.0\ - $(SolutionDir)..\$(Platform)\$(Configuration)\lib\ - $(SolutionDir)..\$(Platform)\$(Configuration)\lib\libusb-1.0\ - libusb-1.0 - libusb-1.0 - libusb-1.0 - libusb-1.0 + $(SolutionDir)..\$(Platform)\$(Configuration)\lib\$(TargetName)\ + $(SolutionDir)..\$(Platform)\$(Configuration)\lib\ + libusb-1.0 - + - Disabled .;..\libusb;%(AdditionalIncludeDirectories) - _WIN32;_DEBUG;_LIB;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) - MultiThreadedDebug + WINVER=0x0501;_WIN32_WINNT=0x0501;_LIB;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) + $(IntDir)$(TargetName).pdb Level4 + + ProgramDatabase - $(IntDir)$(TargetName).pdb - - - $(OutDir)libusb-1.0.lib - - - - - X64 - - Disabled - .;..\libusb;%(AdditionalIncludeDirectories) - _WIN32;_WIN64;_DEBUG;_LIB;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) MultiThreadedDebug - Level4 - ProgramDatabase - $(IntDir)$(TargetName).pdb - - $(OutDir)libusb-1.0.lib - - - - - .;..\libusb;%(AdditionalIncludeDirectories) - _WIN32;_LIB;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) + + NDEBUG;%(PreprocessorDefinitions) MultiThreaded - Level4 - $(IntDir)$(TargetName).pdb - - - $(OutDir)libusb-1.0.lib - - - - - X64 - - - .;..\libusb;%(AdditionalIncludeDirectories) - _WIN32;_WIN64;_LIB;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) - MultiThreaded - Level4 - $(IntDir)$(TargetName).pdb $(OutDir)libusb-1.0.lib @@ -166,4 +94,4 @@ - \ No newline at end of file + diff --git a/msvc/libusb_static_2017.vcxproj b/msvc/libusb_static_2017.vcxproj index e8a08cf..1341693 100644 --- a/msvc/libusb_static_2017.vcxproj +++ b/msvc/libusb_static_2017.vcxproj @@ -24,112 +24,40 @@ libusb - - StaticLibrary - Unicode - true - v141 - - - StaticLibrary - Unicode - v141 - - - StaticLibrary - Unicode - true - v141 - - + StaticLibrary Unicode v141 + true - - - - - - - - - - + <_ProjectFileVersion>10.0.30319.1 - $(SolutionDir)..\$(Platform)\$(Configuration)\lib\ - $(SolutionDir)..\$(Platform)\$(Configuration)\lib\libusb-1.0\ - $(SolutionDir)..\$(Platform)\$(Configuration)\lib\ - $(SolutionDir)..\$(Platform)\$(Configuration)\lib\libusb-1.0\ - $(SolutionDir)..\$(Platform)\$(Configuration)\lib\ - $(SolutionDir)..\$(Platform)\$(Configuration)\lib\libusb-1.0\ - $(SolutionDir)..\$(Platform)\$(Configuration)\lib\ - $(SolutionDir)..\$(Platform)\$(Configuration)\lib\libusb-1.0\ - libusb-1.0 - libusb-1.0 - libusb-1.0 - libusb-1.0 + $(SolutionDir)..\$(Platform)\$(Configuration)\lib\$(TargetName)\ + $(SolutionDir)..\$(Platform)\$(Configuration)\lib\ + libusb-1.0 - + - Disabled .;..\libusb;%(AdditionalIncludeDirectories) - _WIN32;_DEBUG;_LIB;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) - MultiThreadedDebug + WINVER=0x0501;_WIN32_WINNT=0x0501;_LIB;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) + $(IntDir)$(TargetName).pdb Level4 + + ProgramDatabase - $(IntDir)$(TargetName).pdb - - - $(OutDir)libusb-1.0.lib - - - - - X64 - - Disabled - .;..\libusb;%(AdditionalIncludeDirectories) - _WIN32;_WIN64;_DEBUG;_LIB;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) MultiThreadedDebug - Level4 - ProgramDatabase - $(IntDir)$(TargetName).pdb - - $(OutDir)libusb-1.0.lib - - - - - .;..\libusb;%(AdditionalIncludeDirectories) - _WIN32;_LIB;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) + + NDEBUG;%(PreprocessorDefinitions) MultiThreaded - Level4 - $(IntDir)$(TargetName).pdb - - - $(OutDir)libusb-1.0.lib - - - - - X64 - - - .;..\libusb;%(AdditionalIncludeDirectories) - _WIN32;_WIN64;_LIB;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) - MultiThreaded - Level4 - $(IntDir)$(TargetName).pdb $(OutDir)libusb-1.0.lib @@ -166,4 +94,4 @@ - \ No newline at end of file + diff --git a/msvc/listdevs_2010.vcxproj b/msvc/listdevs_2010.vcxproj index 5829aae..bfda5d2 100644 --- a/msvc/listdevs_2010.vcxproj +++ b/msvc/listdevs_2010.vcxproj @@ -25,129 +25,45 @@ Win32Proj - - Application - Unicode - true - - - Application - Unicode - - - Application - Unicode - true - - + Application Unicode + true - - - - - - - - - - + <_ProjectFileVersion>10.0.30319.1 - $(SolutionDir)..\$(Platform)\$(Configuration)\examples\ - $(SolutionDir)..\$(Platform)\$(Configuration)\examples\$(ProjectName)\ - $(SolutionDir)..\$(Platform)\$(Configuration)\examples\ - $(SolutionDir)..\$(Platform)\$(Configuration)\examples\$(ProjectName)\ - $(SolutionDir)..\$(Platform)\$(Configuration)\examples\ - $(SolutionDir)..\$(Platform)\$(Configuration)\examples\$(ProjectName)\ - $(SolutionDir)..\$(Platform)\$(Configuration)\examples\ - $(SolutionDir)..\$(Platform)\$(Configuration)\examples\$(ProjectName)\ + $(SolutionDir)..\$(Platform)\$(Configuration)\examples\$(ProjectName)\ + $(SolutionDir)..\$(Platform)\$(Configuration)\examples\ - - - $(IntDir)$(ProjectName).htm - + - Disabled ..\libusb;%(AdditionalIncludeDirectories) - WIN32;_DEBUG;_CONSOLE;%(PreprocessorDefinitions) - MultiThreadedDebug + _CONSOLE;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) Level3 + + ProgramDatabase - - - %(AdditionalLibraryDirectories) - true - $(TargetDir)$(ProjectName).pdb - Console - MachineX86 - - - - - $(IntDir)$(ProjectName).htm - - - X64 - - + true Disabled - ..\libusb;%(AdditionalIncludeDirectories) - WIN32;_DEBUG;_CONSOLE;%(PreprocessorDefinitions) MultiThreadedDebug - Level3 - ProgramDatabase + + + NDEBUG;%(PreprocessorDefinitions) + MultiThreaded - %(AdditionalLibraryDirectories) + $(TargetDir)$(ProjectName).pdb + Console + + true - $(TargetDir)$(ProjectName).pdb - Console - MachineX64 - - - - - $(IntDir)$(ProjectName).htm - - - ..\libusb;%(AdditionalIncludeDirectories) - WIN32;NDEBUG;_CONSOLE;%(PreprocessorDefinitions) - MultiThreaded - Level3 - - - %(AdditionalLibraryDirectories) - $(TargetDir)$(ProjectName).pdb - Console - MachineX86 - - - - - $(IntDir)$(ProjectName).htm - - - X64 - - - ..\libusb;%(AdditionalIncludeDirectories) - WIN32;NDEBUG;_CONSOLE;%(PreprocessorDefinitions) - MultiThreaded - Level3 - - - %(AdditionalLibraryDirectories) - $(TargetDir)$(ProjectName).pdb - Console - MachineX64 @@ -162,4 +78,4 @@ - \ No newline at end of file + diff --git a/msvc/listdevs_2010.vcxproj.filters b/msvc/listdevs_2010.vcxproj.filters deleted file mode 100644 index de4d3af..0000000 --- a/msvc/listdevs_2010.vcxproj.filters +++ /dev/null @@ -1,14 +0,0 @@ - - - - - {4FC737F1-C7A5-4376-A066-2A32D752A2FF} - cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx - - - - - Source Files - - - \ No newline at end of file diff --git a/msvc/listdevs_2012.vcxproj b/msvc/listdevs_2012.vcxproj index 97fe336..ec2eaf5 100644 --- a/msvc/listdevs_2012.vcxproj +++ b/msvc/listdevs_2012.vcxproj @@ -25,133 +25,46 @@ Win32Proj - - Application - Unicode - true - v110 - - - Application - Unicode - v110 - - - Application - Unicode - true - v110 - - + Application Unicode v110 + true - - - - - - - - - - + <_ProjectFileVersion>10.0.30319.1 - $(SolutionDir)..\$(Platform)\$(Configuration)\examples\ - $(SolutionDir)..\$(Platform)\$(Configuration)\examples\$(ProjectName)\ - $(SolutionDir)..\$(Platform)\$(Configuration)\examples\ - $(SolutionDir)..\$(Platform)\$(Configuration)\examples\$(ProjectName)\ - $(SolutionDir)..\$(Platform)\$(Configuration)\examples\ - $(SolutionDir)..\$(Platform)\$(Configuration)\examples\$(ProjectName)\ - $(SolutionDir)..\$(Platform)\$(Configuration)\examples\ - $(SolutionDir)..\$(Platform)\$(Configuration)\examples\$(ProjectName)\ + $(SolutionDir)..\$(Platform)\$(Configuration)\examples\$(ProjectName)\ + $(SolutionDir)..\$(Platform)\$(Configuration)\examples\ - - - $(IntDir)$(ProjectName).htm - + - Disabled ..\libusb;%(AdditionalIncludeDirectories) - WIN32;_DEBUG;_CONSOLE;%(PreprocessorDefinitions) - MultiThreadedDebug + _CONSOLE;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) Level3 + + ProgramDatabase - - - %(AdditionalLibraryDirectories) - true - $(TargetDir)$(ProjectName).pdb - Console - MachineX86 - - - - - $(IntDir)$(ProjectName).htm - - - X64 - - + true Disabled - ..\libusb;%(AdditionalIncludeDirectories) - WIN32;_DEBUG;_CONSOLE;%(PreprocessorDefinitions) MultiThreadedDebug - Level3 - ProgramDatabase + + + NDEBUG;%(PreprocessorDefinitions) + MultiThreaded - %(AdditionalLibraryDirectories) + $(TargetDir)$(ProjectName).pdb + Console + + true - $(TargetDir)$(ProjectName).pdb - Console - MachineX64 - - - - - $(IntDir)$(ProjectName).htm - - - ..\libusb;%(AdditionalIncludeDirectories) - WIN32;NDEBUG;_CONSOLE;%(PreprocessorDefinitions) - MultiThreaded - Level3 - - - %(AdditionalLibraryDirectories) - $(TargetDir)$(ProjectName).pdb - Console - MachineX86 - - - - - $(IntDir)$(ProjectName).htm - - - X64 - - - ..\libusb;%(AdditionalIncludeDirectories) - WIN32;NDEBUG;_CONSOLE;%(PreprocessorDefinitions) - MultiThreaded - Level3 - - - %(AdditionalLibraryDirectories) - $(TargetDir)$(ProjectName).pdb - Console - MachineX64 @@ -166,4 +79,4 @@ - \ No newline at end of file + diff --git a/msvc/listdevs_2012.vcxproj.filters b/msvc/listdevs_2012.vcxproj.filters deleted file mode 100644 index de4d3af..0000000 --- a/msvc/listdevs_2012.vcxproj.filters +++ /dev/null @@ -1,14 +0,0 @@ - - - - - {4FC737F1-C7A5-4376-A066-2A32D752A2FF} - cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx - - - - - Source Files - - - \ No newline at end of file diff --git a/msvc/listdevs_2013.vcxproj b/msvc/listdevs_2013.vcxproj index 7bee105..64b4578 100644 --- a/msvc/listdevs_2013.vcxproj +++ b/msvc/listdevs_2013.vcxproj @@ -25,133 +25,46 @@ Win32Proj - - Application - Unicode - true - v120 - - - Application - Unicode - v120 - - - Application - Unicode - true - v120 - - + Application Unicode v120 + true - - - - - - - - - - + <_ProjectFileVersion>10.0.30319.1 - $(SolutionDir)..\$(Platform)\$(Configuration)\examples\ - $(SolutionDir)..\$(Platform)\$(Configuration)\examples\$(ProjectName)\ - $(SolutionDir)..\$(Platform)\$(Configuration)\examples\ - $(SolutionDir)..\$(Platform)\$(Configuration)\examples\$(ProjectName)\ - $(SolutionDir)..\$(Platform)\$(Configuration)\examples\ - $(SolutionDir)..\$(Platform)\$(Configuration)\examples\$(ProjectName)\ - $(SolutionDir)..\$(Platform)\$(Configuration)\examples\ - $(SolutionDir)..\$(Platform)\$(Configuration)\examples\$(ProjectName)\ + $(SolutionDir)..\$(Platform)\$(Configuration)\examples\$(ProjectName)\ + $(SolutionDir)..\$(Platform)\$(Configuration)\examples\ - - - $(IntDir)$(ProjectName).htm - + - Disabled ..\libusb;%(AdditionalIncludeDirectories) - WIN32;_DEBUG;_CONSOLE;%(PreprocessorDefinitions) - MultiThreadedDebug + _CONSOLE;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) Level3 + + ProgramDatabase - - - %(AdditionalLibraryDirectories) - true - $(TargetDir)$(ProjectName).pdb - Console - MachineX86 - - - - - $(IntDir)$(ProjectName).htm - - - X64 - - + true Disabled - ..\libusb;%(AdditionalIncludeDirectories) - WIN32;_DEBUG;_CONSOLE;%(PreprocessorDefinitions) MultiThreadedDebug - Level3 - ProgramDatabase + + + NDEBUG;%(PreprocessorDefinitions) + MultiThreaded - %(AdditionalLibraryDirectories) + $(TargetDir)$(ProjectName).pdb + Console + + true - $(TargetDir)$(ProjectName).pdb - Console - MachineX64 - - - - - $(IntDir)$(ProjectName).htm - - - ..\libusb;%(AdditionalIncludeDirectories) - WIN32;NDEBUG;_CONSOLE;%(PreprocessorDefinitions) - MultiThreaded - Level3 - - - %(AdditionalLibraryDirectories) - $(TargetDir)$(ProjectName).pdb - Console - MachineX86 - - - - - $(IntDir)$(ProjectName).htm - - - X64 - - - ..\libusb;%(AdditionalIncludeDirectories) - WIN32;NDEBUG;_CONSOLE;%(PreprocessorDefinitions) - MultiThreaded - Level3 - - - %(AdditionalLibraryDirectories) - $(TargetDir)$(ProjectName).pdb - Console - MachineX64 @@ -166,4 +79,4 @@ - \ No newline at end of file + diff --git a/msvc/listdevs_2015.vcxproj b/msvc/listdevs_2015.vcxproj index 8a0ede4..1243865 100644 --- a/msvc/listdevs_2015.vcxproj +++ b/msvc/listdevs_2015.vcxproj @@ -25,133 +25,46 @@ Win32Proj - - Application - Unicode - true - v140 - - - Application - Unicode - v140 - - - Application - Unicode - true - v140 - - + Application Unicode v140 + true - - - - - - - - - - + <_ProjectFileVersion>10.0.30319.1 - $(SolutionDir)..\$(Platform)\$(Configuration)\examples\ - $(SolutionDir)..\$(Platform)\$(Configuration)\examples\$(ProjectName)\ - $(SolutionDir)..\$(Platform)\$(Configuration)\examples\ - $(SolutionDir)..\$(Platform)\$(Configuration)\examples\$(ProjectName)\ - $(SolutionDir)..\$(Platform)\$(Configuration)\examples\ - $(SolutionDir)..\$(Platform)\$(Configuration)\examples\$(ProjectName)\ - $(SolutionDir)..\$(Platform)\$(Configuration)\examples\ - $(SolutionDir)..\$(Platform)\$(Configuration)\examples\$(ProjectName)\ + $(SolutionDir)..\$(Platform)\$(Configuration)\examples\$(ProjectName)\ + $(SolutionDir)..\$(Platform)\$(Configuration)\examples\ - - - $(IntDir)$(ProjectName).htm - + - Disabled ..\libusb;%(AdditionalIncludeDirectories) - WIN32;_DEBUG;_CONSOLE;%(PreprocessorDefinitions) - MultiThreadedDebug + _CONSOLE;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) Level3 + + ProgramDatabase - - - %(AdditionalLibraryDirectories) - true - $(TargetDir)$(ProjectName).pdb - Console - MachineX86 - - - - - $(IntDir)$(ProjectName).htm - - - X64 - - + true Disabled - ..\libusb;%(AdditionalIncludeDirectories) - WIN32;_DEBUG;_CONSOLE;%(PreprocessorDefinitions) MultiThreadedDebug - Level3 - ProgramDatabase + + + NDEBUG;%(PreprocessorDefinitions) + MultiThreaded - %(AdditionalLibraryDirectories) + $(TargetDir)$(ProjectName).pdb + Console + + true - $(TargetDir)$(ProjectName).pdb - Console - MachineX64 - - - - - $(IntDir)$(ProjectName).htm - - - ..\libusb;%(AdditionalIncludeDirectories) - WIN32;NDEBUG;_CONSOLE;%(PreprocessorDefinitions) - MultiThreaded - Level3 - - - %(AdditionalLibraryDirectories) - $(TargetDir)$(ProjectName).pdb - Console - MachineX86 - - - - - $(IntDir)$(ProjectName).htm - - - X64 - - - ..\libusb;%(AdditionalIncludeDirectories) - WIN32;NDEBUG;_CONSOLE;%(PreprocessorDefinitions) - MultiThreaded - Level3 - - - %(AdditionalLibraryDirectories) - $(TargetDir)$(ProjectName).pdb - Console - MachineX64 @@ -166,4 +79,4 @@ - \ No newline at end of file + diff --git a/msvc/listdevs_2017.vcxproj b/msvc/listdevs_2017.vcxproj index f5d7568..e7e7520 100644 --- a/msvc/listdevs_2017.vcxproj +++ b/msvc/listdevs_2017.vcxproj @@ -25,133 +25,46 @@ Win32Proj - - Application - Unicode - true - v141 - - - Application - Unicode - v141 - - - Application - Unicode - true - v141 - - + Application Unicode v141 + true - - - - - - - - - - + <_ProjectFileVersion>10.0.30319.1 - $(SolutionDir)..\$(Platform)\$(Configuration)\examples\ - $(SolutionDir)..\$(Platform)\$(Configuration)\examples\$(ProjectName)\ - $(SolutionDir)..\$(Platform)\$(Configuration)\examples\ - $(SolutionDir)..\$(Platform)\$(Configuration)\examples\$(ProjectName)\ - $(SolutionDir)..\$(Platform)\$(Configuration)\examples\ - $(SolutionDir)..\$(Platform)\$(Configuration)\examples\$(ProjectName)\ - $(SolutionDir)..\$(Platform)\$(Configuration)\examples\ - $(SolutionDir)..\$(Platform)\$(Configuration)\examples\$(ProjectName)\ + $(SolutionDir)..\$(Platform)\$(Configuration)\examples\$(ProjectName)\ + $(SolutionDir)..\$(Platform)\$(Configuration)\examples\ - - - $(IntDir)$(ProjectName).htm - + - Disabled ..\libusb;%(AdditionalIncludeDirectories) - WIN32;_DEBUG;_CONSOLE;%(PreprocessorDefinitions) - MultiThreadedDebug + _CONSOLE;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) Level3 + + ProgramDatabase - - - %(AdditionalLibraryDirectories) - true - $(TargetDir)$(ProjectName).pdb - Console - MachineX86 - - - - - $(IntDir)$(ProjectName).htm - - - X64 - - + true Disabled - ..\libusb;%(AdditionalIncludeDirectories) - WIN32;_DEBUG;_CONSOLE;%(PreprocessorDefinitions) MultiThreadedDebug - Level3 - ProgramDatabase + + + NDEBUG;%(PreprocessorDefinitions) + MultiThreaded - %(AdditionalLibraryDirectories) + $(TargetDir)$(ProjectName).pdb + Console + + true - $(TargetDir)$(ProjectName).pdb - Console - MachineX64 - - - - - $(IntDir)$(ProjectName).htm - - - ..\libusb;%(AdditionalIncludeDirectories) - WIN32;NDEBUG;_CONSOLE;%(PreprocessorDefinitions) - MultiThreaded - Level3 - - - %(AdditionalLibraryDirectories) - $(TargetDir)$(ProjectName).pdb - Console - MachineX86 - - - - - $(IntDir)$(ProjectName).htm - - - X64 - - - ..\libusb;%(AdditionalIncludeDirectories) - WIN32;NDEBUG;_CONSOLE;%(PreprocessorDefinitions) - MultiThreaded - Level3 - - - %(AdditionalLibraryDirectories) - $(TargetDir)$(ProjectName).pdb - Console - MachineX64 diff --git a/msvc/listdevs_sources b/msvc/listdevs_sources index 97a5723..2b110ee 100644 --- a/msvc/listdevs_sources +++ b/msvc/listdevs_sources @@ -2,7 +2,8 @@ TARGETNAME=listdevs TARGETTYPE=PROGRAM 386_STDCALL=0 -_NT_TARGET_VERSION= $(_NT_TARGET_VERSION_WINXP) +_NT_TARGET_VERSION=$(_NT_TARGET_VERSION_WINXP) + !IFNDEF MSC_WARNING_LEVEL MSC_WARNING_LEVEL=/W3 !ENDIF diff --git a/msvc/stress_2010.vcxproj b/msvc/stress_2010.vcxproj index f974796..5f1e99b 100644 --- a/msvc/stress_2010.vcxproj +++ b/msvc/stress_2010.vcxproj @@ -25,143 +25,61 @@ Win32Proj - - Application - Unicode - true - - - Application - Unicode - - - Application - Unicode - true - - + Application Unicode + true - - - - - - - - - - + <_ProjectFileVersion>10.0.30319.1 - $(SolutionDir)..\$(Platform)\$(Configuration)\tests\ - $(SolutionDir)..\$(Platform)\$(Configuration)\tests\$(ProjectName)\ - $(SolutionDir)..\$(Platform)\$(Configuration)\tests\ - $(SolutionDir)..\$(Platform)\$(Configuration)\tests\$(ProjectName)\ - $(SolutionDir)..\$(Platform)\$(Configuration)\tests\ - $(SolutionDir)..\$(Platform)\$(Configuration)\tests\$(ProjectName)\ - $(SolutionDir)..\$(Platform)\$(Configuration)\tests\ - $(SolutionDir)..\$(Platform)\$(Configuration)\tests\$(ProjectName)\ + $(SolutionDir)..\$(Platform)\$(Configuration)\tests\$(ProjectName)\ + $(SolutionDir)..\$(Platform)\$(Configuration)\tests\ - - - $(IntDir)$(ProjectName).htm - + - Disabled .;..\libusb;%(AdditionalIncludeDirectories) - WIN32;_DEBUG;_CONSOLE;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) - true - MultiThreadedDebug + _CONSOLE;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) Level3 + + ProgramDatabase - - - %(AdditionalLibraryDirectories) - true - Console - MachineX86 - - - - - $(IntDir)$(ProjectName).htm - - - X64 - - - Disabled - .;..\libusb;%(AdditionalIncludeDirectories) - WIN32;_DEBUG;_CONSOLE;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) true + Disabled MultiThreadedDebug - Level3 - ProgramDatabase + + + NDEBUG;%(PreprocessorDefinitions) + MultiThreaded - %(AdditionalLibraryDirectories) + $(TargetDir)$(ProjectName).pdb + Console + + true - Console - MachineX64 - - - - - $(IntDir)$(ProjectName).htm - - - .;..\libusb;%(AdditionalIncludeDirectories) - WIN32;NDEBUG;_CONSOLE;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) - MultiThreaded - Level3 - - - %(AdditionalLibraryDirectories) - Console - MachineX86 - - - - - $(IntDir)$(ProjectName).htm - - - X64 - - - .;..\libusb;%(AdditionalIncludeDirectories) - WIN32;NDEBUG;_CONSOLE;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) - MultiThreaded - Level3 - - - %(AdditionalLibraryDirectories) - Console - MachineX64 + + + {349ee8f9-7d25-4909-aaf5-ff3fade72187} false - - - - \ No newline at end of file + diff --git a/msvc/stress_2010.vcxproj.filters b/msvc/stress_2010.vcxproj.filters deleted file mode 100644 index bbe84b8..0000000 --- a/msvc/stress_2010.vcxproj.filters +++ /dev/null @@ -1,25 +0,0 @@ - - - - - {4FC737F1-C7A5-4376-A066-2A32D752A2FF} - cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx - - - {28b6220e-d087-4f48-bd69-ffe0ac5bcc7a} - - - - - Source Files - - - Source Files - - - - - Header Files - - - \ No newline at end of file diff --git a/msvc/stress_2012.vcxproj b/msvc/stress_2012.vcxproj index 94ca149..4485a4c 100644 --- a/msvc/stress_2012.vcxproj +++ b/msvc/stress_2012.vcxproj @@ -25,147 +25,62 @@ Win32Proj - - Application - Unicode - true - v110 - - - Application - Unicode - v110 - - - Application - Unicode - true - v110 - - + Application Unicode v110 + true - - - - - - - - - - + <_ProjectFileVersion>10.0.30319.1 - $(SolutionDir)..\$(Platform)\$(Configuration)\tests\ - $(SolutionDir)..\$(Platform)\$(Configuration)\tests\$(ProjectName)\ - $(SolutionDir)..\$(Platform)\$(Configuration)\tests\ - $(SolutionDir)..\$(Platform)\$(Configuration)\tests\$(ProjectName)\ - $(SolutionDir)..\$(Platform)\$(Configuration)\tests\ - $(SolutionDir)..\$(Platform)\$(Configuration)\tests\$(ProjectName)\ - $(SolutionDir)..\$(Platform)\$(Configuration)\tests\ - $(SolutionDir)..\$(Platform)\$(Configuration)\tests\$(ProjectName)\ + $(SolutionDir)..\$(Platform)\$(Configuration)\tests\$(ProjectName)\ + $(SolutionDir)..\$(Platform)\$(Configuration)\tests\ - - - $(IntDir)$(ProjectName).htm - + - Disabled .;..\libusb;%(AdditionalIncludeDirectories) - WIN32;_DEBUG;_CONSOLE;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) - true - MultiThreadedDebug + _CONSOLE;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) Level3 + + ProgramDatabase - - - %(AdditionalLibraryDirectories) - true - Console - MachineX86 - - - - - $(IntDir)$(ProjectName).htm - - - X64 - - - Disabled - .;..\libusb;%(AdditionalIncludeDirectories) - WIN32;_DEBUG;_CONSOLE;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) true + Disabled MultiThreadedDebug - Level3 - ProgramDatabase + + + NDEBUG;%(PreprocessorDefinitions) + MultiThreaded - %(AdditionalLibraryDirectories) + $(TargetDir)$(ProjectName).pdb + Console + + true - Console - MachineX64 - - - - - $(IntDir)$(ProjectName).htm - - - .;..\libusb;%(AdditionalIncludeDirectories) - WIN32;NDEBUG;_CONSOLE;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) - MultiThreaded - Level3 - - - %(AdditionalLibraryDirectories) - Console - MachineX86 - - - - - $(IntDir)$(ProjectName).htm - - - X64 - - - .;..\libusb;%(AdditionalIncludeDirectories) - WIN32;NDEBUG;_CONSOLE;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) - MultiThreaded - Level3 - - - %(AdditionalLibraryDirectories) - Console - MachineX64 + + + {349ee8f9-7d25-4909-aaf5-ff3fade72187} false - - - - \ No newline at end of file + diff --git a/msvc/stress_2012.vcxproj.filters b/msvc/stress_2012.vcxproj.filters deleted file mode 100644 index bbe84b8..0000000 --- a/msvc/stress_2012.vcxproj.filters +++ /dev/null @@ -1,25 +0,0 @@ - - - - - {4FC737F1-C7A5-4376-A066-2A32D752A2FF} - cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx - - - {28b6220e-d087-4f48-bd69-ffe0ac5bcc7a} - - - - - Source Files - - - Source Files - - - - - Header Files - - - \ No newline at end of file diff --git a/msvc/stress_2013.vcxproj b/msvc/stress_2013.vcxproj index da70339..305b11e 100644 --- a/msvc/stress_2013.vcxproj +++ b/msvc/stress_2013.vcxproj @@ -25,147 +25,62 @@ Win32Proj - - Application - Unicode - true - v120 - - - Application - Unicode - v120 - - - Application - Unicode - true - v120 - - + Application Unicode v120 + true - - - - - - - - - - + <_ProjectFileVersion>10.0.30319.1 - $(SolutionDir)..\$(Platform)\$(Configuration)\tests\ - $(SolutionDir)..\$(Platform)\$(Configuration)\tests\$(ProjectName)\ - $(SolutionDir)..\$(Platform)\$(Configuration)\tests\ - $(SolutionDir)..\$(Platform)\$(Configuration)\tests\$(ProjectName)\ - $(SolutionDir)..\$(Platform)\$(Configuration)\tests\ - $(SolutionDir)..\$(Platform)\$(Configuration)\tests\$(ProjectName)\ - $(SolutionDir)..\$(Platform)\$(Configuration)\tests\ - $(SolutionDir)..\$(Platform)\$(Configuration)\tests\$(ProjectName)\ + $(SolutionDir)..\$(Platform)\$(Configuration)\tests\$(ProjectName)\ + $(SolutionDir)..\$(Platform)\$(Configuration)\tests\ - - - $(IntDir)$(ProjectName).htm - + - Disabled .;..\libusb;%(AdditionalIncludeDirectories) - WIN32;_DEBUG;_CONSOLE;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) - true - MultiThreadedDebug + _CONSOLE;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) Level3 + + ProgramDatabase - - - %(AdditionalLibraryDirectories) - true - Console - MachineX86 - - - - - $(IntDir)$(ProjectName).htm - - - X64 - - - Disabled - .;..\libusb;%(AdditionalIncludeDirectories) - WIN32;_DEBUG;_CONSOLE;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) true + Disabled MultiThreadedDebug - Level3 - ProgramDatabase + + + NDEBUG;%(PreprocessorDefinitions) + MultiThreaded - %(AdditionalLibraryDirectories) + $(TargetDir)$(ProjectName).pdb + Console + + true - Console - MachineX64 - - - - - $(IntDir)$(ProjectName).htm - - - .;..\libusb;%(AdditionalIncludeDirectories) - WIN32;NDEBUG;_CONSOLE;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) - MultiThreaded - Level3 - - - %(AdditionalLibraryDirectories) - Console - MachineX86 - - - - - $(IntDir)$(ProjectName).htm - - - X64 - - - .;..\libusb;%(AdditionalIncludeDirectories) - WIN32;NDEBUG;_CONSOLE;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) - MultiThreaded - Level3 - - - %(AdditionalLibraryDirectories) - Console - MachineX64 + + + {349ee8f9-7d25-4909-aaf5-ff3fade72187} false - - - - \ No newline at end of file + diff --git a/msvc/stress_2015.vcxproj b/msvc/stress_2015.vcxproj index 56b0038..8cb33d3 100644 --- a/msvc/stress_2015.vcxproj +++ b/msvc/stress_2015.vcxproj @@ -25,147 +25,62 @@ Win32Proj - - Application - Unicode - true - v140 - - - Application - Unicode - v140 - - - Application - Unicode - true - v140 - - + Application Unicode v140 + true - - - - - - - - - - + <_ProjectFileVersion>10.0.30319.1 - $(SolutionDir)..\$(Platform)\$(Configuration)\tests\ - $(SolutionDir)..\$(Platform)\$(Configuration)\tests\$(ProjectName)\ - $(SolutionDir)..\$(Platform)\$(Configuration)\tests\ - $(SolutionDir)..\$(Platform)\$(Configuration)\tests\$(ProjectName)\ - $(SolutionDir)..\$(Platform)\$(Configuration)\tests\ - $(SolutionDir)..\$(Platform)\$(Configuration)\tests\$(ProjectName)\ - $(SolutionDir)..\$(Platform)\$(Configuration)\tests\ - $(SolutionDir)..\$(Platform)\$(Configuration)\tests\$(ProjectName)\ + $(SolutionDir)..\$(Platform)\$(Configuration)\tests\$(ProjectName)\ + $(SolutionDir)..\$(Platform)\$(Configuration)\tests\ - - - $(IntDir)$(ProjectName).htm - + - Disabled .;..\libusb;%(AdditionalIncludeDirectories) - WIN32;_DEBUG;_CONSOLE;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) - true - MultiThreadedDebug + _CONSOLE;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) Level3 + + ProgramDatabase - - - %(AdditionalLibraryDirectories) - true - Console - MachineX86 - - - - - $(IntDir)$(ProjectName).htm - - - X64 - - - Disabled - .;..\libusb;%(AdditionalIncludeDirectories) - WIN32;_DEBUG;_CONSOLE;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) true + Disabled MultiThreadedDebug - Level3 - ProgramDatabase + + + NDEBUG;%(PreprocessorDefinitions) + MultiThreaded - %(AdditionalLibraryDirectories) + $(TargetDir)$(ProjectName).pdb + Console + + true - Console - MachineX64 - - - - - $(IntDir)$(ProjectName).htm - - - .;..\libusb;%(AdditionalIncludeDirectories) - WIN32;NDEBUG;_CONSOLE;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) - MultiThreaded - Level3 - - - %(AdditionalLibraryDirectories) - Console - MachineX86 - - - - - $(IntDir)$(ProjectName).htm - - - X64 - - - .;..\libusb;%(AdditionalIncludeDirectories) - WIN32;NDEBUG;_CONSOLE;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) - MultiThreaded - Level3 - - - %(AdditionalLibraryDirectories) - Console - MachineX64 + + + {349ee8f9-7d25-4909-aaf5-ff3fade72187} false - - - - \ No newline at end of file + diff --git a/msvc/stress_2017.vcxproj b/msvc/stress_2017.vcxproj index 27bfecc..f069e97 100644 --- a/msvc/stress_2017.vcxproj +++ b/msvc/stress_2017.vcxproj @@ -25,146 +25,61 @@ Win32Proj - - Application - Unicode - true - v141 - - - Application - Unicode - v141 - - - Application - Unicode - true - v141 - - + Application Unicode v141 + true - - - - - - - - - - + <_ProjectFileVersion>10.0.30319.1 - $(SolutionDir)..\$(Platform)\$(Configuration)\tests\ - $(SolutionDir)..\$(Platform)\$(Configuration)\tests\$(ProjectName)\ - $(SolutionDir)..\$(Platform)\$(Configuration)\tests\ - $(SolutionDir)..\$(Platform)\$(Configuration)\tests\$(ProjectName)\ - $(SolutionDir)..\$(Platform)\$(Configuration)\tests\ - $(SolutionDir)..\$(Platform)\$(Configuration)\tests\$(ProjectName)\ - $(SolutionDir)..\$(Platform)\$(Configuration)\tests\ - $(SolutionDir)..\$(Platform)\$(Configuration)\tests\$(ProjectName)\ + $(SolutionDir)..\$(Platform)\$(Configuration)\tests\$(ProjectName)\ + $(SolutionDir)..\$(Platform)\$(Configuration)\tests\ - - - $(IntDir)$(ProjectName).htm - + - Disabled .;..\libusb;%(AdditionalIncludeDirectories) - WIN32;_DEBUG;_CONSOLE;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) - true - MultiThreadedDebug + _CONSOLE;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) Level3 + + ProgramDatabase - - - %(AdditionalLibraryDirectories) - true - Console - MachineX86 - - - - - $(IntDir)$(ProjectName).htm - - - X64 - - - Disabled - .;..\libusb;%(AdditionalIncludeDirectories) - WIN32;_DEBUG;_CONSOLE;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) true + Disabled MultiThreadedDebug - Level3 - ProgramDatabase + + + NDEBUG;%(PreprocessorDefinitions) + MultiThreaded - %(AdditionalLibraryDirectories) + $(TargetDir)$(ProjectName).pdb + Console + + true - Console - MachineX64 - - - - - $(IntDir)$(ProjectName).htm - - - .;..\libusb;%(AdditionalIncludeDirectories) - WIN32;NDEBUG;_CONSOLE;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) - MultiThreaded - Level3 - - - %(AdditionalLibraryDirectories) - Console - MachineX86 - - - - - $(IntDir)$(ProjectName).htm - - - X64 - - - .;..\libusb;%(AdditionalIncludeDirectories) - WIN32;NDEBUG;_CONSOLE;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) - MultiThreaded - Level3 - - - %(AdditionalLibraryDirectories) - Console - MachineX64 + + + {349ee8f9-7d25-4909-aaf5-ff3fade72187} false - - - diff --git a/msvc/stress_sources b/msvc/stress_sources new file mode 100644 index 0000000..5bdd2e8 --- /dev/null +++ b/msvc/stress_sources @@ -0,0 +1,21 @@ +TARGETNAME=stress +TARGETTYPE=PROGRAM +386_STDCALL=0 + +_NT_TARGET_VERSION=$(_NT_TARGET_VERSION_WINXP) + +!IFNDEF MSC_WARNING_LEVEL +MSC_WARNING_LEVEL=/W3 +!ENDIF + +!IFDEF STATIC_LIBC +USE_LIBCMT=1 +!ELSE +USE_MSVCRT=1 +!ENDIF + +UMTYPE=console +INCLUDES=..\..\msvc;..\..\libusb;$(DDK_INC_PATH) +UMLIBS=..\..\libusb\os\obj$(BUILD_ALT_DIR)\*\libusb-1.0.lib +SOURCES=..\stress.c \ + ..\testlib.c diff --git a/msvc/testlibusb_2010.vcxproj b/msvc/testlibusb_2010.vcxproj index e8c3f2f..f425e64 100644 --- a/msvc/testlibusb_2010.vcxproj +++ b/msvc/testlibusb_2010.vcxproj @@ -25,129 +25,45 @@ Win32Proj - - Application - Unicode - true - - - Application - Unicode - - - Application - Unicode - true - - + Application Unicode + true - - - - - - - - - - + <_ProjectFileVersion>10.0.30319.1 - $(SolutionDir)..\$(Platform)\$(Configuration)\examples\ - $(SolutionDir)..\$(Platform)\$(Configuration)\examples\$(ProjectName)\ - $(SolutionDir)..\$(Platform)\$(Configuration)\examples\ - $(SolutionDir)..\$(Platform)\$(Configuration)\examples\$(ProjectName)\ - $(SolutionDir)..\$(Platform)\$(Configuration)\examples\ - $(SolutionDir)..\$(Platform)\$(Configuration)\examples\$(ProjectName)\ - $(SolutionDir)..\$(Platform)\$(Configuration)\examples\ - $(SolutionDir)..\$(Platform)\$(Configuration)\examples\$(ProjectName)\ + $(SolutionDir)..\$(Platform)\$(Configuration)\examples\$(ProjectName)\ + $(SolutionDir)..\$(Platform)\$(Configuration)\examples\ - - - $(IntDir)$(ProjectName).htm - + - Disabled ..\libusb;%(AdditionalIncludeDirectories) - WIN32;_DEBUG;_CONSOLE;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) - MultiThreadedDebug + _CONSOLE;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) Level3 + + ProgramDatabase - - - %(AdditionalLibraryDirectories) - true - $(TargetDir)$(ProjectName).pdb - Console - MachineX86 - - - - - $(IntDir)$(ProjectName).htm - - - X64 - - + true Disabled - ..\libusb;%(AdditionalIncludeDirectories) - WIN32;_DEBUG;_CONSOLE;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) MultiThreadedDebug - Level3 - ProgramDatabase + + + NDEBUG;%(PreprocessorDefinitions) + MultiThreaded - %(AdditionalLibraryDirectories) + $(TargetDir)$(ProjectName).pdb + Console + + true - $(TargetDir)$(ProjectName).pdb - Console - MachineX64 - - - - - $(IntDir)$(ProjectName).htm - - - ..\libusb;%(AdditionalIncludeDirectories) - WIN32;NDEBUG;_CONSOLE;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) - MultiThreaded - Level3 - - - %(AdditionalLibraryDirectories) - $(TargetDir)$(ProjectName).pdb - Console - MachineX86 - - - - - $(IntDir)$(ProjectName).htm - - - X64 - - - ..\libusb;%(AdditionalIncludeDirectories) - WIN32;NDEBUG;_CONSOLE;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) - MultiThreaded - Level3 - - - %(AdditionalLibraryDirectories) - $(TargetDir)$(ProjectName).pdb - Console - MachineX64 diff --git a/msvc/testlibusb_2012.vcxproj b/msvc/testlibusb_2012.vcxproj index de43426..19c7266 100644 --- a/msvc/testlibusb_2012.vcxproj +++ b/msvc/testlibusb_2012.vcxproj @@ -25,133 +25,46 @@ Win32Proj - - Application - Unicode - true - v110 - - - Application - Unicode - v110 - - - Application - Unicode - true - v110 - - + Application Unicode v110 + true - - - - - - - - - - + <_ProjectFileVersion>10.0.30319.1 - $(SolutionDir)..\$(Platform)\$(Configuration)\examples\ - $(SolutionDir)..\$(Platform)\$(Configuration)\examples\$(ProjectName)\ - $(SolutionDir)..\$(Platform)\$(Configuration)\examples\ - $(SolutionDir)..\$(Platform)\$(Configuration)\examples\$(ProjectName)\ - $(SolutionDir)..\$(Platform)\$(Configuration)\examples\ - $(SolutionDir)..\$(Platform)\$(Configuration)\examples\$(ProjectName)\ - $(SolutionDir)..\$(Platform)\$(Configuration)\examples\ - $(SolutionDir)..\$(Platform)\$(Configuration)\examples\$(ProjectName)\ + $(SolutionDir)..\$(Platform)\$(Configuration)\examples\$(ProjectName)\ + $(SolutionDir)..\$(Platform)\$(Configuration)\examples\ - - - $(IntDir)$(ProjectName).htm - + - Disabled ..\libusb;%(AdditionalIncludeDirectories) - WIN32;_DEBUG;_CONSOLE;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) - MultiThreadedDebug + _CONSOLE;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) Level3 + + ProgramDatabase - - - %(AdditionalLibraryDirectories) - true - $(TargetDir)$(ProjectName).pdb - Console - MachineX86 - - - - - $(IntDir)$(ProjectName).htm - - - X64 - - + true Disabled - ..\libusb;%(AdditionalIncludeDirectories) - WIN32;_DEBUG;_CONSOLE;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) MultiThreadedDebug - Level3 - ProgramDatabase + + + NDEBUG;%(PreprocessorDefinitions) + MultiThreaded - %(AdditionalLibraryDirectories) + $(TargetDir)$(ProjectName).pdb + Console + + true - $(TargetDir)$(ProjectName).pdb - Console - MachineX64 - - - - - $(IntDir)$(ProjectName).htm - - - ..\libusb;%(AdditionalIncludeDirectories) - WIN32;NDEBUG;_CONSOLE;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) - MultiThreaded - Level3 - - - %(AdditionalLibraryDirectories) - $(TargetDir)$(ProjectName).pdb - Console - MachineX86 - - - - - $(IntDir)$(ProjectName).htm - - - X64 - - - ..\libusb;%(AdditionalIncludeDirectories) - WIN32;NDEBUG;_CONSOLE;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) - MultiThreaded - Level3 - - - %(AdditionalLibraryDirectories) - $(TargetDir)$(ProjectName).pdb - Console - MachineX64 diff --git a/msvc/testlibusb_2013.vcxproj b/msvc/testlibusb_2013.vcxproj index 5526913..91e8269 100644 --- a/msvc/testlibusb_2013.vcxproj +++ b/msvc/testlibusb_2013.vcxproj @@ -25,133 +25,46 @@ Win32Proj - - Application - Unicode - true - v120 - - - Application - Unicode - v120 - - - Application - Unicode - true - v120 - - + Application Unicode v120 + true - - - - - - - - - - + <_ProjectFileVersion>10.0.30319.1 - $(SolutionDir)..\$(Platform)\$(Configuration)\examples\ - $(SolutionDir)..\$(Platform)\$(Configuration)\examples\$(ProjectName)\ - $(SolutionDir)..\$(Platform)\$(Configuration)\examples\ - $(SolutionDir)..\$(Platform)\$(Configuration)\examples\$(ProjectName)\ - $(SolutionDir)..\$(Platform)\$(Configuration)\examples\ - $(SolutionDir)..\$(Platform)\$(Configuration)\examples\$(ProjectName)\ - $(SolutionDir)..\$(Platform)\$(Configuration)\examples\ - $(SolutionDir)..\$(Platform)\$(Configuration)\examples\$(ProjectName)\ + $(SolutionDir)..\$(Platform)\$(Configuration)\examples\$(ProjectName)\ + $(SolutionDir)..\$(Platform)\$(Configuration)\examples\ - - - $(IntDir)$(ProjectName).htm - + - Disabled ..\libusb;%(AdditionalIncludeDirectories) - WIN32;_DEBUG;_CONSOLE;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) - MultiThreadedDebug + _CONSOLE;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) Level3 + + ProgramDatabase - - - %(AdditionalLibraryDirectories) - true - $(TargetDir)$(ProjectName).pdb - Console - MachineX86 - - - - - $(IntDir)$(ProjectName).htm - - - X64 - - + true Disabled - ..\libusb;%(AdditionalIncludeDirectories) - WIN32;_DEBUG;_CONSOLE;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) MultiThreadedDebug - Level3 - ProgramDatabase + + + NDEBUG;%(PreprocessorDefinitions) + MultiThreaded - %(AdditionalLibraryDirectories) + $(TargetDir)$(ProjectName).pdb + Console + + true - $(TargetDir)$(ProjectName).pdb - Console - MachineX64 - - - - - $(IntDir)$(ProjectName).htm - - - ..\libusb;%(AdditionalIncludeDirectories) - WIN32;NDEBUG;_CONSOLE;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) - MultiThreaded - Level3 - - - %(AdditionalLibraryDirectories) - $(TargetDir)$(ProjectName).pdb - Console - MachineX86 - - - - - $(IntDir)$(ProjectName).htm - - - X64 - - - ..\libusb;%(AdditionalIncludeDirectories) - WIN32;NDEBUG;_CONSOLE;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) - MultiThreaded - Level3 - - - %(AdditionalLibraryDirectories) - $(TargetDir)$(ProjectName).pdb - Console - MachineX64 diff --git a/msvc/testlibusb_2015.vcxproj b/msvc/testlibusb_2015.vcxproj index 28eddb8..ff8016f 100644 --- a/msvc/testlibusb_2015.vcxproj +++ b/msvc/testlibusb_2015.vcxproj @@ -25,133 +25,46 @@ Win32Proj - - Application - Unicode - true - v140 - - - Application - Unicode - v140 - - - Application - Unicode - true - v140 - - + Application Unicode v140 + true - - - - - - - - - - + <_ProjectFileVersion>10.0.30319.1 - $(SolutionDir)..\$(Platform)\$(Configuration)\examples\ - $(SolutionDir)..\$(Platform)\$(Configuration)\examples\$(ProjectName)\ - $(SolutionDir)..\$(Platform)\$(Configuration)\examples\ - $(SolutionDir)..\$(Platform)\$(Configuration)\examples\$(ProjectName)\ - $(SolutionDir)..\$(Platform)\$(Configuration)\examples\ - $(SolutionDir)..\$(Platform)\$(Configuration)\examples\$(ProjectName)\ - $(SolutionDir)..\$(Platform)\$(Configuration)\examples\ - $(SolutionDir)..\$(Platform)\$(Configuration)\examples\$(ProjectName)\ + $(SolutionDir)..\$(Platform)\$(Configuration)\examples\$(ProjectName)\ + $(SolutionDir)..\$(Platform)\$(Configuration)\examples\ - - - $(IntDir)$(ProjectName).htm - + - Disabled ..\libusb;%(AdditionalIncludeDirectories) - WIN32;_DEBUG;_CONSOLE;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) - MultiThreadedDebug + _CONSOLE;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) Level3 + + ProgramDatabase - - - %(AdditionalLibraryDirectories) - true - $(TargetDir)$(ProjectName).pdb - Console - MachineX86 - - - - - $(IntDir)$(ProjectName).htm - - - X64 - - + true Disabled - ..\libusb;%(AdditionalIncludeDirectories) - WIN32;_DEBUG;_CONSOLE;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) MultiThreadedDebug - Level3 - ProgramDatabase + + + NDEBUG;%(PreprocessorDefinitions) + MultiThreaded - %(AdditionalLibraryDirectories) + $(TargetDir)$(ProjectName).pdb + Console + + true - $(TargetDir)$(ProjectName).pdb - Console - MachineX64 - - - - - $(IntDir)$(ProjectName).htm - - - ..\libusb;%(AdditionalIncludeDirectories) - WIN32;NDEBUG;_CONSOLE;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) - MultiThreaded - Level3 - - - %(AdditionalLibraryDirectories) - $(TargetDir)$(ProjectName).pdb - Console - MachineX86 - - - - - $(IntDir)$(ProjectName).htm - - - X64 - - - ..\libusb;%(AdditionalIncludeDirectories) - WIN32;NDEBUG;_CONSOLE;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) - MultiThreaded - Level3 - - - %(AdditionalLibraryDirectories) - $(TargetDir)$(ProjectName).pdb - Console - MachineX64 diff --git a/msvc/testlibusb_2017.vcxproj b/msvc/testlibusb_2017.vcxproj index 34c2aeb..5f69d07 100644 --- a/msvc/testlibusb_2017.vcxproj +++ b/msvc/testlibusb_2017.vcxproj @@ -25,133 +25,46 @@ Win32Proj - - Application - Unicode - true - v141 - - - Application - Unicode - v141 - - - Application - Unicode - true - v141 - - + Application Unicode v141 + true - - - - - - - - - - + <_ProjectFileVersion>10.0.30319.1 - $(SolutionDir)..\$(Platform)\$(Configuration)\examples\ - $(SolutionDir)..\$(Platform)\$(Configuration)\examples\$(ProjectName)\ - $(SolutionDir)..\$(Platform)\$(Configuration)\examples\ - $(SolutionDir)..\$(Platform)\$(Configuration)\examples\$(ProjectName)\ - $(SolutionDir)..\$(Platform)\$(Configuration)\examples\ - $(SolutionDir)..\$(Platform)\$(Configuration)\examples\$(ProjectName)\ - $(SolutionDir)..\$(Platform)\$(Configuration)\examples\ - $(SolutionDir)..\$(Platform)\$(Configuration)\examples\$(ProjectName)\ + $(SolutionDir)..\$(Platform)\$(Configuration)\examples\$(ProjectName)\ + $(SolutionDir)..\$(Platform)\$(Configuration)\examples\ - - - $(IntDir)$(ProjectName).htm - + - Disabled ..\libusb;%(AdditionalIncludeDirectories) - WIN32;_DEBUG;_CONSOLE;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) - MultiThreadedDebug + _CONSOLE;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) Level3 + + ProgramDatabase - - - %(AdditionalLibraryDirectories) - true - $(TargetDir)$(ProjectName).pdb - Console - MachineX86 - - - - - $(IntDir)$(ProjectName).htm - - - X64 - - + true Disabled - ..\libusb;%(AdditionalIncludeDirectories) - WIN32;_DEBUG;_CONSOLE;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) MultiThreadedDebug - Level3 - ProgramDatabase + + + NDEBUG;%(PreprocessorDefinitions) + MultiThreaded - %(AdditionalLibraryDirectories) + $(TargetDir)$(ProjectName).pdb + Console + + true - $(TargetDir)$(ProjectName).pdb - Console - MachineX64 - - - - - $(IntDir)$(ProjectName).htm - - - ..\libusb;%(AdditionalIncludeDirectories) - WIN32;NDEBUG;_CONSOLE;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) - MultiThreaded - Level3 - - - %(AdditionalLibraryDirectories) - $(TargetDir)$(ProjectName).pdb - Console - MachineX86 - - - - - $(IntDir)$(ProjectName).htm - - - X64 - - - ..\libusb;%(AdditionalIncludeDirectories) - WIN32;NDEBUG;_CONSOLE;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) - MultiThreaded - Level3 - - - %(AdditionalLibraryDirectories) - $(TargetDir)$(ProjectName).pdb - Console - MachineX64 diff --git a/msvc/testlibusb_sources b/msvc/testlibusb_sources new file mode 100644 index 0000000..9b96ebe --- /dev/null +++ b/msvc/testlibusb_sources @@ -0,0 +1,20 @@ +TARGETNAME=testlibusb +TARGETTYPE=PROGRAM +386_STDCALL=0 + +_NT_TARGET_VERSION=$(_NT_TARGET_VERSION_WINXP) + +!IFNDEF MSC_WARNING_LEVEL +MSC_WARNING_LEVEL=/W3 +!ENDIF + +!IFDEF STATIC_LIBC +USE_LIBCMT=1 +!ELSE +USE_MSVCRT=1 +!ENDIF + +UMTYPE=console +INCLUDES=..\..\msvc;..\..\libusb;$(DDK_INC_PATH) +UMLIBS=..\..\libusb\os\obj$(BUILD_ALT_DIR)\*\libusb-1.0.lib +SOURCES=..\testlibusb.c diff --git a/msvc/xusb_2010.vcxproj b/msvc/xusb_2010.vcxproj index b66c85f..e7f5fe4 100644 --- a/msvc/xusb_2010.vcxproj +++ b/msvc/xusb_2010.vcxproj @@ -25,127 +25,45 @@ Win32Proj - - Application - Unicode - true - - - Application - Unicode - - - Application - Unicode - true - - + Application Unicode + true - - - - - - - - - - + <_ProjectFileVersion>10.0.30319.1 - $(SolutionDir)..\$(Platform)\$(Configuration)\examples\ - $(SolutionDir)..\$(Platform)\$(Configuration)\examples\$(ProjectName)\ - $(SolutionDir)..\$(Platform)\$(Configuration)\examples\ - $(SolutionDir)..\$(Platform)\$(Configuration)\examples\$(ProjectName)\ - $(SolutionDir)..\$(Platform)\$(Configuration)\examples\ - $(SolutionDir)..\$(Platform)\$(Configuration)\examples\$(ProjectName)\ - $(SolutionDir)..\$(Platform)\$(Configuration)\examples\ - $(SolutionDir)..\$(Platform)\$(Configuration)\examples\$(ProjectName)\ + $(SolutionDir)..\$(Platform)\$(Configuration)\examples\$(ProjectName)\ + $(SolutionDir)..\$(Platform)\$(Configuration)\examples\ - - - $(IntDir)$(ProjectName).htm - + + ..\libusb;%(AdditionalIncludeDirectories) + _CONSOLE;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) + Level3 + + + ProgramDatabase Disabled - .;..\libusb;%(AdditionalIncludeDirectories) - WIN32;_DEBUG;_CONSOLE;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) true MultiThreadedDebug - Level3 - ProgramDatabase - - %(AdditionalLibraryDirectories) - true - Console - MachineX86 - - - - - $(IntDir)$(ProjectName).htm - - - X64 - - - Disabled - .;..\libusb;%(AdditionalIncludeDirectories) - WIN32;_DEBUG;_CONSOLE;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) - true - MultiThreadedDebug - Level3 - ProgramDatabase - - - %(AdditionalLibraryDirectories) - true - Console - MachineX64 - - - - - $(IntDir)$(ProjectName).htm - - - .;..\libusb;%(AdditionalIncludeDirectories) - WIN32;NDEBUG;_CONSOLE;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) + + NDEBUG;%(PreprocessorDefinitions) MultiThreaded - Level3 - %(AdditionalLibraryDirectories) + $(TargetDir)$(ProjectName).pdb Console - MachineX86 - - - - $(IntDir)$(ProjectName).htm - - - X64 - - - .;..\libusb;%(AdditionalIncludeDirectories) - WIN32;NDEBUG;_CONSOLE;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) - MultiThreaded - Level3 - - - %(AdditionalLibraryDirectories) - Console - MachineX64 + + true @@ -160,4 +78,4 @@ - \ No newline at end of file + diff --git a/msvc/xusb_2010.vcxproj.filters b/msvc/xusb_2010.vcxproj.filters deleted file mode 100644 index 22c76f7..0000000 --- a/msvc/xusb_2010.vcxproj.filters +++ /dev/null @@ -1,14 +0,0 @@ - - - - - {4FC737F1-C7A5-4376-A066-2A32D752A2FF} - cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx - - - - - Source Files - - - \ No newline at end of file diff --git a/msvc/xusb_2012.vcxproj b/msvc/xusb_2012.vcxproj index 77e7a06..4234eaf 100644 --- a/msvc/xusb_2012.vcxproj +++ b/msvc/xusb_2012.vcxproj @@ -25,131 +25,46 @@ Win32Proj - - Application - Unicode - true - v110 - - - Application - Unicode - v110 - - - Application - Unicode - true - v110 - - + Application Unicode v110 + true - - - - - - - - - - + <_ProjectFileVersion>10.0.30319.1 - $(SolutionDir)..\$(Platform)\$(Configuration)\examples\ - $(SolutionDir)..\$(Platform)\$(Configuration)\examples\$(ProjectName)\ - $(SolutionDir)..\$(Platform)\$(Configuration)\examples\ - $(SolutionDir)..\$(Platform)\$(Configuration)\examples\$(ProjectName)\ - $(SolutionDir)..\$(Platform)\$(Configuration)\examples\ - $(SolutionDir)..\$(Platform)\$(Configuration)\examples\$(ProjectName)\ - $(SolutionDir)..\$(Platform)\$(Configuration)\examples\ - $(SolutionDir)..\$(Platform)\$(Configuration)\examples\$(ProjectName)\ + $(SolutionDir)..\$(Platform)\$(Configuration)\examples\$(ProjectName)\ + $(SolutionDir)..\$(Platform)\$(Configuration)\examples\ - - - $(IntDir)$(ProjectName).htm - + + ..\libusb;%(AdditionalIncludeDirectories) + _CONSOLE;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) + Level3 + + + ProgramDatabase Disabled - .;..\libusb;%(AdditionalIncludeDirectories) - WIN32;_DEBUG;_CONSOLE;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) true MultiThreadedDebug - Level3 - ProgramDatabase - - %(AdditionalLibraryDirectories) - true - Console - MachineX86 - - - - - $(IntDir)$(ProjectName).htm - - - X64 - - - Disabled - .;..\libusb;%(AdditionalIncludeDirectories) - WIN32;_DEBUG;_CONSOLE;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) - true - MultiThreadedDebug - Level3 - ProgramDatabase - - - %(AdditionalLibraryDirectories) - true - Console - MachineX64 - - - - - $(IntDir)$(ProjectName).htm - - - .;..\libusb;%(AdditionalIncludeDirectories) - WIN32;NDEBUG;_CONSOLE;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) + + NDEBUG;%(PreprocessorDefinitions) MultiThreaded - Level3 - %(AdditionalLibraryDirectories) + $(TargetDir)$(ProjectName).pdb Console - MachineX86 - - - - $(IntDir)$(ProjectName).htm - - - X64 - - - .;..\libusb;%(AdditionalIncludeDirectories) - WIN32;NDEBUG;_CONSOLE;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) - MultiThreaded - Level3 - - - %(AdditionalLibraryDirectories) - Console - MachineX64 + + true @@ -164,4 +79,4 @@ - \ No newline at end of file + diff --git a/msvc/xusb_2012.vcxproj.filters b/msvc/xusb_2012.vcxproj.filters deleted file mode 100644 index 22c76f7..0000000 --- a/msvc/xusb_2012.vcxproj.filters +++ /dev/null @@ -1,14 +0,0 @@ - - - - - {4FC737F1-C7A5-4376-A066-2A32D752A2FF} - cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx - - - - - Source Files - - - \ No newline at end of file diff --git a/msvc/xusb_2013.vcxproj b/msvc/xusb_2013.vcxproj index 5b68b62..579951e 100644 --- a/msvc/xusb_2013.vcxproj +++ b/msvc/xusb_2013.vcxproj @@ -25,131 +25,46 @@ Win32Proj - - Application - Unicode - true - v120 - - - Application - Unicode - v120 - - - Application - Unicode - true - v120 - - + Application Unicode v120 + true - - - - - - - - - - + <_ProjectFileVersion>10.0.30319.1 - $(SolutionDir)..\$(Platform)\$(Configuration)\examples\ - $(SolutionDir)..\$(Platform)\$(Configuration)\examples\$(ProjectName)\ - $(SolutionDir)..\$(Platform)\$(Configuration)\examples\ - $(SolutionDir)..\$(Platform)\$(Configuration)\examples\$(ProjectName)\ - $(SolutionDir)..\$(Platform)\$(Configuration)\examples\ - $(SolutionDir)..\$(Platform)\$(Configuration)\examples\$(ProjectName)\ - $(SolutionDir)..\$(Platform)\$(Configuration)\examples\ - $(SolutionDir)..\$(Platform)\$(Configuration)\examples\$(ProjectName)\ + $(SolutionDir)..\$(Platform)\$(Configuration)\examples\$(ProjectName)\ + $(SolutionDir)..\$(Platform)\$(Configuration)\examples\ - - - $(IntDir)$(ProjectName).htm - + + ..\libusb;%(AdditionalIncludeDirectories) + _CONSOLE;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) + Level3 + + + ProgramDatabase Disabled - .;..\libusb;%(AdditionalIncludeDirectories) - WIN32;_DEBUG;_CONSOLE;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) true MultiThreadedDebug - Level3 - ProgramDatabase - - %(AdditionalLibraryDirectories) - true - Console - MachineX86 - - - - - $(IntDir)$(ProjectName).htm - - - X64 - - - Disabled - .;..\libusb;%(AdditionalIncludeDirectories) - WIN32;_DEBUG;_CONSOLE;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) - true - MultiThreadedDebug - Level3 - ProgramDatabase - - - %(AdditionalLibraryDirectories) - true - Console - MachineX64 - - - - - $(IntDir)$(ProjectName).htm - - - .;..\libusb;%(AdditionalIncludeDirectories) - WIN32;NDEBUG;_CONSOLE;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) + + NDEBUG;%(PreprocessorDefinitions) MultiThreaded - Level3 - %(AdditionalLibraryDirectories) + $(TargetDir)$(ProjectName).pdb Console - MachineX86 - - - - $(IntDir)$(ProjectName).htm - - - X64 - - - .;..\libusb;%(AdditionalIncludeDirectories) - WIN32;NDEBUG;_CONSOLE;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) - MultiThreaded - Level3 - - - %(AdditionalLibraryDirectories) - Console - MachineX64 + + true @@ -164,4 +79,4 @@ - \ No newline at end of file + diff --git a/msvc/xusb_2015.vcxproj b/msvc/xusb_2015.vcxproj index a48079b..78b84bf 100644 --- a/msvc/xusb_2015.vcxproj +++ b/msvc/xusb_2015.vcxproj @@ -25,131 +25,46 @@ Win32Proj - - Application - Unicode - true - v140 - - - Application - Unicode - v140 - - - Application - Unicode - true - v140 - - + Application Unicode v140 + true - - - - - - - - - - + <_ProjectFileVersion>10.0.30319.1 - $(SolutionDir)..\$(Platform)\$(Configuration)\examples\ - $(SolutionDir)..\$(Platform)\$(Configuration)\examples\$(ProjectName)\ - $(SolutionDir)..\$(Platform)\$(Configuration)\examples\ - $(SolutionDir)..\$(Platform)\$(Configuration)\examples\$(ProjectName)\ - $(SolutionDir)..\$(Platform)\$(Configuration)\examples\ - $(SolutionDir)..\$(Platform)\$(Configuration)\examples\$(ProjectName)\ - $(SolutionDir)..\$(Platform)\$(Configuration)\examples\ - $(SolutionDir)..\$(Platform)\$(Configuration)\examples\$(ProjectName)\ + $(SolutionDir)..\$(Platform)\$(Configuration)\examples\$(ProjectName)\ + $(SolutionDir)..\$(Platform)\$(Configuration)\examples\ - - - $(IntDir)$(ProjectName).htm - + + ..\libusb;%(AdditionalIncludeDirectories) + _CONSOLE;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) + Level3 + + + ProgramDatabase Disabled - .;..\libusb;%(AdditionalIncludeDirectories) - WIN32;_DEBUG;_CONSOLE;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) true MultiThreadedDebug - Level3 - ProgramDatabase - - %(AdditionalLibraryDirectories) - true - Console - MachineX86 - - - - - $(IntDir)$(ProjectName).htm - - - X64 - - - Disabled - .;..\libusb;%(AdditionalIncludeDirectories) - WIN32;_DEBUG;_CONSOLE;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) - true - MultiThreadedDebug - Level3 - ProgramDatabase - - - %(AdditionalLibraryDirectories) - true - Console - MachineX64 - - - - - $(IntDir)$(ProjectName).htm - - - .;..\libusb;%(AdditionalIncludeDirectories) - WIN32;NDEBUG;_CONSOLE;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) + + NDEBUG;%(PreprocessorDefinitions) MultiThreaded - Level3 - %(AdditionalLibraryDirectories) + $(TargetDir)$(ProjectName).pdb Console - MachineX86 - - - - $(IntDir)$(ProjectName).htm - - - X64 - - - .;..\libusb;%(AdditionalIncludeDirectories) - WIN32;NDEBUG;_CONSOLE;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) - MultiThreaded - Level3 - - - %(AdditionalLibraryDirectories) - Console - MachineX64 + + true @@ -164,4 +79,4 @@ - \ No newline at end of file + diff --git a/msvc/xusb_2017.vcxproj b/msvc/xusb_2017.vcxproj index d3a6c01..e2ac4c6 100644 --- a/msvc/xusb_2017.vcxproj +++ b/msvc/xusb_2017.vcxproj @@ -25,131 +25,46 @@ Win32Proj - - Application - Unicode - true - v141 - - - Application - Unicode - v141 - - - Application - Unicode - true - v141 - - + Application Unicode v141 + true - - - - - - - - - - + <_ProjectFileVersion>10.0.30319.1 - $(SolutionDir)..\$(Platform)\$(Configuration)\examples\ - $(SolutionDir)..\$(Platform)\$(Configuration)\examples\$(ProjectName)\ - $(SolutionDir)..\$(Platform)\$(Configuration)\examples\ - $(SolutionDir)..\$(Platform)\$(Configuration)\examples\$(ProjectName)\ - $(SolutionDir)..\$(Platform)\$(Configuration)\examples\ - $(SolutionDir)..\$(Platform)\$(Configuration)\examples\$(ProjectName)\ - $(SolutionDir)..\$(Platform)\$(Configuration)\examples\ - $(SolutionDir)..\$(Platform)\$(Configuration)\examples\$(ProjectName)\ + $(SolutionDir)..\$(Platform)\$(Configuration)\examples\$(ProjectName)\ + $(SolutionDir)..\$(Platform)\$(Configuration)\examples\ - - - $(IntDir)$(ProjectName).htm - + + ..\libusb;%(AdditionalIncludeDirectories) + _CONSOLE;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) + Level3 + + + ProgramDatabase Disabled - .;..\libusb;%(AdditionalIncludeDirectories) - WIN32;_DEBUG;_CONSOLE;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) true MultiThreadedDebug - Level3 - ProgramDatabase - - %(AdditionalLibraryDirectories) - true - Console - MachineX86 - - - - - $(IntDir)$(ProjectName).htm - - - X64 - - - Disabled - .;..\libusb;%(AdditionalIncludeDirectories) - WIN32;_DEBUG;_CONSOLE;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) - true - MultiThreadedDebug - Level3 - ProgramDatabase - - - %(AdditionalLibraryDirectories) - true - Console - MachineX64 - - - - - $(IntDir)$(ProjectName).htm - - - .;..\libusb;%(AdditionalIncludeDirectories) - WIN32;NDEBUG;_CONSOLE;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) + + NDEBUG;%(PreprocessorDefinitions) MultiThreaded - Level3 - %(AdditionalLibraryDirectories) + $(TargetDir)$(ProjectName).pdb Console - MachineX86 - - - - $(IntDir)$(ProjectName).htm - - - X64 - - - .;..\libusb;%(AdditionalIncludeDirectories) - WIN32;NDEBUG;_CONSOLE;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) - MultiThreaded - Level3 - - - %(AdditionalLibraryDirectories) - Console - MachineX64 + + true diff --git a/msvc/xusb_sources b/msvc/xusb_sources index b43f94f..8b87492 100644 --- a/msvc/xusb_sources +++ b/msvc/xusb_sources @@ -2,7 +2,7 @@ TARGETNAME=xusb TARGETTYPE=PROGRAM 386_STDCALL=0 -_NT_TARGET_VERSION= $(_NT_TARGET_VERSION_WINXP) +_NT_TARGET_VERSION=$(_NT_TARGET_VERSION_WINXP) !IFNDEF MSC_WARNING_LEVEL MSC_WARNING_LEVEL=/W3