From 7e858a3408e71a7aa24327e80e495b57f0b8b999 Mon Sep 17 00:00:00 2001 From: Pete Batard Date: Wed, 15 May 2013 17:39:47 +0200 Subject: Add hotplugtest to msvc project files --- libusb/Makefile.am | 3 +- libusb/libusb-1.0.def | 4 + libusb/version_nano.h | 2 +- msvc/ddk_build.cmd | 24 ++++- msvc/hotplugtest_2010.vcxproj | 163 +++++++++++++++++++++++++++++++ msvc/hotplugtest_2010.vcxproj.filters | 14 +++ msvc/hotplugtest_2012.vcxproj | 167 ++++++++++++++++++++++++++++++++ msvc/hotplugtest_2012.vcxproj.filters | 14 +++ msvc/hotplugtest_sources | 20 ++++ msvc/libusb_dll_2005.vcproj | 8 ++ msvc/libusb_dll_2010.vcxproj | 2 + msvc/libusb_dll_2010.vcxproj.filters | 6 ++ msvc/libusb_dll_2012.vcxproj | 4 + msvc/libusb_dll_2012.vcxproj.filters | 12 +++ msvc/libusb_sources | 1 + msvc/libusb_static_2005.vcproj | 8 ++ msvc/libusb_static_2010.vcxproj | 4 + msvc/libusb_static_2010.vcxproj.filters | 12 +++ msvc/libusb_static_2012.vcxproj | 4 + msvc/libusb_static_2012.vcxproj.filters | 12 +++ msvc/libusbx_2010.sln | 10 ++ msvc/libusbx_2012.sln | 10 ++ 22 files changed, 499 insertions(+), 5 deletions(-) create mode 100644 msvc/hotplugtest_2010.vcxproj create mode 100644 msvc/hotplugtest_2010.vcxproj.filters create mode 100644 msvc/hotplugtest_2012.vcxproj create mode 100644 msvc/hotplugtest_2012.vcxproj.filters create mode 100644 msvc/hotplugtest_sources diff --git a/libusb/Makefile.am b/libusb/Makefile.am index dfee89a..c5e3387 100644 --- a/libusb/Makefile.am +++ b/libusb/Makefile.am @@ -5,7 +5,7 @@ lib_LTLIBRARIES = libusb-1.0.la LINUX_USBFS_SRC = os/linux_usbfs.c DARWIN_USB_SRC = os/darwin_usb.c OPENBSD_USB_SRC = os/openbsd_usb.c -WINDOWS_USB_SRC = os/poll_windows.c os/windows_usb.c libusb-1.0.rc +WINDOWS_USB_SRC = os/poll_windows.c os/windows_usb.c libusb-1.0.rc libusb-1.0.def WINCE_USB_SRC = os/wince_usb.c os/wince_usb.h EXTRA_DIST = $(LINUX_USBFS_SRC) $(DARWIN_USB_SRC) $(OPENBSD_USB_SRC) \ @@ -47,7 +47,6 @@ if CREATE_IMPORT_LIB $(AM_V_GEN)$(DLLTOOL) $(DLLTOOLFLAGS) --kill-at --input-def $(srcdir)/libusb-1.0.def --dllname $@ --output-lib .libs/$@.a endif - if THREADS_POSIX THREADS_SRC = os/threads_posix.h os/threads_posix.c else diff --git a/libusb/libusb-1.0.def b/libusb/libusb-1.0.def index 3aba343..1c25eae 100644 --- a/libusb/libusb-1.0.def +++ b/libusb/libusb-1.0.def @@ -82,6 +82,10 @@ EXPORTS libusb_handle_events_timeout_completed@12 = libusb_handle_events_timeout_completed libusb_has_capability libusb_has_capability@4 = libusb_has_capability + libusb_hotplug_deregister_callback + libusb_hotplug_deregister_callback@8 = libusb_hotplug_deregister_callback + libusb_hotplug_register_callback + libusb_hotplug_register_callback@36 = libusb_hotplug_register_callback libusb_init libusb_init@4 = libusb_init libusb_interrupt_transfer diff --git a/libusb/version_nano.h b/libusb/version_nano.h index 1e793fa..cc41c8e 100644 --- a/libusb/version_nano.h +++ b/libusb/version_nano.h @@ -1 +1 @@ -#define LIBUSB_NANO 10669 +#define LIBUSB_NANO 10670 diff --git a/msvc/ddk_build.cmd b/msvc/ddk_build.cmd index a68b5e2..aadab50 100644 --- a/msvc/ddk_build.cmd +++ b/msvc/ddk_build.cmd @@ -120,9 +120,9 @@ copy ..\..\..\msvc\getopt_sources sources >NUL 2>&1 if errorlevel 1 goto builderror cd ..\..\.. -if exist examples\fxload_ddkbuild goto md8 +if exist examples\fxload_ddkbuild goto md10 md examples\fxload_ddkbuild -:md8 +:md10 cd examples\fxload_ddkbuild copy ..\..\msvc\fxload_sources sources >NUL 2>&1 @@ -140,6 +140,26 @@ copy %srcPath%\fxload.pdb %dstPath%\examples @echo off +if exist examples\hotplugtest_ddkbuild goto md11 +md examples\hotplugtest_ddkbuild +:md11 + +cd examples\hotplugtest_ddkbuild +copy ..\..\msvc\hotplugtest_sources sources >NUL 2>&1 +@echo on +%BUILD_CMD% +@echo off +if errorlevel 1 goto builderror +cd ..\.. + +set srcPath=examples\hotplugtest_ddkbuild\obj%BUILD_ALT_DIR%\%cpudir% +@echo on + +copy %srcPath%\hotplugtest.exe %dstPath%\examples +copy %srcPath%\hotplugtest.pdb %dstPath%\examples + +@echo off + cd msvc goto done diff --git a/msvc/hotplugtest_2010.vcxproj b/msvc/hotplugtest_2010.vcxproj new file mode 100644 index 0000000..90584ed --- /dev/null +++ b/msvc/hotplugtest_2010.vcxproj @@ -0,0 +1,163 @@ + + + + + Debug + Win32 + + + Debug + x64 + + + Release + Win32 + + + Release + x64 + + + + hotplugtest + {99D2AC64-DC66-4422-91CE-6715C403C9E5} + examples + Win32Proj + + + + Application + Unicode + true + + + Application + Unicode + + + Application + Unicode + true + + + Application + Unicode + + + + + + + + + + + + + + + + + + + <_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)\ + + + + $(IntDir)$(ProjectName).htm + + + 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) + 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/hotplugtest_2010.vcxproj.filters b/msvc/hotplugtest_2010.vcxproj.filters new file mode 100644 index 0000000..1c9a880 --- /dev/null +++ b/msvc/hotplugtest_2010.vcxproj.filters @@ -0,0 +1,14 @@ + + + + + {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 new file mode 100644 index 0000000..9045585 --- /dev/null +++ b/msvc/hotplugtest_2012.vcxproj @@ -0,0 +1,167 @@ + + + + + Debug + Win32 + + + Debug + x64 + + + Release + Win32 + + + Release + x64 + + + + hotplugtest + {99D2AC64-DC66-4422-91CE-6715C403C9E5} + examples + Win32Proj + + + + Application + Unicode + true + v110 + + + Application + Unicode + v110 + + + Application + Unicode + true + v110 + + + Application + Unicode + v110 + + + + + + + + + + + + + + + + + + + <_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)\ + + + + $(IntDir)$(ProjectName).htm + + + 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) + 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/hotplugtest_2012.vcxproj.filters b/msvc/hotplugtest_2012.vcxproj.filters new file mode 100644 index 0000000..1c9a880 --- /dev/null +++ b/msvc/hotplugtest_2012.vcxproj.filters @@ -0,0 +1,14 @@ + + + + + {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_sources b/msvc/hotplugtest_sources new file mode 100644 index 0000000..1b27cad --- /dev/null +++ b/msvc/hotplugtest_sources @@ -0,0 +1,20 @@ +TARGETNAME=hotplugtest +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=..\hotplugtest.c diff --git a/msvc/libusb_dll_2005.vcproj b/msvc/libusb_dll_2005.vcproj index 976f664..9a8f6c3 100644 --- a/msvc/libusb_dll_2005.vcproj +++ b/msvc/libusb_dll_2005.vcproj @@ -349,6 +349,10 @@ RelativePath="..\libusb\descriptor.c" > + + @@ -379,6 +383,10 @@ RelativePath=".\config.h" > + + diff --git a/msvc/libusb_dll_2010.vcxproj b/msvc/libusb_dll_2010.vcxproj index 707f458..7648e57 100644 --- a/msvc/libusb_dll_2010.vcxproj +++ b/msvc/libusb_dll_2010.vcxproj @@ -140,6 +140,7 @@ + @@ -148,6 +149,7 @@ + diff --git a/msvc/libusb_dll_2010.vcxproj.filters b/msvc/libusb_dll_2010.vcxproj.filters index 575bc4f..40281f1 100644 --- a/msvc/libusb_dll_2010.vcxproj.filters +++ b/msvc/libusb_dll_2010.vcxproj.filters @@ -20,6 +20,9 @@ Source Files + + Source Files + Source Files @@ -40,6 +43,9 @@ Header Files + + Header Files + Header Files diff --git a/msvc/libusb_dll_2012.vcxproj b/msvc/libusb_dll_2012.vcxproj index 3533fbf..5920895 100644 --- a/msvc/libusb_dll_2012.vcxproj +++ b/msvc/libusb_dll_2012.vcxproj @@ -144,6 +144,7 @@ + @@ -151,6 +152,9 @@ + + + diff --git a/msvc/libusb_dll_2012.vcxproj.filters b/msvc/libusb_dll_2012.vcxproj.filters index 3dacb2c..fff52f0 100644 --- a/msvc/libusb_dll_2012.vcxproj.filters +++ b/msvc/libusb_dll_2012.vcxproj.filters @@ -35,6 +35,9 @@ Source Files + + Source Files + @@ -55,6 +58,15 @@ Header Files + + Header Files + + + Header Files + + + Header Files + diff --git a/msvc/libusb_sources b/msvc/libusb_sources index 8e8e65c..ca9bed8 100644 --- a/msvc/libusb_sources +++ b/msvc/libusb_sources @@ -30,6 +30,7 @@ SOURCES=..\core.c \ ..\descriptor.c \ ..\io.c \ ..\sync.c \ + ..\hotplug.c \ threads_windows.c \ poll_windows.c \ windows_usb.c \ diff --git a/msvc/libusb_static_2005.vcproj b/msvc/libusb_static_2005.vcproj index 1d41004..68c9e2c 100644 --- a/msvc/libusb_static_2005.vcproj +++ b/msvc/libusb_static_2005.vcproj @@ -289,6 +289,10 @@ RelativePath="..\libusb\descriptor.c" > + + @@ -319,6 +323,10 @@ RelativePath=".\config.h" > + + diff --git a/msvc/libusb_static_2010.vcxproj b/msvc/libusb_static_2010.vcxproj index 0c445a4..37ee80c 100644 --- a/msvc/libusb_static_2010.vcxproj +++ b/msvc/libusb_static_2010.vcxproj @@ -130,6 +130,7 @@ + @@ -138,6 +139,9 @@ + + + diff --git a/msvc/libusb_static_2010.vcxproj.filters b/msvc/libusb_static_2010.vcxproj.filters index 39dc64e..74a29cd 100644 --- a/msvc/libusb_static_2010.vcxproj.filters +++ b/msvc/libusb_static_2010.vcxproj.filters @@ -32,6 +32,9 @@ Source Files + + Source Files + @@ -55,5 +58,14 @@ 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 a8a6bdc..7baa2ae 100644 --- a/msvc/libusb_static_2012.vcxproj +++ b/msvc/libusb_static_2012.vcxproj @@ -134,6 +134,7 @@ + @@ -141,6 +142,9 @@ + + + diff --git a/msvc/libusb_static_2012.vcxproj.filters b/msvc/libusb_static_2012.vcxproj.filters index 39dc64e..74a29cd 100644 --- a/msvc/libusb_static_2012.vcxproj.filters +++ b/msvc/libusb_static_2012.vcxproj.filters @@ -32,6 +32,9 @@ Source Files + + Source Files + @@ -55,5 +58,14 @@ Header Files + + Header Files + + + Header Files + + + Header Files + \ No newline at end of file diff --git a/msvc/libusbx_2010.sln b/msvc/libusbx_2010.sln index 18ace7a..257eee0 100644 --- a/msvc/libusbx_2010.sln +++ b/msvc/libusbx_2010.sln @@ -17,6 +17,8 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "getopt", "getopt_2010.vcxpr EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "stress", "stress_2010.vcxproj", "{53942EFF-C810-458D-B3CB-EE5CE9F1E781}" EndProject +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "hotplugtest", "hotplugtest_2010.vcxproj", "{99D2AC64-DC66-4422-91CE-6715C403C9E5}" +EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution Debug|Win32 = Debug|Win32 @@ -77,6 +79,14 @@ Global {53942EFF-C810-458D-B3CB-EE5CE9F1E781}.Release|Win32.Build.0 = Release|Win32 {53942EFF-C810-458D-B3CB-EE5CE9F1E781}.Release|x64.ActiveCfg = Release|x64 {53942EFF-C810-458D-B3CB-EE5CE9F1E781}.Release|x64.Build.0 = Release|x64 + {99D2AC64-DC66-4422-91CE-6715C403C9E5}.Debug|Win32.ActiveCfg = Debug|Win32 + {99D2AC64-DC66-4422-91CE-6715C403C9E5}.Debug|Win32.Build.0 = Debug|Win32 + {99D2AC64-DC66-4422-91CE-6715C403C9E5}.Debug|x64.ActiveCfg = Debug|x64 + {99D2AC64-DC66-4422-91CE-6715C403C9E5}.Debug|x64.Build.0 = Debug|x64 + {99D2AC64-DC66-4422-91CE-6715C403C9E5}.Release|Win32.ActiveCfg = Release|Win32 + {99D2AC64-DC66-4422-91CE-6715C403C9E5}.Release|Win32.Build.0 = Release|Win32 + {99D2AC64-DC66-4422-91CE-6715C403C9E5}.Release|x64.ActiveCfg = Release|x64 + {99D2AC64-DC66-4422-91CE-6715C403C9E5}.Release|x64.Build.0 = Release|x64 EndGlobalSection GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE diff --git a/msvc/libusbx_2012.sln b/msvc/libusbx_2012.sln index 15db5a8..c5c5800 100644 --- a/msvc/libusbx_2012.sln +++ b/msvc/libusbx_2012.sln @@ -17,6 +17,8 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "getopt", "getopt_2012.vcxpr EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "stress", "stress_2012.vcxproj", "{53942EFF-C810-458D-B3CB-EE5CE9F1E781}" EndProject +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "hotplugtest", "hotplugtest_2012.vcxproj", "{99D2AC64-DC66-4422-91CE-6715C403C9E5}" +EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution Debug|Win32 = Debug|Win32 @@ -77,6 +79,14 @@ Global {53942EFF-C810-458D-B3CB-EE5CE9F1E781}.Release|Win32.Build.0 = Release|Win32 {53942EFF-C810-458D-B3CB-EE5CE9F1E781}.Release|x64.ActiveCfg = Release|x64 {53942EFF-C810-458D-B3CB-EE5CE9F1E781}.Release|x64.Build.0 = Release|x64 + {99D2AC64-DC66-4422-91CE-6715C403C9E5}.Debug|Win32.ActiveCfg = Debug|Win32 + {99D2AC64-DC66-4422-91CE-6715C403C9E5}.Debug|Win32.Build.0 = Debug|Win32 + {99D2AC64-DC66-4422-91CE-6715C403C9E5}.Debug|x64.ActiveCfg = Debug|x64 + {99D2AC64-DC66-4422-91CE-6715C403C9E5}.Debug|x64.Build.0 = Debug|x64 + {99D2AC64-DC66-4422-91CE-6715C403C9E5}.Release|Win32.ActiveCfg = Release|Win32 + {99D2AC64-DC66-4422-91CE-6715C403C9E5}.Release|Win32.Build.0 = Release|Win32 + {99D2AC64-DC66-4422-91CE-6715C403C9E5}.Release|x64.ActiveCfg = Release|x64 + {99D2AC64-DC66-4422-91CE-6715C403C9E5}.Release|x64.Build.0 = Release|x64 EndGlobalSection GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE -- cgit v1.2.3