[jjones] 59346: Build of CDFS.SYS, courtesy of Mr. Wang. - Ros-diffs

27 Jun 2013

Author: jjones
Date: Thu Jun 27 07:57:05 2013
New Revision: 59346

URL: http://svn.reactos.org/svn/reactos?rev=59346&view=rev
Log:
Build of CDFS.SYS, courtesy of Mr. Wang.

Modified:
    branches/vs_jc/reactos/   (props changed)
    branches/vs_jc/reactos/ReactOS.sln
    branches/vs_jc/reactos/_IMAGES/CD_Live/CD_Live.vcxproj
    branches/vs_jc/reactos/drivers/filesystems/cdfs/cdfs.vcxproj

Propchange: branches/vs_jc/reactos/
------------------------------------------------------------------------------

--- svn:mergeinfo	(original)
+++ svn:mergeinfo	Thu Jun 27 07:57:05 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-59328
+/trunk/reactos:59302-59337

Modified: branches/vs_jc/reactos/ReactOS.sln
URL:
http://svn.reactos.org/svn/reactos/branches/vs_jc/reactos/ReactOS.sln?rev=5…
==============================================================================
--- branches/vs_jc/reactos/ReactOS.sln	[iso-8859-1] (original)
+++ branches/vs_jc/reactos/ReactOS.sln	[iso-8859-1] Thu Jun 27 07:57:05 2013
@@ -1557,9 +1557,11 @@
 		{83D48240-6438-4890-9350-F256CC064F18}.Release|x86_64.ActiveCfg = Release|Win32
 		{1F0D3CAE-DA53-40BD-B7EA-77A521C4BBC2}.Debug|ARM.ActiveCfg = Debug|Win32
 		{1F0D3CAE-DA53-40BD-B7EA-77A521C4BBC2}.Debug|x86_32.ActiveCfg = Debug|Win32
+		{1F0D3CAE-DA53-40BD-B7EA-77A521C4BBC2}.Debug|x86_32.Build.0 = Debug|Win32
 		{1F0D3CAE-DA53-40BD-B7EA-77A521C4BBC2}.Debug|x86_64.ActiveCfg = Debug|Win32
 		{1F0D3CAE-DA53-40BD-B7EA-77A521C4BBC2}.Release|ARM.ActiveCfg = Release|Win32
 		{1F0D3CAE-DA53-40BD-B7EA-77A521C4BBC2}.Release|x86_32.ActiveCfg = Release|Win32
+		{1F0D3CAE-DA53-40BD-B7EA-77A521C4BBC2}.Release|x86_32.Build.0 = Release|Win32
 		{1F0D3CAE-DA53-40BD-B7EA-77A521C4BBC2}.Release|x86_64.ActiveCfg = Release|Win32
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution

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] Thu Jun 27
07:57:05 2013
@@ -37,6 +37,10 @@
 copy "$(SolutionDir)\base\applications\ATACTL\$(OutDir)\ATACTL.EXE" .
 REM "copy $(SolutionDir)\base\applications\CALC\$(OutDir)\CALC.EXE" .
 copy "$(SolutionDir)\media\nls\*.nls" .
+mkdir drivers
+cd drivers
+copy "$(SolutionDir)\drivers\filesystems\CDFS\$(OutDir)\CDFS.SYS" .
+cd ..
 mkdir config
 cd "$(SolutionDir)\boot\bootdata"
 "$(SolutionDir)\tools\mkhive\build\x86_32\$(Configuration)\mkhive.exe"
"$(TargetDir)\root\reactos\system32\config" hivecls.inf hivedef.inf hivesft.inf
hivesys.inf livecd.inf hiveinst.inf
@@ -67,6 +71,10 @@
 copy "$(SolutionDir)\base\applications\ATACTL\$(OutDir)\ATACTL.EXE" .
 REM "copy $(SolutionDir)\base\applications\CALC\$(OutDir)\CALC.EXE" .
 copy "$(SolutionDir)\media\nls\*.nls" .
+mkdir drivers
+cd drivers
+copy "$(SolutionDir)\drivers\filesystems\CDFS\$(OutDir)\CDFS.SYS" .
+cd ..
 mkdir config
 cd "$(SolutionDir)\boot\bootdata"
 "$(SolutionDir)\tools\mkhive\build\x86_32\$(Configuration)\mkhive.exe"
"$(TargetDir)\root\reactos\system32\config" hivecls.inf hivedef.inf hivesft.inf
hivesys.inf livecd.inf hiveinst.inf

Modified: branches/vs_jc/reactos/drivers/filesystems/cdfs/cdfs.vcxproj
URL:
http://svn.reactos.org/svn/reactos/branches/vs_jc/reactos/drivers/filesyste…
==============================================================================
--- branches/vs_jc/reactos/drivers/filesystems/cdfs/cdfs.vcxproj	[iso-8859-1] (original)
+++ branches/vs_jc/reactos/drivers/filesystems/cdfs/cdfs.vcxproj	[iso-8859-1] Thu Jun 27
07:57:05 2013
@@ -17,12 +17,12 @@
   </PropertyGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
   <PropertyGroup
Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'"
Label="Configuration">
-    <ConfigurationType>Application</ConfigurationType>
+    <ConfigurationType>DynamicLibrary</ConfigurationType>
     <UseDebugLibraries>true</UseDebugLibraries>
     <CharacterSet>Unicode</CharacterSet>
   </PropertyGroup>
   <PropertyGroup
Condition="'$(Configuration)|$(Platform)'=='Release|Win32'"
Label="Configuration">
-    <ConfigurationType>Application</ConfigurationType>
+    <ConfigurationType>DynamicLibrary</ConfigurationType>
     <UseDebugLibraries>false</UseDebugLibraries>
     <WholeProgramOptimization>true</WholeProgramOptimization>
     <CharacterSet>Unicode</CharacterSet>
@@ -41,11 +41,15 @@
     <LinkIncremental>true</LinkIncremental>
     <OutDir>build\x86_32\$(Configuration)\</OutDir>
     <IntDir>build\x86_32\$(Configuration)\</IntDir>
+    <GenerateManifest>false</GenerateManifest>
+    <TargetExt>.sys</TargetExt>
   </PropertyGroup>
   <PropertyGroup
Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
     <LinkIncremental>false</LinkIncremental>
     <OutDir>build\x86_32\$(Configuration)\</OutDir>
     <IntDir>build\x86_32\$(Configuration)\</IntDir>
+    <GenerateManifest>false</GenerateManifest>
+    <TargetExt>.sys</TargetExt>
   </PropertyGroup>
   <ItemDefinitionGroup
Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
     <ClCompile>
@@ -54,10 +58,26 @@
       <WarningLevel>Level3</WarningLevel>
       <Optimization>Disabled</Optimization>
      
<PreprocessorDefinitions>WIN32;_DEBUG;_WINDOWS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+     
<AdditionalIncludeDirectories>.\;..\..\..\include\psdk;..\..\..\include\ddk;..\..\..\include\reactos\mc\build\x86_32\$(Configuration)\ReactOS;..\..\..\include\crt;..\..\..\include\crt\msc;..\..\..\include\reactos;..\..\..\include;..\..\..\include\ndk;..\..\..\include\reactos\drivers</AdditionalIncludeDirectories>
+      <BasicRuntimeChecks>Default</BasicRuntimeChecks>
+      <BufferSecurityCheck>false</BufferSecurityCheck>
+      <IgnoreStandardIncludePath>true</IgnoreStandardIncludePath>
     </ClCompile>
     <Link>
-      <SubSystem>Windows</SubSystem>
+      <SubSystem>Native</SubSystem>
       <GenerateDebugInformation>true</GenerateDebugInformation>
+      <AdditionalOptions>
+      </AdditionalOptions>
+      <IgnoreAllDefaultLibraries>true</IgnoreAllDefaultLibraries>
+      <Driver>Driver</Driver>
+      <EntryPointSymbol>DriverEntry@8</EntryPointSymbol>
+      <BaseAddress>0x00010000</BaseAddress>
+      <FixedBaseAddress>
+      </FixedBaseAddress>
+      <RandomizedBaseAddress>
+      </RandomizedBaseAddress>
+      <DataExecutionPrevention>
+      </DataExecutionPrevention>
     </Link>
   </ItemDefinitionGroup>
   <ItemDefinitionGroup
Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
@@ -69,12 +89,26 @@
       <FunctionLevelLinking>true</FunctionLevelLinking>
       <IntrinsicFunctions>true</IntrinsicFunctions>
      
<PreprocessorDefinitions>WIN32;NDEBUG;_WINDOWS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+     
<AdditionalIncludeDirectories>.\;..\..\..\include\psdk;..\..\..\include\ddk;..\..\..\include\reactos\mc\build\x86_32\$(Configuration)\ReactOS;..\..\..\include\crt;..\..\..\include\crt\msc;..\..\..\include\reactos;..\..\..\include;..\..\..\include\ndk;..\..\..\include\reactos\drivers</AdditionalIncludeDirectories>
+      <BasicRuntimeChecks>Default</BasicRuntimeChecks>
+      <BufferSecurityCheck>false</BufferSecurityCheck>
+      <IgnoreStandardIncludePath>true</IgnoreStandardIncludePath>
     </ClCompile>
     <Link>
-      <SubSystem>Windows</SubSystem>
+      <SubSystem>Native</SubSystem>
       <GenerateDebugInformation>true</GenerateDebugInformation>
       <EnableCOMDATFolding>true</EnableCOMDATFolding>
       <OptimizeReferences>true</OptimizeReferences>
+      <IgnoreAllDefaultLibraries>true</IgnoreAllDefaultLibraries>
+      <Driver>Driver</Driver>
+      <EntryPointSymbol>DriverEntry@8</EntryPointSymbol>
+      <BaseAddress>0x00010000</BaseAddress>
+      <FixedBaseAddress>
+      </FixedBaseAddress>
+      <RandomizedBaseAddress>
+      </RandomizedBaseAddress>
+      <DataExecutionPrevention>
+      </DataExecutionPrevention>
     </Link>
   </ItemDefinitionGroup>
   <ItemGroup>
@@ -96,12 +130,25 @@
     <ClInclude Include="cdfs.h" />
   </ItemGroup>
   <ItemGroup>
-    <ResourceCompile Include="cdfs.rc" />
+    <ResourceCompile Include="cdfs.rc">
+      <AdditionalIncludeDirectories
Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">..\..\..\include;..\..\..\include\psdk</AdditionalIncludeDirectories>
+      <IgnoreStandardIncludePath
Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</IgnoreStandardIncludePath>
+      <AdditionalIncludeDirectories
Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">..\..\..\include;..\..\..\include\psdk</AdditionalIncludeDirectories>
+      <IgnoreStandardIncludePath
Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</IgnoreStandardIncludePath>
+    </ResourceCompile>
   </ItemGroup>
   <ItemGroup>
     <None Include="CMakeLists.txt" />
   </ItemGroup>
+  <ItemGroup>
+    <ProjectReference Include="..\..\..\lib\import\HAL\HAL.vcxproj">
+      <Project>{19d0d0aa-c065-4101-9f74-e45a87d35ba7}</Project>
+    </ProjectReference>
+    <ProjectReference
Include="..\..\..\lib\import\ntoskrnl\ntoskrnl.vcxproj">
+      <Project>{315ae91a-d723-485c-abd0-1378a1ead8e5}</Project>
+    </ProjectReference>
+  </ItemGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
   <ImportGroup Label="ExtensionTargets">
   </ImportGroup>
-</Project>
+</Project>



    