Remove the Includes section from a few INF file and Nt32.dsc buildable by commenting...

[mirror_edk2.git] / Nt32Pkg / Nt32.dsc

diff --git a/Nt32Pkg/Nt32.dsc b/Nt32Pkg/Nt32.dsc
index c7505c42f4e23af4cea598636410b90c2e856ca2..f26a8852cf672029975e6106d9538f7a15f2e787 100644 (file)
--- a/Nt32Pkg/Nt32.dsc
+++ b/Nt32Pkg/Nt32.dsc
@@ -406,16 +406,22 @@
 [Components.IA32]\r
   ${WORKSPACE}/Nt32Pkg/BootModePei/BootMode.inf\r
   $(WORKSPACE)/Nt32Pkg/WinNtThunkDxe/WinNtThunk.inf\r
-  #${WORKSPACE}/Nt32Pkg/MiscSubClassPlatformDxe/MiscSubclassDriver.inf\r
-  $(WORKSPACE)/Nt32Pkg/WinNtThunkDxe/WinNtThunk.inf\r
-  $(WORKSPACE)/Nt32Pkg/WinNtThunkPPIToProtocolPei/WinNtThunkPPIToProtocol.inf\r
-  $(WORKSPACE)/Nt32Pkg/WinNtAutoScanPei/WinNtAutoScan.inf\r
-  $(WORKSPACE)/Nt32Pkg/WinNtBlockIoDxe/WinNtBlockIo.inf\r
-  $(WORKSPACE)/Nt32Pkg/WinNtBusDriverDxe/WinNtBusDriver.inf\r
-  $(WORKSPACE)/Nt32Pkg/WinNtConsoleDxe/WinNtConsole.inf\r
-  $(WORKSPACE)/Nt32Pkg/WinNtSimpleFileSystemDxe/WinNtSimpleFileSystem.inf\r
-  $(WORKSPACE)/Nt32Pkg/WinNtGopDxe/WinNtGop.inf\r
-  $(WORKSPACE)/Nt32Pkg/WinNtSerialIoDxe/WinNtSerialIo.inf\r
+<<<<<<< .mine\r
+# ${WORKSPACE}/Nt32Pkg/MiscSubClassPlatformDxe/MiscSubclassDriver.inf\r
+  $(WORKSPACE)\Nt32Pkg\WinNtThunkDxe\WinNtThunk.inf\r
+  $(WORKSPACE)\Nt32Pkg\WinNtThunkPPIToProtocolPei\WinNtThunkPPIToProtocol.inf\r
+  $(WORKSPACE)\Nt32Pkg\WinNtAutoScanPei\WinNtAutoScan.inf\r
+  $(WORKSPACE)\Nt32Pkg\WinNtBlockIoDxe\WinNtBlockIo.inf\r
+  $(WORKSPACE)\Nt32Pkg\WinNtBusDriverDxe\WinNtBusDriver.inf\r
+  $(WORKSPACE)\Nt32Pkg\WinNtConsoleDxe\WinNtConsole.inf\r
+  $(WORKSPACE)\Nt32Pkg\WinNtSimpleFileSystemDxe\WinNtSimpleFileSystem.inf\r
+  $(WORKSPACE)\Nt32Pkg\WinNtGopDxe\WinNtGop.inf\r
+  $(WORKSPACE)\Nt32Pkg\WinNtSerialIoDxe\WinNtSerialIo.inf\r
+#  $(WORKSPACE)\Nt32Pkg\TimerDxe\Timer.inf\r
+#  $(WORKSPACE)\Nt32Pkg\ResetRuntimeDxe\Reset.inf\r
+#  $(WORKSPACE)\Nt32Pkg\RealTimeClockRuntimeDxe\RealTimeClock.inf\r
+#  $(WORKSPACE)\Nt32Pkg\MonotonicCounterRuntimeDxe\Metronome.inf\r
+#  $(WORKSPACE)\Nt32Pkg\CpuRuntimeDxe\Cpu.inf\r
   $(WORKSPACE)/Nt32Pkg/FvbServicesRuntimeDxe/Nt32Fwh.inf\r
   ${WORKSPACE}/MdeModulePkg/Universal/Security/SecurityStub/Dxe/SecurityStub.inf\r
   ${WORKSPACE}/MdeModulePkg/Universal/Capsule/RuntimeDxe/CapsuleRuntime.inf\r