fixed obsolete config_msvc.h and pthread-win32 referencesr170

also cleaned up msvc/config.h

7 files changed, 21 insertions, 70 deletions

diff --git a/README_MSVC.txt b/README_MSVC.txt
index 5e4a76e..df45651 100644
--- a/README_MSVC.txt
+++ b/README_MSVC.txt
@@ -1,53 +1,25 @@
 To compile libusb 1.0 using either Microsoft Visual Studio or the Windows DDK
 
-Note 1: For Visual Studio, 3 sets of solution files are provided depending on 
-whether you are running MSVC6, Visual Studio 2008 (MSVC9) or Visual Studio 2005 
-(MSVC8). For the DDK, just run ddk_build.cmd from a DDK build environment 
-command prompt.
-
-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.
-
-- Download the pthread.h and sched.h headers from 
-  ftp://sourceware.org/pub/pthreads-win32/prebuilt-dll-2-8-0-release/include/
-  into the msvc directory.
-
-- (Win32) download pthreadVC2.lib from:
-  ftp://sourceware.org/pub/pthreads-win32/prebuilt-dll-2-8-0-release/lib/ 
-  into the msvc directory.
+- If needed, edit msvc/config.h according to your needs (you might want to
+  comment out ENABLE_DEBUG_LOGGING for instance).
 
-- To run the 32 bit executables, download pthreadVC2.dll from the same link 
-  either into your executable destination or copy it into C:\Window\System32
-  (for 32 bit systems) or C:\Windows\SysWOW64 (for 64 bit systems - yes, this
-  is not a typo: 32 bit DLLs must go to SysWOW64 on 64 bit systems).
+That's it! You should now be able to compile the solution.
 
-- (x64) Follow the "Direct access to the CVS code repository" details on
-  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 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
-  in your executable directory or in C:\Windows\System32 (again, not a typo).
-  
-Alternativaly, precompiled pthread-win32 binaries for 64bit and 32 bit
-platforms, as well as the necessary headers can be obtained frome:
-http://libusb.org/raw-attachment/wiki/windows_backend/pthread-win32_libusb.zip
-
-- Edit config_msvc.h according to your needs (you might want to comment out
-  ENABLE_DEBUG_LOGGING).
-
-You should now be able to compile the solution.
+Note 1: For Visual Studio, 3 sets of solution files are provided depending on
+whether you are running MSVC6, Visual Studio 2008 (MSVC9) or Visual Studio 2005
+(MSVC8). For the DDK, just run ddk_build.cmd from a DDK build environment
+command prompt.
 
-Note that if the the compilation process complains about missing libraries,
-you will need to ensure that the default library paths for your project point
-to a directory that contains setupapi.lib and ole32.lib.
-If needed, these libraries can be obtained by downloading either the latest 
+Note 2: If the the compilation process complains about missing libraries, you
+will need to ensure that the default library paths for your project point to a
+directory that contains setupapi.lib and ole32.lib.
+If needed, these libraries can be obtained by downloading either the latest
 Windows SDK or the DDK.
 
+Note 3: Provided that you have the required environment, it is possible to
+produce either a 32 or 64 bit version of the library. Both these version are
+supported and have been equally tested during development.
+
 For additional information, please refer to:
   http://libusb.org/wiki/windows_backend
\ No newline at end of file
diff --git a/libusb-dll_2005.vcproj b/libusb-dll_2005.vcproj
index 7bfeca3..da05bd8 100644
--- a/libusb-dll_2005.vcproj
+++ b/libusb-dll_2005.vcproj
@@ -417,7 +417,7 @@
 			UniqueIdentifier="{93995380-89BD-4b04-88EB-625FBE52EBFB}"
 			>
 			<File
-				RelativePath=".\config_msvc.h"
+				RelativePath=".\msvc\config.h"
 				>
 			</File>
 			<File
diff --git a/libusb-dll_2008.vcproj b/libusb-dll_2008.vcproj
index d57777c..b08d795 100644
--- a/libusb-dll_2008.vcproj
+++ b/libusb-dll_2008.vcproj
@@ -352,7 +352,7 @@
 			UniqueIdentifier="{93995380-89BD-4b04-88EB-625FBE52EBFB}"
 			>
 			<File
-				RelativePath=".\config_msvc.h"
+				RelativePath=".\msvc\config.h"
 				>
 			</File>
 			<File
diff --git a/libusb-static_2005.vcproj b/libusb-static_2005.vcproj
index 1945aa5..afd646e 100644
--- a/libusb-static_2005.vcproj
+++ b/libusb-static_2005.vcproj
@@ -316,7 +316,7 @@
 			UniqueIdentifier="{93995380-89BD-4b04-88EB-625FBE52EBFB}"
 			>
 			<File
-				RelativePath=".\config_msvc.h"
+				RelativePath=".\msvc\config.h"
 				>
 			</File>
 			<File
diff --git a/libusb-static_2008.vcproj b/libusb-static_2008.vcproj
index 2e55553..70ecca8 100644
--- a/libusb-static_2008.vcproj
+++ b/libusb-static_2008.vcproj
@@ -314,7 +314,7 @@
 			UniqueIdentifier="{93995380-89BD-4b04-88EB-625FBE52EBFB}"
 			>
 			<File
-				RelativePath=".\config_msvc.h"
+				RelativePath=".\msvc\config.h"
 				>
 			</File>
 			<File
diff --git a/libusb_static.dsp b/libusb_static.dsp
index 7f07d86..eb12cd1 100644
--- a/libusb_static.dsp
+++ b/libusb_static.dsp
@@ -127,7 +127,7 @@ SOURCE=.\libusb\os\windows_usb.c
 # PROP Default_Filter "h;hpp;hxx;hm;inl"
 # Begin Source File
 
-SOURCE=.\config_msvc.h
+SOURCE=.\msvc\config.h
 # End Source File
 # Begin Source File
 
diff --git a/msvc/config.h b/msvc/config.h
index be1742c..27cfe6c 100644
--- a/msvc/config.h
+++ b/msvc/config.h
@@ -1,4 +1,4 @@
-/* config_msvc.h.  Manual config.h for MSVC.  */
+/* config.h.  Manual config for MSVC.  */
 
 /* Default visibility */
 #define API_EXPORTED /**/
@@ -12,24 +12,6 @@
 /* Windows backend */
 #define OS_WINDOWS /**/
 
-/* Name of package */
-#define PACKAGE "libusb"
-
-/* Define to the address where bug reports for this package should be sent. */
-#define PACKAGE_BUGREPORT ""
-
-/* Define to the full name of this package. */
-#define PACKAGE_NAME "libusb"
-
-/* Define to the full name and version of this package. */
-#define PACKAGE_STRING "libusb 1.0.5"
-
-/* Define to the one symbol short name of this package. */
-#define PACKAGE_TARNAME "libusb"
-
-/* Define to the version of this package. */
-#define PACKAGE_VERSION "1.0.5"
-
 /* Define to 1 if you have the ANSI C header files. */
 #define STDC_HEADERS 1
 
@@ -38,6 +20,3 @@
 
 /* timerfd headers available */
 /* #undef USBI_TIMERFD_AVAILABLE */
-
-/* Version number of package */
-#define VERSION "1.0.5"