[ros-diffs] [jjones] 59407: Add support for compiling USBUHCI.SYS, courtesy of Mr. Wang.

Author: jjones
Date: Mon Jul  1 16:57:17 2013
New Revision: 59407

URL: http://svn.reactos.org/svn/reactos?rev=59407&view=rev
Log:
Add support for compiling USBUHCI.SYS, courtesy of Mr. Wang.

Modified:
    branches/vs_jc/reactos/   (props changed)
    branches/vs_jc/reactos/_IMAGES/CD_Live/CD_Live.vcxproj
    branches/vs_jc/reactos/lib/drivers/libusb/libusb.vcxproj

Propchange: branches/vs_jc/reactos/
------------------------------------------------------------------------------
--- svn:mergeinfo	(original)
+++ svn:mergeinfo	Mon Jul  1 16:57:17 2013
@@ -15,4 +15,4 @@

/branches/usb-bringup:51335,51337,51341-51343,51348,51350,51353,51355,51365-51369,51372,51384-54388,54396-54398,54736-54737,54752-54754,54756-54760,54762,54764-54765,54767-54768,54772,54774-54777,54781,54787,54790-54792,54797-54798,54806,54808,54834-54838,54843,54850,54852,54856,54858-54859
 /branches/usb-bringup-trunk:55019-55543,55548-55554,55556-55567
 /branches/wlan-bringup:54809-54998
-/trunk/reactos:59302-59337
+/trunk/reactos:59302-59397

Modified: branches/vs_jc/reactos/_IMAGES/CD_Live/CD_Live.vcxproj
URL:
http://svn.reactos.org/svn/reactos/branches/vs_jc/reactos/_IMAGES/CD_Live/C…
==============================================================================
--- branches/vs_jc/reactos/_IMAGES/CD_Live/CD_Live.vcxproj	[iso-8859-1] (original)
+++ branches/vs_jc/reactos/_IMAGES/CD_Live/CD_Live.vcxproj	[iso-8859-1] Mon Jul  1
16:57:17 2013
@@ -42,6 +42,7 @@
 copy "$(SolutionDir)\drivers\filesystems\CDFS\$(OutDir)\CDFS.SYS" .
 copy "$(SolutionDir)\drivers\bus\PCI\$(OutDir)\PCI.SYS" .
 copy "$(SolutionDir)\drivers\usb\usbuhci\$(OutDir)\USBUHCI.SYS" .
+copy "$(SolutionDir)\drivers\usb\usbd\$(OutDir)\USBD.SYS" .
 cd ..
 mkdir config
 cd "$(SolutionDir)\boot\bootdata"
@@ -78,6 +79,7 @@
 copy "$(SolutionDir)\drivers\filesystems\CDFS\$(OutDir)\CDFS.SYS" .
 copy "$(SolutionDir)\drivers\bus\PCI\$(OutDir)\PCI.SYS" .
 copy "$(SolutionDir)\drivers\usb\usbuhci\$(OutDir)\USBUHCI.SYS" .
+copy "$(SolutionDir)\drivers\usb\usbd\$(OutDir)\USBD.SYS" .
 cd ..
 mkdir config
 cd "$(SolutionDir)\boot\bootdata"
@@ -106,6 +108,12 @@
     </ProjectReference>
     <ProjectReference
Include="..\..\drivers\filesystems\cdfs\cdfs.vcxproj">
       <Project>{1f0d3cae-da53-40bd-b7ea-77a521c4bbc2}</Project>
+    </ProjectReference>
+    <ProjectReference Include="..\..\drivers\usb\usbd\usbd.vcxproj">
+      <Project>{17786c00-926d-45ff-a031-3800821afc7a}</Project>
+    </ProjectReference>
+    <ProjectReference
Include="..\..\drivers\usb\usbuhci\usbuhci.vcxproj">
+      <Project>{1bf87245-cd63-4e76-a594-1790bd61c498}</Project>
     </ProjectReference>
     <ProjectReference Include="..\..\hal\hal.vcxproj">
       <Project>{ba5347bf-c0fd-44f0-976e-510b4d48e07b}</Project>
@@ -192,4 +200,4 @@
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
   <ImportGroup Label="ExtensionTargets">
   </ImportGroup>
-</Project>
+</Project>

Modified: branches/vs_jc/reactos/lib/drivers/libusb/libusb.vcxproj
URL:
http://svn.reactos.org/svn/reactos/branches/vs_jc/reactos/lib/drivers/libus…
==============================================================================
--- branches/vs_jc/reactos/lib/drivers/libusb/libusb.vcxproj	[iso-8859-1] (original)
+++ branches/vs_jc/reactos/lib/drivers/libusb/libusb.vcxproj	[iso-8859-1] Mon Jul  1
16:57:17 2013
@@ -56,7 +56,7 @@
       <WarningLevel>Level3</WarningLevel>
       <Optimization>Disabled</Optimization>
      
<PreprocessorDefinitions>WIN32;_DEBUG;_LIB;_WIN32_WINNT=0x600;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-     
<AdditionalIncludeDirectories>..\..\..\include\psdk;..\..\..\include\ddk;..\..\..\include\reactos\mc\build\x86_32\$(Configuration)\ReactOS;..\..\..\include\reactos</AdditionalIncludeDirectories>
+     
<AdditionalIncludeDirectories>..\..\..\include\psdk;..\..\..\include\ddk;..\..\..\include\reactos\mc\build\x86_32\$(Configuration)\ReactOS;..\..\..\include\crt;..\..\..\include\crt\msc;..\..\..\include\reactos</AdditionalIncludeDirectories>
       <BasicRuntimeChecks>Default</BasicRuntimeChecks>
       <CompileAs>CompileAsCpp</CompileAs>
       <BufferSecurityCheck>false</BufferSecurityCheck>
@@ -81,7 +81,7 @@
       <FunctionLevelLinking>true</FunctionLevelLinking>
       <IntrinsicFunctions>true</IntrinsicFunctions>
      
<PreprocessorDefinitions>WIN32;NDEBUG;_LIB;_WIN32_WINNT=0x600;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-     
<AdditionalIncludeDirectories>..\..\..\include\psdk;..\..\..\include\ddk;..\..\..\include\reactos\mc\build\x86_32\$(Configuration)\ReactOS</AdditionalIncludeDirectories>
+     
<AdditionalIncludeDirectories>..\..\..\include\psdk;..\..\..\include\ddk;..\..\..\include\reactos\mc\build\x86_32\$(Configuration)\ReactOS;..\..\..\include\crt;..\..\..\include\crt\msc;..\..\..\include\reactos</AdditionalIncludeDirectories>
       <BasicRuntimeChecks>Default</BasicRuntimeChecks>
       <BufferSecurityCheck>false</BufferSecurityCheck>
       <ExceptionHandling>false</ExceptionHandling>
@@ -117,4 +117,4 @@
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
   <ImportGroup Label="ExtensionTargets">
   </ImportGroup>
-</Project>
+</Project>