diff options
| -rw-r--r-- | driver-resources_2008.vcproj | 28 | ||||
| -rw-r--r-- | libusb/os/driver_install.c | 4 | ||||
| -rw-r--r-- | libusb_2008.sln | 9 |
3 files changed, 13 insertions, 28 deletions
diff --git a/driver-resources_2008.vcproj b/driver-resources_2008.vcproj index 32c38bc..3dbaa88 100644 --- a/driver-resources_2008.vcproj +++ b/driver-resources_2008.vcproj @@ -22,7 +22,7 @@ Name="Debug|Win32" OutputDirectory="$(SolutionDir)$(PlatformName)\$(ConfigurationName)\lib" IntermediateDirectory="$(SolutionDir)$(PlatformName)\$(ConfigurationName)\lib\driver-resources" - ConfigurationType="1" + ConfigurationType="4" InheritedPropertySheets=".\ddk_directory.vsprops" CharacterSet="2" > @@ -61,17 +61,13 @@ Name="VCPreLinkEventTool" /> <Tool - Name="VCLinkerTool" - GenerateDebugInformation="true" - TargetMachine="1" + Name="VCLibrarianTool" + AdditionalOptions="/MACHINE:X86" /> <Tool Name="VCALinkTool" /> <Tool - Name="VCManifestTool" - /> - <Tool Name="VCXDCMakeTool" /> <Tool @@ -81,9 +77,6 @@ Name="VCFxCopTool" /> <Tool - Name="VCAppVerifierTool" - /> - <Tool Name="VCPostBuildEventTool" /> </Configuration> @@ -91,7 +84,7 @@ Name="Debug|x64" OutputDirectory="$(SolutionDir)$(PlatformName)\$(ConfigurationName)\lib" IntermediateDirectory="$(SolutionDir)$(PlatformName)\$(ConfigurationName)\lib\driver-resources" - ConfigurationType="1" + ConfigurationType="4" InheritedPropertySheets=".\ddk_directory.vsprops" CharacterSet="2" > @@ -131,17 +124,13 @@ Name="VCPreLinkEventTool" /> <Tool - Name="VCLinkerTool" - GenerateDebugInformation="true" - TargetMachine="17" + Name="VCLibrarianTool" + AdditionalOptions="/MACHINE:X86" /> <Tool Name="VCALinkTool" /> <Tool - Name="VCManifestTool" - /> - <Tool Name="VCXDCMakeTool" /> <Tool @@ -151,9 +140,6 @@ Name="VCFxCopTool" /> <Tool - Name="VCAppVerifierTool" - /> - <Tool Name="VCPostBuildEventTool" /> </Configuration> @@ -203,6 +189,7 @@ /> <Tool Name="VCLibrarianTool" + AdditionalOptions="/MACHINE:X86" /> <Tool Name="VCALinkTool" @@ -268,6 +255,7 @@ /> <Tool Name="VCLibrarianTool" + AdditionalOptions="/MACHINE:X86" /> <Tool Name="VCALinkTool" diff --git a/libusb/os/driver_install.c b/libusb/os/driver_install.c index 5c5cc43..f04e78e 100644 --- a/libusb/os/driver_install.c +++ b/libusb/os/driver_install.c @@ -1,8 +1,4 @@ -#if defined(_MSC_VER) -#include <config_msvc.h> -#else #include <config.h> -#endif #include <windows.h> #include <setupapi.h> #include <io.h> diff --git a/libusb_2008.sln b/libusb_2008.sln index e51ad31..00c19fe 100644 --- a/libusb_2008.sln +++ b/libusb_2008.sln @@ -16,6 +16,9 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "xusb", "examples\xusb_2008. EndProjectSection EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "driver-install", "driver-install_2008.vcproj", "{9AA0E745-1A0A-4700-8ECB-6A6DE9DBF8B9}" + ProjectSection(ProjectDependencies) = postProject + {BA852F82-4329-4CBE-82AA-9947FB48AD83} = {BA852F82-4329-4CBE-82AA-9947FB48AD83} + EndProjectSection EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "driver-resources", "driver-resources_2008.vcproj", "{BA852F82-4329-4CBE-82AA-9947FB48AD83}" EndProject @@ -56,15 +59,13 @@ Global {3F3138D0-7AB7-4268-9BF3-1A3EA5503A11}.Release|x64.ActiveCfg = Release|x64 {3F3138D0-7AB7-4268-9BF3-1A3EA5503A11}.Release|x64.Build.0 = Release|x64 {9AA0E745-1A0A-4700-8ECB-6A6DE9DBF8B9}.Debug|Win32.ActiveCfg = Debug|Win32 - {9AA0E745-1A0A-4700-8ECB-6A6DE9DBF8B9}.Debug|Win32.Build.0 = Debug|Win32 - {9AA0E745-1A0A-4700-8ECB-6A6DE9DBF8B9}.Debug|x64.ActiveCfg = Debug|Win32 + {9AA0E745-1A0A-4700-8ECB-6A6DE9DBF8B9}.Debug|x64.ActiveCfg = Debug|x64 {9AA0E745-1A0A-4700-8ECB-6A6DE9DBF8B9}.Release|Win32.ActiveCfg = Release|Win32 {9AA0E745-1A0A-4700-8ECB-6A6DE9DBF8B9}.Release|Win32.Build.0 = Release|Win32 {9AA0E745-1A0A-4700-8ECB-6A6DE9DBF8B9}.Release|x64.ActiveCfg = Release|x64 {9AA0E745-1A0A-4700-8ECB-6A6DE9DBF8B9}.Release|x64.Build.0 = Release|x64 {BA852F82-4329-4CBE-82AA-9947FB48AD83}.Debug|Win32.ActiveCfg = Debug|Win32 - {BA852F82-4329-4CBE-82AA-9947FB48AD83}.Debug|Win32.Build.0 = Debug|Win32 - {BA852F82-4329-4CBE-82AA-9947FB48AD83}.Debug|x64.ActiveCfg = Debug|Win32 + {BA852F82-4329-4CBE-82AA-9947FB48AD83}.Debug|x64.ActiveCfg = Debug|x64 {BA852F82-4329-4CBE-82AA-9947FB48AD83}.Release|Win32.ActiveCfg = Release|Win32 {BA852F82-4329-4CBE-82AA-9947FB48AD83}.Release|Win32.Build.0 = Release|Win32 {BA852F82-4329-4CBE-82AA-9947FB48AD83}.Release|x64.ActiveCfg = Release|x64 |