Windows: Add windows_common.h header

* This file contains definition that will be shared between the
  Windows and Windows CE backends

10 files changed, 52 insertions, 25 deletions

diff --git a/msvc/libusb_dll.dsp b/msvc/libusb_dll.dsp
index bad8d15..f2b15f0 100644
--- a/msvc/libusb_dll.dsp
+++ b/msvc/libusb_dll.dsp
@@ -181,6 +181,10 @@ SOURCE=..\libusb\os\threads_windows.h
 
 SOURCE=..\libusb\os\windows_usb.h
 # End Source File
+# Begin Source File
+
+SOURCE=..\libusb\os\windows_common.h
+# End Source File
 # End Group
 # Begin Group "Resource Files"
 
diff --git a/msvc/libusb_dll_2005.vcproj b/msvc/libusb_dll_2005.vcproj
index 0672695..976f664 100644
--- a/msvc/libusb_dll_2005.vcproj
+++ b/msvc/libusb_dll_2005.vcproj
@@ -97,12 +97,11 @@
 			/>
 		</Configuration>
 		<Configuration
-			Name="Release|Win32"
+			Name="Debug|x64"
 			OutputDirectory="..\$(PlatformName)\$(ConfigurationName)\dll"
 			IntermediateDirectory="..\$(PlatformName)\$(ConfigurationName)\dll\libusb-1.0"
 			ConfigurationType="2"
 			CharacterSet="1"
-			WholeProgramOptimization="1"
 			>
 			<Tool
 				Name="VCPreBuildEventTool"
@@ -118,12 +117,16 @@
 			/>
 			<Tool
 				Name="VCMIDLTool"
+				TargetEnvironment="3"
 			/>
 			<Tool
 				Name="VCCLCompilerTool"
+				Optimization="0"
 				AdditionalIncludeDirectories=".;..\libusb"
-				PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_USRDLL;_CRT_SECURE_NO_WARNINGS"
-				RuntimeLibrary="2"
+				PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_USRDLL;_CRT_SECURE_NO_WARNINGS"
+				MinimalRebuild="true"
+				BasicRuntimeChecks="3"
+				RuntimeLibrary="3"
 				UsePrecompiledHeader="0"
 				WarningLevel="3"
 				Detect64BitPortabilityProblems="false"
@@ -141,13 +144,11 @@
 			<Tool
 				Name="VCLinkerTool"
 				OutputFile="$(OutDir)\libusb-1.0.dll"
-				LinkIncremental="1"
+				LinkIncremental="2"
 				ModuleDefinitionFile="..\libusb\libusb-1.0.def"
 				GenerateDebugInformation="true"
 				SubSystem="2"
-				OptimizeReferences="2"
-				EnableCOMDATFolding="2"
-				TargetMachine="1"
+				TargetMachine="17"
 			/>
 			<Tool
 				Name="VCALinkTool"
@@ -175,11 +176,12 @@
 			/>
 		</Configuration>
 		<Configuration
-			Name="Debug|x64"
+			Name="Release|Win32"
 			OutputDirectory="..\$(PlatformName)\$(ConfigurationName)\dll"
 			IntermediateDirectory="..\$(PlatformName)\$(ConfigurationName)\dll\libusb-1.0"
 			ConfigurationType="2"
 			CharacterSet="1"
+			WholeProgramOptimization="1"
 			>
 			<Tool
 				Name="VCPreBuildEventTool"
@@ -195,16 +197,12 @@
 			/>
 			<Tool
 				Name="VCMIDLTool"
-				TargetEnvironment="3"
 			/>
 			<Tool
 				Name="VCCLCompilerTool"
-				Optimization="0"
 				AdditionalIncludeDirectories=".;..\libusb"
-				PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_USRDLL;_CRT_SECURE_NO_WARNINGS"
-				MinimalRebuild="true"
-				BasicRuntimeChecks="3"
-				RuntimeLibrary="3"
+				PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_USRDLL;_CRT_SECURE_NO_WARNINGS"
+				RuntimeLibrary="2"
 				UsePrecompiledHeader="0"
 				WarningLevel="3"
 				Detect64BitPortabilityProblems="false"
@@ -222,11 +220,13 @@
 			<Tool
 				Name="VCLinkerTool"
 				OutputFile="$(OutDir)\libusb-1.0.dll"
-				LinkIncremental="2"
+				LinkIncremental="1"
 				ModuleDefinitionFile="..\libusb\libusb-1.0.def"
 				GenerateDebugInformation="true"
 				SubSystem="2"
-				TargetMachine="17"
+				OptimizeReferences="2"
+				EnableCOMDATFolding="2"
+				TargetMachine="1"
 			/>
 			<Tool
 				Name="VCALinkTool"
@@ -354,7 +354,7 @@
 				>
 			</File>
 			<File
-				RelativePath="..\libusb\libusb-1.0.def"
+				RelativePath="..\libusb\os\poll_windows.c"
 				>
 			</File>
 			<File
@@ -365,11 +365,6 @@
 				RelativePath="..\libusb\os\threads_windows.c"
 				>
 			</File>
-
-			<File
-				RelativePath="..\libusb\os\poll_windows.c"
-				>
-			</File>
 			<File
 				RelativePath="..\libusb\os\windows_usb.c"
 				>
@@ -393,17 +388,21 @@
 				>
 			</File>
 			<File
-				RelativePath="..\libusb\os\threads_windows.h"
+				RelativePath="..\libusb\os\poll_windows.h"
 				>
 			</File>
 			<File
-				RelativePath="..\libusb\os\poll_windows.h"
+				RelativePath="..\libusb\os\threads_windows.h"
 				>
 			</File>
 			<File
 				RelativePath="..\libusb\os\windows_usb.h"
 				>
 			</File>
+			<File
+				RelativePath="..\libusb\os\windows_common.h"
+				>
+			</File>
 		</Filter>
 		<Filter
 			Name="Resource Files"
@@ -411,6 +410,10 @@
 			UniqueIdentifier="{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}"
 			>
 			<File
+				RelativePath="..\libusb\libusb-1.0.def"
+				>
+			</File>
+			<File
 				RelativePath="..\libusb\libusb-1.0.rc"
 				>
 			</File>
diff --git a/msvc/libusb_dll_2010.vcxproj b/msvc/libusb_dll_2010.vcxproj
index f1881fe..707f458 100644
--- a/msvc/libusb_dll_2010.vcxproj
+++ b/msvc/libusb_dll_2010.vcxproj
@@ -153,6 +153,7 @@
     <ClInclude Include="..\libusb\os\poll_windows.h" />
     <ClInclude Include="..\libusb\os\threads_windows.h" />
     <ClInclude Include="..\libusb\os\windows_usb.h" />
+    <ClInclude Include="..\libusb\os\windows_common.h" />
   </ItemGroup>
   <ItemGroup>
     <None Include="..\libusb\libusb-1.0.def" />
diff --git a/msvc/libusb_dll_2010.vcxproj.filters b/msvc/libusb_dll_2010.vcxproj.filters
index 3dacb2c..575bc4f 100644
--- a/msvc/libusb_dll_2010.vcxproj.filters
+++ b/msvc/libusb_dll_2010.vcxproj.filters
@@ -55,6 +55,9 @@
     <ClInclude Include="..\libusb\os\windows_usb.h">
       <Filter>Header Files</Filter>
     </ClInclude>
+    <ClInclude Include="..\libusb\os\windows_common.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
   </ItemGroup>
   <ItemGroup>
     <None Include="..\libusb\libusb-1.0.def">
diff --git a/msvc/libusb_static.dsp b/msvc/libusb_static.dsp
index b636691..afdbbed 100644
--- a/msvc/libusb_static.dsp
+++ b/msvc/libusb_static.dsp
@@ -165,6 +165,10 @@ SOURCE=..\libusb\os\threads_windows.h
 
 SOURCE=..\libusb\os\windows_usb.h
 # End Source File
+# Begin Source File
+
+SOURCE=..\libusb\os\windows_common.h
+# End Source File
 # End Group
 # End Target
 # End Project
diff --git a/msvc/libusb_static_2005.vcproj b/msvc/libusb_static_2005.vcproj
index e9ba31d..1d41004 100644
--- a/msvc/libusb_static_2005.vcproj
+++ b/msvc/libusb_static_2005.vcproj
@@ -339,6 +339,10 @@
 				RelativePath="..\libusb\os\windows_usb.h"
 				>
 			</File>
+			<File
+				RelativePath="..\libusb\os\windows_common.h"
+				>
+			</File>
 		</Filter>
 	</Files>
 	<Globals>
diff --git a/msvc/libusb_static_2010.vcxproj b/msvc/libusb_static_2010.vcxproj
index 57254be..0c445a4 100644
--- a/msvc/libusb_static_2010.vcxproj
+++ b/msvc/libusb_static_2010.vcxproj
@@ -143,6 +143,7 @@
     <ClInclude Include="..\libusb\os\poll_windows.h" />
     <ClInclude Include="..\libusb\os\threads_windows.h" />
     <ClInclude Include="..\libusb\os\windows_usb.h" />
+    <ClInclude Include="..\libusb\os\windows_common.h" />
   </ItemGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
   <ImportGroup Label="ExtensionTargets">
diff --git a/msvc/libusb_static_2010.vcxproj.filters b/msvc/libusb_static_2010.vcxproj.filters
index 8585fcf..39dc64e 100644
--- a/msvc/libusb_static_2010.vcxproj.filters
+++ b/msvc/libusb_static_2010.vcxproj.filters
@@ -52,5 +52,8 @@
     <ClInclude Include="..\libusb\os\windows_usb.h">
       <Filter>Header Files</Filter>
     </ClInclude>
+    <ClInclude Include="..\libusb\os\windows_common.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
   </ItemGroup>
 </Project>
\ No newline at end of file
diff --git a/msvc/libusb_static_2012.vcxproj b/msvc/libusb_static_2012.vcxproj
index 4323d04..a8a6bdc 100644
--- a/msvc/libusb_static_2012.vcxproj
+++ b/msvc/libusb_static_2012.vcxproj
@@ -147,6 +147,7 @@
     <ClInclude Include="..\libusb\os\poll_windows.h" />
     <ClInclude Include="..\libusb\os\threads_windows.h" />
     <ClInclude Include="..\libusb\os\windows_usb.h" />
+    <ClInclude Include="..\libusb\os\windows_common.h" />
   </ItemGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
   <ImportGroup Label="ExtensionTargets">
diff --git a/msvc/libusb_static_2012.vcxproj.filters b/msvc/libusb_static_2012.vcxproj.filters
index 8585fcf..39dc64e 100644
--- a/msvc/libusb_static_2012.vcxproj.filters
+++ b/msvc/libusb_static_2012.vcxproj.filters
@@ -52,5 +52,8 @@
     <ClInclude Include="..\libusb\os\windows_usb.h">
       <Filter>Header Files</Filter>
     </ClInclude>
+    <ClInclude Include="..\libusb\os\windows_common.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
   </ItemGroup>
 </Project>
\ No newline at end of file