diff options
-rw-r--r-- | README_MSVC.txt | 6 | ||||
-rw-r--r-- | configure.ac | 4 | ||||
-rw-r--r-- | examples/lsusb_2005.vcproj | 199 | ||||
-rw-r--r-- | examples/lsusb_2008.vcproj (renamed from examples/lsusb.vcproj) | 8 | ||||
-rw-r--r-- | examples/xusb_2005.vcproj | 191 | ||||
-rw-r--r-- | examples/xusb_2008.vcproj (renamed from examples/xusb.vcproj) | 16 | ||||
-rw-r--r-- | libusb-dll_2005.vcproj | 267 | ||||
-rw-r--r-- | libusb-dll_2008.vcproj (renamed from libusb-dll.vcproj) | 18 | ||||
-rw-r--r-- | libusb-static_2005.vcproj | 207 | ||||
-rw-r--r-- | libusb-static_2008.vcproj (renamed from libusb-static.vcproj) | 8 | ||||
-rw-r--r-- | libusb/libusb-1.0.def | 2 | ||||
-rw-r--r-- | libusb_2005.sln | 44 | ||||
-rw-r--r-- | libusb_2008.sln (renamed from libusb.sln) | 12 |
13 files changed, 952 insertions, 30 deletions
diff --git a/README_MSVC.txt b/README_MSVC.txt index 2885364..938a10d 100644 --- a/README_MSVC.txt +++ b/README_MSVC.txt @@ -1,6 +1,10 @@ To compile libusb 1.0 using Microsoft Visual Studio: -Note: in the text below, (Win32) means "when producing 32 bit binaries" and +Note 1: Two set of solution files are provided depending on whether you are +running Visual Studio 2008 (MSVC9) or Visual Studio 2005 (MSVC8). +Make sure you open the solution file matching your environment. + +Note 2: In the text below, (Win32) means "when producing 32 bit binaries" and (x64) "when producing 64 bit binaries". This is independent of whether your platform is actually 32 or 64 bit. diff --git a/configure.ac b/configure.ac index 5aea8b2..e578a58 100644 --- a/configure.ac +++ b/configure.ac @@ -39,7 +39,7 @@ case $host in backend="windows" LIBS="-lpthreadGC2 -lsetupapi -lole32" AM_CFLAGS="-Wshadow" - AM_LDFLAGS="" + AM_LDFLAGS="-no-undefined" ;; *-cygwin*) AC_DEFINE(OS_WINDOWS, [], [Windows backend]) @@ -48,7 +48,7 @@ case $host in backend="windows" LIBS="-lpthread -lsetupapi -lole32" AM_CFLAGS="" - AM_LDFLAGS="" + AM_LDFLAGS="-no-undefined" ;; *) AC_MSG_ERROR([unsupported operating system]) diff --git a/examples/lsusb_2005.vcproj b/examples/lsusb_2005.vcproj new file mode 100644 index 0000000..0ba49d2 --- /dev/null +++ b/examples/lsusb_2005.vcproj @@ -0,0 +1,199 @@ +<?xml version="1.0" encoding="Windows-1252"?> +<VisualStudioProject + ProjectType="Visual C++" + Version="8.00" + Name="lsusb" + ProjectGUID="{98CFD8FA-EE20-40D5-AF13-F8C4856D6CA5}" + RootNamespace="examples" + Keyword="Win32Proj" + > + <Platforms> + <Platform + Name="Win32" + /> + </Platforms> + <ToolFiles> + </ToolFiles> + <Configurations> + <Configuration + Name="Debug|Win32" + OutputDirectory="$(SolutionDir)$(PlatformName)\$(ConfigurationName)\examples" + IntermediateDirectory="$(SolutionDir)$(PlatformName)\$(ConfigurationName)\examples\$(ProjectName)" + ConfigurationType="1" + CharacterSet="2" + > + <Tool + Name="VCPreBuildEventTool" + /> + <Tool + Name="VCCustomBuildTool" + /> + <Tool + Name="VCXMLDataGeneratorTool" + /> + <Tool + Name="VCWebServiceProxyGeneratorTool" + /> + <Tool + Name="VCMIDLTool" + /> + <Tool + Name="VCCLCompilerTool" + Optimization="0" + AdditionalIncludeDirectories="..\msvc;..\" + PreprocessorDefinitions="WIN32;_DEBUG;_CONSOLE" + MinimalRebuild="true" + BasicRuntimeChecks="3" + RuntimeLibrary="3" + UsePrecompiledHeader="0" + WarningLevel="3" + Detect64BitPortabilityProblems="false" + DebugInformationFormat="4" + /> + <Tool + Name="VCManagedResourceCompilerTool" + /> + <Tool + Name="VCResourceCompilerTool" + /> + <Tool + Name="VCPreLinkEventTool" + /> + <Tool + Name="VCLinkerTool" + AdditionalDependencies="setupapi.lib pthreadVC2.lib" + LinkIncremental="2" + AdditionalLibraryDirectories="..\msvc" + GenerateDebugInformation="true" + SubSystem="1" + TargetMachine="1" + /> + <Tool + Name="VCALinkTool" + /> + <Tool + Name="VCManifestTool" + /> + <Tool + Name="VCXDCMakeTool" + /> + <Tool + Name="VCBscMakeTool" + /> + <Tool + Name="VCFxCopTool" + /> + <Tool + Name="VCAppVerifierTool" + /> + <Tool + Name="VCWebDeploymentTool" + /> + <Tool + Name="VCPostBuildEventTool" + /> + </Configuration> + <Configuration + Name="Release|Win32" + OutputDirectory="$(SolutionDir)$(PlatformName)\$(ConfigurationName)\examples" + IntermediateDirectory="$(SolutionDir)$(PlatformName)\$(ConfigurationName)\examples\$(ProjectName)" + ConfigurationType="1" + CharacterSet="1" + WholeProgramOptimization="1" + > + <Tool + Name="VCPreBuildEventTool" + /> + <Tool + Name="VCCustomBuildTool" + /> + <Tool + Name="VCXMLDataGeneratorTool" + /> + <Tool + Name="VCWebServiceProxyGeneratorTool" + /> + <Tool + Name="VCMIDLTool" + /> + <Tool + Name="VCCLCompilerTool" + AdditionalIncludeDirectories="..\msvc;..\" + PreprocessorDefinitions="WIN32;NDEBUG;_CONSOLE" + RuntimeLibrary="2" + UsePrecompiledHeader="0" + WarningLevel="3" + Detect64BitPortabilityProblems="false" + DebugInformationFormat="3" + /> + <Tool + Name="VCManagedResourceCompilerTool" + /> + <Tool + Name="VCResourceCompilerTool" + /> + <Tool + Name="VCPreLinkEventTool" + /> + <Tool + Name="VCLinkerTool" + AdditionalDependencies="setupapi.lib pthreadVC2.lib" + LinkIncremental="1" + AdditionalLibraryDirectories="..\msvc" + GenerateDebugInformation="true" + SubSystem="1" + OptimizeReferences="2" + EnableCOMDATFolding="2" + TargetMachine="1" + /> + <Tool + Name="VCALinkTool" + /> + <Tool + Name="VCManifestTool" + /> + <Tool + Name="VCXDCMakeTool" + /> + <Tool + Name="VCBscMakeTool" + /> + <Tool + Name="VCFxCopTool" + /> + <Tool + Name="VCAppVerifierTool" + /> + <Tool + Name="VCWebDeploymentTool" + /> + <Tool + Name="VCPostBuildEventTool" + /> + </Configuration> + </Configurations> + <References> + </References> + <Files> + <Filter + Name="Source Files" + Filter="cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx" + UniqueIdentifier="{4FC737F1-C7A5-4376-A066-2A32D752A2FF}" + > + <File + RelativePath=".\lsusb.c" + > + <FileConfiguration + Name="Release|Win32" + > + <Tool + Name="VCCLCompilerTool" + Detect64BitPortabilityProblems="false" + /> + </FileConfiguration> + </File> + </Filter> + </Files> + <Globals> + </Globals> +</VisualStudioProject> diff --git a/examples/lsusb.vcproj b/examples/lsusb_2008.vcproj index cd22e40..e93fd90 100644 --- a/examples/lsusb.vcproj +++ b/examples/lsusb_2008.vcproj @@ -24,7 +24,7 @@ OutputDirectory="$(SolutionDir)$(PlatformName)\$(ConfigurationName)\examples" IntermediateDirectory="$(SolutionDir)$(PlatformName)\$(ConfigurationName)\examples\$(ProjectName)" ConfigurationType="1" - CharacterSet="1" + CharacterSet="2" BuildLogFile="$(IntDir)\$(ProjectName).htm" > <Tool @@ -100,7 +100,7 @@ OutputDirectory="$(SolutionDir)$(PlatformName)\$(ConfigurationName)\examples" IntermediateDirectory="$(SolutionDir)$(PlatformName)\$(ConfigurationName)\examples\$(ProjectName)" ConfigurationType="1" - CharacterSet="1" + CharacterSet="2" BuildLogFile="$(IntDir)\$(ProjectName).htm" > <Tool @@ -177,7 +177,7 @@ OutputDirectory="$(SolutionDir)$(PlatformName)\$(ConfigurationName)\examples" IntermediateDirectory="$(SolutionDir)$(PlatformName)\$(ConfigurationName)\examples\$(ProjectName)" ConfigurationType="1" - CharacterSet="1" + CharacterSet="2" WholeProgramOptimization="1" BuildLogFile="$(IntDir)\$(ProjectName).htm" > @@ -256,7 +256,7 @@ OutputDirectory="$(SolutionDir)$(PlatformName)\$(ConfigurationName)\examples" IntermediateDirectory="$(SolutionDir)$(PlatformName)\$(ConfigurationName)\examples\$(ProjectName)" ConfigurationType="1" - CharacterSet="1" + CharacterSet="2" WholeProgramOptimization="1" BuildLogFile="$(IntDir)\$(ProjectName).htm" > diff --git a/examples/xusb_2005.vcproj b/examples/xusb_2005.vcproj new file mode 100644 index 0000000..05791fd --- /dev/null +++ b/examples/xusb_2005.vcproj @@ -0,0 +1,191 @@ +<?xml version="1.0" encoding="Windows-1252"?> +<VisualStudioProject + ProjectType="Visual C++" + Version="8.00" + Name="xusb" + ProjectGUID="{08A6FA39-21B7-4A05-9252-2F9864A5E5A4}" + RootNamespace="examples" + Keyword="Win32Proj" + > + <Platforms> + <Platform + Name="Win32" + /> + </Platforms> + <ToolFiles> + </ToolFiles> + <Configurations> + <Configuration + Name="Debug|Win32" + OutputDirectory="$(SolutionDir)$(PlatformName)\$(ConfigurationName)\examples" + IntermediateDirectory="$(SolutionDir)$(PlatformName)\$(ConfigurationName)\examples\$(ProjectName)" + ConfigurationType="1" + CharacterSet="2" + > + <Tool + Name="VCPreBuildEventTool" + /> + <Tool + Name="VCCustomBuildTool" + /> + <Tool + Name="VCXMLDataGeneratorTool" + /> + <Tool + Name="VCWebServiceProxyGeneratorTool" + /> + <Tool + Name="VCMIDLTool" + /> + <Tool + Name="VCCLCompilerTool" + Optimization="0" + AdditionalIncludeDirectories="..\msvc;..\" + PreprocessorDefinitions="WIN32;_DEBUG;_CONSOLE" + MinimalRebuild="true" + BasicRuntimeChecks="3" + RuntimeLibrary="3" + UsePrecompiledHeader="0" + WarningLevel="3" + Detect64BitPortabilityProblems="false" + DebugInformationFormat="4" + /> + <Tool + Name="VCManagedResourceCompilerTool" + /> + <Tool + Name="VCResourceCompilerTool" + /> + <Tool + Name="VCPreLinkEventTool" + /> + <Tool + Name="VCLinkerTool" + AdditionalDependencies="setupapi.lib pthreadVC2.lib" + LinkIncremental="2" + AdditionalLibraryDirectories="..\msvc" + GenerateDebugInformation="true" + SubSystem="1" + TargetMachine="1" + /> + <Tool + Name="VCALinkTool" + /> + <Tool + Name="VCManifestTool" + /> + <Tool + Name="VCXDCMakeTool" + /> + <Tool + Name="VCBscMakeTool" + /> + <Tool + Name="VCFxCopTool" + /> + <Tool + Name="VCAppVerifierTool" + /> + <Tool + Name="VCWebDeploymentTool" + /> + <Tool + Name="VCPostBuildEventTool" + /> + </Configuration> + <Configuration + Name="Release|Win32" + OutputDirectory="$(SolutionDir)$(PlatformName)\$(ConfigurationName)\examples" + IntermediateDirectory="$(SolutionDir)$(PlatformName)\$(ConfigurationName)\examples\$(ProjectName)" + ConfigurationType="1" + CharacterSet="2" + WholeProgramOptimization="1" + > + <Tool + Name="VCPreBuildEventTool" + /> + <Tool + Name="VCCustomBuildTool" + /> + <Tool + Name="VCXMLDataGeneratorTool" + /> + <Tool + Name="VCWebServiceProxyGeneratorTool" + /> + <Tool + Name="VCMIDLTool" + /> + <Tool + Name="VCCLCompilerTool" + AdditionalIncludeDirectories="..\msvc;..\" + PreprocessorDefinitions="WIN32;NDEBUG;_CONSOLE" + RuntimeLibrary="2" + UsePrecompiledHeader="0" + WarningLevel="3" + Detect64BitPortabilityProblems="false" + DebugInformationFormat="3" + /> + <Tool + Name="VCManagedResourceCompilerTool" + /> + <Tool + Name="VCResourceCompilerTool" + /> + <Tool + Name="VCPreLinkEventTool" + /> + <Tool + Name="VCLinkerTool" + AdditionalDependencies="setupapi.lib pthreadVC2.lib" + LinkIncremental="1" + AdditionalLibraryDirectories="..\msvc" + GenerateDebugInformation="true" + SubSystem="1" + OptimizeReferences="2" + EnableCOMDATFolding="2" + TargetMachine="1" + /> + <Tool + Name="VCALinkTool" + /> + <Tool + Name="VCManifestTool" + /> + <Tool + Name="VCXDCMakeTool" + /> + <Tool + Name="VCBscMakeTool" + /> + <Tool + Name="VCFxCopTool" + /> + <Tool + Name="VCAppVerifierTool" + /> + <Tool + Name="VCWebDeploymentTool" + /> + <Tool + Name="VCPostBuildEventTool" + /> + </Configuration> + </Configurations> + <References> + </References> + <Files> + <Filter + Name="Source Files" + Filter="cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx" + UniqueIdentifier="{4FC737F1-C7A5-4376-A066-2A32D752A2FF}" + > + <File + RelativePath=".\xusb.c" + > + </File> + </Filter> + </Files> + <Globals> + </Globals> +</VisualStudioProject> diff --git a/examples/xusb.vcproj b/examples/xusb_2008.vcproj index 2964dda..5b156b2 100644 --- a/examples/xusb.vcproj +++ b/examples/xusb_2008.vcproj @@ -24,7 +24,7 @@ OutputDirectory="$(SolutionDir)$(PlatformName)\$(ConfigurationName)\examples" IntermediateDirectory="$(SolutionDir)$(PlatformName)\$(ConfigurationName)\examples\$(ProjectName)" ConfigurationType="1" - CharacterSet="1" + CharacterSet="2" BuildLogFile="$(IntDir)\$(ProjectName).htm" > <Tool @@ -45,7 +45,7 @@ <Tool Name="VCCLCompilerTool" Optimization="0" - AdditionalIncludeDirectories="E:\WinDDK\7600.16385.0\inc;..\msvc;..\" + AdditionalIncludeDirectories="..\msvc;..\" PreprocessorDefinitions="WIN32;_DEBUG;_CONSOLE" MinimalRebuild="true" BasicRuntimeChecks="3" @@ -100,7 +100,7 @@ OutputDirectory="$(SolutionDir)$(PlatformName)\$(ConfigurationName)\examples" IntermediateDirectory="$(SolutionDir)$(PlatformName)\$(ConfigurationName)\examples\$(ProjectName)" ConfigurationType="1" - CharacterSet="1" + CharacterSet="2" BuildLogFile="$(IntDir)\$(ProjectName).htm" > <Tool @@ -122,7 +122,7 @@ <Tool Name="VCCLCompilerTool" Optimization="0" - AdditionalIncludeDirectories="E:\WinDDK\7600.16385.0\inc;..\msvc;..\" + AdditionalIncludeDirectories="..\msvc;..\" PreprocessorDefinitions="WIN32;_DEBUG;_CONSOLE" MinimalRebuild="true" BasicRuntimeChecks="3" @@ -177,7 +177,7 @@ OutputDirectory="$(SolutionDir)$(PlatformName)\$(ConfigurationName)\examples" IntermediateDirectory="$(SolutionDir)$(PlatformName)\$(ConfigurationName)\examples\$(ProjectName)" ConfigurationType="1" - CharacterSet="1" + CharacterSet="2" WholeProgramOptimization="1" BuildLogFile="$(IntDir)\$(ProjectName).htm" > @@ -200,7 +200,7 @@ Name="VCCLCompilerTool" Optimization="2" EnableIntrinsicFunctions="true" - AdditionalIncludeDirectories="E:\WinDDK\7600.16385.0\inc;..\msvc;..\" + AdditionalIncludeDirectories="..\msvc;..\" PreprocessorDefinitions="WIN32;NDEBUG;_CONSOLE" RuntimeLibrary="2" EnableFunctionLevelLinking="true" @@ -256,7 +256,7 @@ OutputDirectory="$(SolutionDir)$(PlatformName)\$(ConfigurationName)\examples" IntermediateDirectory="$(SolutionDir)$(PlatformName)\$(ConfigurationName)\examples\$(ProjectName)" ConfigurationType="1" - CharacterSet="1" + CharacterSet="2" WholeProgramOptimization="1" BuildLogFile="$(IntDir)\$(ProjectName).htm" > @@ -280,7 +280,7 @@ Name="VCCLCompilerTool" Optimization="2" EnableIntrinsicFunctions="true" - AdditionalIncludeDirectories="E:\WinDDK\7600.16385.0\inc;..\msvc;..\" + AdditionalIncludeDirectories="..\msvc;..\" PreprocessorDefinitions="WIN32;NDEBUG;_CONSOLE" RuntimeLibrary="2" EnableFunctionLevelLinking="true" diff --git a/libusb-dll_2005.vcproj b/libusb-dll_2005.vcproj new file mode 100644 index 0000000..42980d5 --- /dev/null +++ b/libusb-dll_2005.vcproj @@ -0,0 +1,267 @@ +<?xml version="1.0" encoding="Windows-1252"?> +<VisualStudioProject + ProjectType="Visual C++" + Version="8.00" + Name="libusb-1.0 (dll)" + ProjectGUID="{8224C054-5968-4238-832C-167155E7ECC3}" + RootNamespace="libusbdll" + Keyword="Win32Proj" + > + <Platforms> + <Platform + Name="Win32" + /> + </Platforms> + <ToolFiles> + </ToolFiles> + <Configurations> + <Configuration + Name="Debug|Win32" + OutputDirectory="$(SolutionDir)$(PlatformName)\$(ConfigurationName)\dll" + IntermediateDirectory="$(SolutionDir)$(PlatformName)\$(ConfigurationName)\dll\libusb-1.0" + ConfigurationType="2" + CharacterSet="2" + > + <Tool + Name="VCPreBuildEventTool" + /> + <Tool + Name="VCCustomBuildTool" + /> + <Tool + Name="VCXMLDataGeneratorTool" + /> + <Tool + Name="VCWebServiceProxyGeneratorTool" + /> + <Tool + Name="VCMIDLTool" + /> + <Tool + Name="VCCLCompilerTool" + Optimization="0" + AdditionalIncludeDirectories=".\msvc;.\libusb;.\" + PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_USRDLL;_CRT_SECURE_NO_WARNINGS" + MinimalRebuild="true" + BasicRuntimeChecks="3" + RuntimeLibrary="3" + UsePrecompiledHeader="0" + WarningLevel="3" + Detect64BitPortabilityProblems="false" + DebugInformationFormat="4" + /> + <Tool + Name="VCManagedResourceCompilerTool" + /> + <Tool + Name="VCResourceCompilerTool" + /> + <Tool + Name="VCPreLinkEventTool" + /> + <Tool + Name="VCLinkerTool" + AdditionalDependencies="setupapi.lib pthreadVC2.lib" + OutputFile="$(OutDir)\libusb-1.0_debug.dll" + LinkIncremental="2" + AdditionalLibraryDirectories=".\msvc" + ModuleDefinitionFile="libusb\libusb-1.0.def" + GenerateDebugInformation="true" + SubSystem="2" + TargetMachine="1" + /> + <Tool + Name="VCALinkTool" + /> + <Tool + Name="VCManifestTool" + /> + <Tool + Name="VCXDCMakeTool" + /> + <Tool + Name="VCBscMakeTool" + /> + <Tool + Name="VCFxCopTool" + /> + <Tool + Name="VCAppVerifierTool" + /> + <Tool + Name="VCWebDeploymentTool" + /> + <Tool + Name="VCPostBuildEventTool" + /> + </Configuration> + <Configuration + Name="Release|Win32" + OutputDirectory="$(SolutionDir)$(PlatformName)\$(ConfigurationName)\dll" + IntermediateDirectory="$(SolutionDir)$(PlatformName)\$(ConfigurationName)\dll\libusb-1.0" + ConfigurationType="2" + CharacterSet="2" + WholeProgramOptimization="1" + > + <Tool + Name="VCPreBuildEventTool" + /> + <Tool + Name="VCCustomBuildTool" + /> + <Tool + Name="VCXMLDataGeneratorTool" + /> + <Tool + Name="VCWebServiceProxyGeneratorTool" + /> + <Tool + Name="VCMIDLTool" + /> + <Tool + Name="VCCLCompilerTool" + AdditionalIncludeDirectories=".\msvc;.\libusb;.\" + PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_USRDLL;_CRT_SECURE_NO_WARNINGS" + RuntimeLibrary="2" + UsePrecompiledHeader="0" + WarningLevel="3" + Detect64BitPortabilityProblems="false" + DebugInformationFormat="3" + /> + <Tool + Name="VCManagedResourceCompilerTool" + /> + <Tool + Name="VCResourceCompilerTool" + /> + <Tool + Name="VCPreLinkEventTool" + /> + <Tool + Name="VCLinkerTool" + AdditionalDependencies="setupapi.lib pthreadVC2.lib" + OutputFile="$(OutDir)\libusb-1.0.dll" + LinkIncremental="1" + AdditionalLibraryDirectories=".\msvc" + ModuleDefinitionFile="libusb\libusb-1.0.def" + GenerateDebugInformation="true" + SubSystem="2" + OptimizeReferences="2" + EnableCOMDATFolding="2" + TargetMachine="1" + /> + <Tool + Name="VCALinkTool" + /> + <Tool + Name="VCManifestTool" + /> + <Tool + Name="VCXDCMakeTool" + /> + <Tool + Name="VCBscMakeTool" + /> + <Tool + Name="VCFxCopTool" + /> + <Tool + Name="VCAppVerifierTool" + /> + <Tool + Name="VCWebDeploymentTool" + /> + <Tool + Name="VCPostBuildEventTool" + /> + </Configuration> + </Configurations> + <References> + </References> + <Files> + <Filter + Name="Source Files" + Filter="cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx" + UniqueIdentifier="{4FC737F1-C7A5-4376-A066-2A32D752A2FF}" + > + <File + RelativePath=".\libusb\core.c" + > + </File> + <File + RelativePath=".\libusb\descriptor.c" + > + </File> + <File + RelativePath=".\libusb\io.c" + > + </File> + <File + RelativePath=".\libusb\libusb-1.0.def" + > + <FileConfiguration + Name="Debug|Win32" + ExcludedFromBuild="true" + > + <Tool + Name="VCCustomBuildTool" + /> + </FileConfiguration> + <FileConfiguration + Name="Release|Win32" + ExcludedFromBuild="true" + > + <Tool + Name="VCCustomBuildTool" + /> + </FileConfiguration> + </File> + <File + RelativePath=".\libusb\sync.c" + > + </File> + <File + RelativePath=".\libusb\os\windows_compat.c" + > + </File> + <File + RelativePath=".\libusb\os\windows_usb.c" + > + </File> + </Filter> + <Filter + Name="Header Files" + Filter="h;hpp;hxx;hm;inl;inc;xsd" + UniqueIdentifier="{93995380-89BD-4b04-88EB-625FBE52EBFB}" + > + <File + RelativePath=".\config_msvc.h" + > + </File> + <File + RelativePath=".\libusb\libusb.h" + > + </File> + <File + RelativePath=".\libusb\libusbi.h" + > + </File> + <File + RelativePath=".\libusb\os\windows_compat.h" + > + </File> + <File + RelativePath=".\libusb\os\windows_usb.h" + > + </File> + </Filter> + <Filter + Name="Resource Files" + Filter="rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;tiff;tif;png;wav" + UniqueIdentifier="{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}" + > + </Filter> + </Files> + <Globals> + </Globals> +</VisualStudioProject> diff --git a/libusb-dll.vcproj b/libusb-dll_2008.vcproj index 2f0f1b4..0c0b1e5 100644 --- a/libusb-dll.vcproj +++ b/libusb-dll_2008.vcproj @@ -44,7 +44,7 @@ Name="VCCLCompilerTool" Optimization="0" AdditionalIncludeDirectories=".\msvc;.\libusb;.\" - PreprocessorDefinitions="_CRT_SECURE_NO_WARNINGS" + PreprocessorDefinitions="_WIN32;_DEBUG;_LIB;_CRT_SECURE_NO_WARNINGS" MinimalRebuild="true" BasicRuntimeChecks="3" RuntimeLibrary="3" @@ -65,6 +65,8 @@ AdditionalDependencies="setupapi.lib pthreadVC2.lib" OutputFile="$(OutDir)\libusb-1.0_debug.dll" AdditionalLibraryDirectories=".\msvc" + ModuleDefinitionFile="libusb\libusb-1.0.def" + GenerateDebugInformation="true" /> <Tool Name="VCALinkTool" @@ -115,7 +117,7 @@ Name="VCCLCompilerTool" Optimization="0" AdditionalIncludeDirectories=".\msvc;.\libusb;.\" - PreprocessorDefinitions="_CRT_SECURE_NO_WARNINGS" + PreprocessorDefinitions="_WIN32;_WIN64;_DEBUG;_CRT_SECURE_NO_WARNINGS" MinimalRebuild="true" BasicRuntimeChecks="3" RuntimeLibrary="3" @@ -136,6 +138,8 @@ AdditionalDependencies="setupapi.lib pthreadVC2_x64.lib" OutputFile="$(OutDir)\libusb-1.0_debug.dll" AdditionalLibraryDirectories=".\msvc" + ModuleDefinitionFile="libusb\libusb-1.0.def" + GenerateDebugInformation="true" /> <Tool Name="VCALinkTool" @@ -187,7 +191,7 @@ Optimization="2" EnableIntrinsicFunctions="true" AdditionalIncludeDirectories=".\msvc;.\libusb;.\" - PreprocessorDefinitions="_CRT_SECURE_NO_WARNINGS" + PreprocessorDefinitions="_WIN32;_LIB;_CRT_SECURE_NO_WARNINGS" RuntimeLibrary="2" EnableFunctionLevelLinking="true" WarningLevel="3" @@ -207,6 +211,7 @@ AdditionalDependencies="setupapi.lib pthreadVC2.lib" OutputFile="$(OutDir)\libusb-1.0.dll" AdditionalLibraryDirectories=".\msvc" + ModuleDefinitionFile="libusb\libusb-1.0.def" /> <Tool Name="VCALinkTool" @@ -259,7 +264,7 @@ Optimization="2" EnableIntrinsicFunctions="true" AdditionalIncludeDirectories=".\msvc;.\libusb;.\" - PreprocessorDefinitions="_CRT_SECURE_NO_WARNINGS" + PreprocessorDefinitions="_WIN32;_WIN64;_LIB;_CRT_SECURE_NO_WARNINGS" RuntimeLibrary="2" EnableFunctionLevelLinking="true" WarningLevel="3" @@ -279,6 +284,7 @@ AdditionalDependencies="setupapi.lib pthreadVC2_x64.lib" OutputFile="$(OutDir)\libusb-1.0.dll" AdditionalLibraryDirectories=".\msvc" + ModuleDefinitionFile="libusb\libusb-1.0.def" /> <Tool Name="VCALinkTool" @@ -324,6 +330,10 @@ > </File> <File + RelativePath=".\libusb\libusb-1.0.def" + > + </File> + <File RelativePath=".\libusb\sync.c" > </File> diff --git a/libusb-static_2005.vcproj b/libusb-static_2005.vcproj new file mode 100644 index 0000000..3f52bbb --- /dev/null +++ b/libusb-static_2005.vcproj @@ -0,0 +1,207 @@ +<?xml version="1.0" encoding="Windows-1252"?> +<VisualStudioProject + ProjectType="Visual C++" + Version="8.00" + Name="libusb-1.0 (static)" + ProjectGUID="{5AB6B770-1925-48D5-ABC2-930F3259C020}" + RootNamespace="libusb" + Keyword="Win32Proj" + > + <Platforms> + <Platform + Name="Win32" + /> + </Platforms> + <ToolFiles> + </ToolFiles> + <Configurations> + <Configuration + Name="Debug|Win32" + OutputDirectory="$(SolutionDir)$(PlatformName)\$(ConfigurationName)\lib" + IntermediateDirectory="$(SolutionDir)$(PlatformName)\$(ConfigurationName)\lib\libusb-1.0" + ConfigurationType="4" + CharacterSet="2" + > + <Tool + Name="VCPreBuildEventTool" + /> + <Tool + Name="VCCustomBuildTool" + /> + <Tool + Name="VCXMLDataGeneratorTool" + /> + <Tool + Name="VCWebServiceProxyGeneratorTool" + /> + <Tool + Name="VCMIDLTool" + /> + <Tool + Name="VCCLCompilerTool" + Optimization="0" + AdditionalIncludeDirectories=".\msvc;.\libusb;.\" + PreprocessorDefinitions="WIN32;_DEBUG;_LIB;_CRT_SECURE_NO_WARNINGS" + MinimalRebuild="true" + BasicRuntimeChecks="3" + RuntimeLibrary="3" + UsePrecompiledHeader="0" + WarningLevel="3" + Detect64BitPortabilityProblems="false" + DebugInformationFormat="4" + /> + <Tool + Name="VCManagedResourceCompilerTool" + /> + <Tool + Name="VCResourceCompilerTool" + /> + <Tool + Name="VCPreLinkEventTool" + /> + <Tool + Name="VCLibrarianTool" + OutputFile="$(OutDir)\libusb-1.0.lib" + /> + <Tool + Name="VCALinkTool" + /> + <Tool + Name="VCXDCMakeTool" + /> + <Tool + Name="VCBscMakeTool" + /> + <Tool + Name="VCFxCopTool" + /> + <Tool + Name="VCPostBuildEventTool" + /> + </Configuration> + <Configuration + Name="Release|Win32" + OutputDirectory="$(SolutionDir)$(PlatformName)\$(ConfigurationName)\lib" + IntermediateDirectory="$(SolutionDir)$(PlatformName)\$(ConfigurationName)\lib\libusb-1.0" + ConfigurationType="4" + CharacterSet="2" + WholeProgramOptimization="1" + > + <Tool + Name="VCPreBuildEventTool" + /> + <Tool + Name="VCCustomBuildTool" + /> + <Tool + Name="VCXMLDataGeneratorTool" + /> + <Tool + Name="VCWebServiceProxyGeneratorTool" + /> + <Tool + Name="VCMIDLTool" + /> + <Tool + Name="VCCLCompilerTool" + AdditionalIncludeDirectories=".\msvc;.\libusb;.\" + PreprocessorDefinitions="WIN32;NDEBUG;_LIB;_CRT_SECURE_NO_WARNINGS" + RuntimeLibrary="2" + UsePrecompiledHeader="0" + WarningLevel="3" + Detect64BitPortabilityProblems="false" + DebugInformationFormat="3" + /> + <Tool + Name="VCManagedResourceCompilerTool" + /> + <Tool + Name="VCResourceCompilerTool" + /> + <Tool + Name="VCPreLinkEventTool" + /> + <Tool + Name="VCLibrarianTool" + OutputFile="$(OutDir)\libusb-1.0.lib" + /> + <Tool + Name="VCALinkTool" + /> + <Tool + Name="VCXDCMakeTool" + /> + <Tool + Name="VCBscMakeTool" + /> + <Tool + Name="VCFxCopTool" + /> + <Tool + Name="VCPostBuildEventTool" + /> + </Configuration> + </Configurations> + <References> + </References> + <Files> + <Filter + Name="Source Files" + Filter="cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx" + UniqueIdentifier="{4FC737F1-C7A5-4376-A066-2A32D752A2FF}" + > + <File + RelativePath=".\libusb\core.c" + > + </File> + <File + RelativePath=".\libusb\descriptor.c" + > + </File> + <File + RelativePath=".\libusb\io.c" + > + </File> + <File + RelativePath=".\libusb\sync.c" + > + </File> + <File + RelativePath=".\libusb\os\windows_compat.c" + > + </File> + <File + RelativePath=".\libusb\os\windows_usb.c" + > + </File> + </Filter> + <Filter + Name="Header Files" + Filter="h;hpp;hxx;hm;inl;inc;xsd" + UniqueIdentifier="{93995380-89BD-4b04-88EB-625FBE52EBFB}" + > + <File + RelativePath=".\config_msvc.h" + > + </File> + <File + RelativePath=".\libusb\libusb.h" + > + </File> + <File + RelativePath=".\libusb\libusbi.h" + > + </File> + <File + RelativePath=".\libusb\os\windows_compat.h" + > + </File> + <File + RelativePath=".\libusb\os\windows_usb.h" + > + </File> + </Filter> + </Files> + <Globals> + </Globals> +</VisualStudioProject> diff --git a/libusb-static.vcproj b/libusb-static_2008.vcproj index d94eabd..13cad06 100644 --- a/libusb-static.vcproj +++ b/libusb-static_2008.vcproj @@ -44,7 +44,7 @@ Name="VCCLCompilerTool" Optimization="0" AdditionalIncludeDirectories=".\msvc;.\libusb;.\" - PreprocessorDefinitions="_CRT_SECURE_NO_WARNINGS" + PreprocessorDefinitions="_WIN32;_DEBUG;_LIB;_CRT_SECURE_NO_WARNINGS" MinimalRebuild="true" BasicRuntimeChecks="3" RuntimeLibrary="3" @@ -107,7 +107,7 @@ Name="VCCLCompilerTool" Optimization="0" AdditionalIncludeDirectories=".\msvc;.\libusb;.\" - PreprocessorDefinitions="_CRT_SECURE_NO_WARNINGS" + PreprocessorDefinitions="_WIN32;_WIN64;_DEBUG;_LIB;_CRT_SECURE_NO_WARNINGS" MinimalRebuild="true" BasicRuntimeChecks="3" RuntimeLibrary="3" @@ -171,7 +171,7 @@ Optimization="2" EnableIntrinsicFunctions="true" AdditionalIncludeDirectories=".\msvc;.\libusb;.\" - PreprocessorDefinitions="_CRT_SECURE_NO_WARNINGS" + PreprocessorDefinitions="_WIN32;_LIB;_CRT_SECURE_NO_WARNINGS" RuntimeLibrary="2" EnableFunctionLevelLinking="true" WarningLevel="3" @@ -235,7 +235,7 @@ Optimization="2" EnableIntrinsicFunctions="true" AdditionalIncludeDirectories=".\msvc;.\libusb;.\" - PreprocessorDefinitions="_CRT_SECURE_NO_WARNINGS" + PreprocessorDefinitions="_WIN32;_WIN64;_LIB;_CRT_SECURE_NO_WARNINGS" RuntimeLibrary="2" EnableFunctionLevelLinking="true" WarningLevel="3" diff --git a/libusb/libusb-1.0.def b/libusb/libusb-1.0.def index 2ed5266..24c4c6b 100644 --- a/libusb/libusb-1.0.def +++ b/libusb/libusb-1.0.def @@ -1,4 +1,4 @@ -LIBRARY libusb-1.0.dll +LIBRARY EXPORTS libusb_init libusb_exit diff --git a/libusb_2005.sln b/libusb_2005.sln new file mode 100644 index 0000000..87039d0 --- /dev/null +++ b/libusb_2005.sln @@ -0,0 +1,44 @@ + +Microsoft Visual Studio Solution File, Format Version 9.00 +# Visual Studio 2005 +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libusb-1.0", "libusb-static_2005.vcproj", "{5AB6B770-1925-48D5-ABC2-930F3259C020}" +EndProject +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libusb-1.0 (dll)", "libusb-dll_2005.vcproj", "{8224C054-5968-4238-832C-167155E7ECC3}" +EndProject +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "lsusb", "examples\lsusb_2005.vcproj", "{98CFD8FA-EE20-40D5-AF13-F8C4856D6CA5}" + ProjectSection(ProjectDependencies) = postProject + {5AB6B770-1925-48D5-ABC2-930F3259C020} = {5AB6B770-1925-48D5-ABC2-930F3259C020} + EndProjectSection +EndProject +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "xusb", "examples\xusb_2005.vcproj", "{08A6FA39-21B7-4A05-9252-2F9864A5E5A4}" + ProjectSection(ProjectDependencies) = postProject + {5AB6B770-1925-48D5-ABC2-930F3259C020} = {5AB6B770-1925-48D5-ABC2-930F3259C020} + EndProjectSection +EndProject +Global + GlobalSection(SolutionConfigurationPlatforms) = preSolution + Debug|Win32 = Debug|Win32 + Release|Win32 = Release|Win32 + EndGlobalSection + GlobalSection(ProjectConfigurationPlatforms) = postSolution + {5AB6B770-1925-48D5-ABC2-930F3259C020}.Debug|Win32.ActiveCfg = Debug|Win32 + {5AB6B770-1925-48D5-ABC2-930F3259C020}.Debug|Win32.Build.0 = Debug|Win32 + {5AB6B770-1925-48D5-ABC2-930F3259C020}.Release|Win32.ActiveCfg = Release|Win32 + {5AB6B770-1925-48D5-ABC2-930F3259C020}.Release|Win32.Build.0 = Release|Win32 + {98CFD8FA-EE20-40D5-AF13-F8C4856D6CA5}.Debug|Win32.ActiveCfg = Debug|Win32 + {98CFD8FA-EE20-40D5-AF13-F8C4856D6CA5}.Debug|Win32.Build.0 = Debug|Win32 + {98CFD8FA-EE20-40D5-AF13-F8C4856D6CA5}.Release|Win32.ActiveCfg = Release|Win32 + {98CFD8FA-EE20-40D5-AF13-F8C4856D6CA5}.Release|Win32.Build.0 = Release|Win32 + {08A6FA39-21B7-4A05-9252-2F9864A5E5A4}.Debug|Win32.ActiveCfg = Debug|Win32 + {08A6FA39-21B7-4A05-9252-2F9864A5E5A4}.Debug|Win32.Build.0 = Debug|Win32 + {08A6FA39-21B7-4A05-9252-2F9864A5E5A4}.Release|Win32.ActiveCfg = Release|Win32 + {08A6FA39-21B7-4A05-9252-2F9864A5E5A4}.Release|Win32.Build.0 = Release|Win32 + {8224C054-5968-4238-832C-167155E7ECC3}.Debug|Win32.ActiveCfg = Debug|Win32 + {8224C054-5968-4238-832C-167155E7ECC3}.Debug|Win32.Build.0 = Debug|Win32 + {8224C054-5968-4238-832C-167155E7ECC3}.Release|Win32.ActiveCfg = Release|Win32 + {8224C054-5968-4238-832C-167155E7ECC3}.Release|Win32.Build.0 = Release|Win32 + EndGlobalSection + GlobalSection(SolutionProperties) = preSolution + HideSolutionNode = FALSE + EndGlobalSection +EndGlobal diff --git a/libusb.sln b/libusb_2008.sln index f65c50c..e2421f9 100644 --- a/libusb.sln +++ b/libusb_2008.sln @@ -1,15 +1,15 @@ -Microsoft Visual Studio Solution File, Format Version 9.00 -# Visual Studio 2005 -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libusb-1.0", "libusb-static.vcproj", "{349EE8F9-7D25-4909-AAF5-FF3FADE72187}" +Microsoft Visual Studio Solution File, Format Version 10.00 +# Visual Studio 2008 +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libusb-1.0", "libusb-static_2008.vcproj", "{349EE8F9-7D25-4909-AAF5-FF3FADE72187}" EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libusb-1.0 (dll)", "libusb-dll.vcproj", "{349EE8FA-7D25-4909-AAF5-FF3FADE72187}" +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libusb-1.0 (dll)", "libusb-dll_2008.vcproj", "{349EE8FA-7D25-4909-AAF5-FF3FADE72187}" EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "xusb", "examples\xusb.vcproj", "{3F3138D0-7AB7-4268-9BF3-1A3EA5503A11}" +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "lsusb", "examples\lsusb_2008.vcproj", "{F4938DB0-3DE7-4737-9C5A-EAD1BE819F87}" ProjectSection(ProjectDependencies) = postProject {349EE8F9-7D25-4909-AAF5-FF3FADE72187} = {349EE8F9-7D25-4909-AAF5-FF3FADE72187} EndProjectSection EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "lsusb", "examples\lsusb.vcproj", "{F4938DB0-3DE7-4737-9C5A-EAD1BE819F87}" +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "xusb", "examples\xusb_2008.vcproj", "{3F3138D0-7AB7-4268-9BF3-1A3EA5503A11}" ProjectSection(ProjectDependencies) = postProject {349EE8F9-7D25-4909-AAF5-FF3FADE72187} = {349EE8F9-7D25-4909-AAF5-FF3FADE72187} EndProjectSection |