From d2f60798db73e8499da9e4cbd7b4d00aebdb33cf Mon Sep 17 00:00:00 2001 From: Pete Batard Date: Sat, 16 Jan 2010 15:20:51 +0000 Subject: [PATCH] r86: VS2005 compatibility update and pthread-win32_x64 helpers Minor comment clarification in libusb.h --- README_MSVC.txt | 3 + libusb.sln | 6 +- libusb/libusb.h | 2 +- msvc/pthread-win32_x64/pthread-win32.sln | 26 ++ msvc/pthread-win32_x64/pthread-win32.vcproj | 409 ++++++++++++++++++++ 5 files changed, 442 insertions(+), 4 deletions(-) create mode 100644 msvc/pthread-win32_x64/pthread-win32.sln create mode 100644 msvc/pthread-win32_x64/pthread-win32.vcproj diff --git a/README_MSVC.txt b/README_MSVC.txt index d7e75e9..1b59b73 100644 --- a/README_MSVC.txt +++ b/README_MSVC.txt @@ -21,6 +21,9 @@ platform is actually 32 or 64 bit. http://sourceware.org/pthreads-win32/ and create both a pthreadVC2_x64.lib and pthreadVC2_x64.dll from the latest pthread-win32 source. + To help compiling pthreadVC2_x64.dll on x64 platforms, sample .sln and .vcproj + files for pthread-win32 are provided in the msvc\pthread-win32_x64\ directory. + - (x64) Copy pthreadVC2_x64.lib to the msvc directory. - To run the 64 bit executables, you need to either have pthreadVC2_x64.dll diff --git a/libusb.sln b/libusb.sln index 987c8bf..643030e 100644 --- a/libusb.sln +++ b/libusb.sln @@ -1,6 +1,6 @@ - -Microsoft Visual Studio Solution File, Format Version 10.00 -# Visual Studio 2008 + +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}" EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libusb-1.0 (dll)", "libusb-dll.vcproj", "{349EE8FA-7D25-4909-AAF5-FF3FADE72187}" diff --git a/libusb/libusb.h b/libusb/libusb.h index 6456652..a7d34bf 100644 --- a/libusb/libusb.h +++ b/libusb/libusb.h @@ -40,7 +40,7 @@ #define interface usb_interface #endif -// Windows doesn't know ssize_t +// MSVC doesn't know ssize_t #if !defined(ssize_t) #if defined (_WIN64) #define ssize_t __int64 diff --git a/msvc/pthread-win32_x64/pthread-win32.sln b/msvc/pthread-win32_x64/pthread-win32.sln new file mode 100644 index 0000000..e83ce82 --- /dev/null +++ b/msvc/pthread-win32_x64/pthread-win32.sln @@ -0,0 +1,26 @@ + +Microsoft Visual Studio Solution File, Format Version 9.00 +# Visual Studio 2005 +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "pthread-win32", "pthread-win32.vcproj", "{E97509CF-6701-4526-8FCC-CC290C52E785}" +EndProject +Global + GlobalSection(SolutionConfigurationPlatforms) = preSolution + Debug|Win32 = Debug|Win32 + Debug|x64 = Debug|x64 + Release|Win32 = Release|Win32 + Release|x64 = Release|x64 + EndGlobalSection + GlobalSection(ProjectConfigurationPlatforms) = postSolution + {E97509CF-6701-4526-8FCC-CC290C52E785}.Debug|Win32.ActiveCfg = Debug|Win32 + {E97509CF-6701-4526-8FCC-CC290C52E785}.Debug|Win32.Build.0 = Debug|Win32 + {E97509CF-6701-4526-8FCC-CC290C52E785}.Debug|x64.ActiveCfg = Debug|x64 + {E97509CF-6701-4526-8FCC-CC290C52E785}.Debug|x64.Build.0 = Debug|x64 + {E97509CF-6701-4526-8FCC-CC290C52E785}.Release|Win32.ActiveCfg = Release|Win32 + {E97509CF-6701-4526-8FCC-CC290C52E785}.Release|Win32.Build.0 = Release|Win32 + {E97509CF-6701-4526-8FCC-CC290C52E785}.Release|x64.ActiveCfg = Release|x64 + {E97509CF-6701-4526-8FCC-CC290C52E785}.Release|x64.Build.0 = Release|x64 + EndGlobalSection + GlobalSection(SolutionProperties) = preSolution + HideSolutionNode = FALSE + EndGlobalSection +EndGlobal diff --git a/msvc/pthread-win32_x64/pthread-win32.vcproj b/msvc/pthread-win32_x64/pthread-win32.vcproj new file mode 100644 index 0000000..b0be80d --- /dev/null +++ b/msvc/pthread-win32_x64/pthread-win32.vcproj @@ -0,0 +1,409 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +