From 3a98b778ab22972beb5fe8734d032d477dc5d870 Mon Sep 17 00:00:00 2001 From: AJFISH Date: Thu, 28 Jun 2007 20:26:24 +0000 Subject: [PATCH] Updated *.dec files and .h files to support correct include path scheme git-svn-id: https://edk2.svn.sourceforge.net/svnroot/edk2/trunk/edk2@2863 6f19259b-4bc3-4df7-8a09-765794883524 --- IntelFrameworkPkg/IntelFrameworkPkg.dec | 3 +- .../Application/HelloWorld/HelloWorld.inf | 2 +- MdeModulePkg/MdeModulePkg.dec | 10 ++---- MdePkg/MdePkg.dec | 17 +++------- Nt32Pkg/Include/Library/WinNtLib.h | 32 ++++++++----------- Nt32Pkg/Nt32Pkg.dec | 6 +--- 6 files changed, 23 insertions(+), 47 deletions(-) diff --git a/IntelFrameworkPkg/IntelFrameworkPkg.dec b/IntelFrameworkPkg/IntelFrameworkPkg.dec index 71c1b6b357..67d9a66e6d 100644 --- a/IntelFrameworkPkg/IntelFrameworkPkg.dec +++ b/IntelFrameworkPkg/IntelFrameworkPkg.dec @@ -38,8 +38,7 @@ # ################################################################################ [Includes.common] - Include # BASE - + Include # Root include for the package ################################################################################ # diff --git a/MdeModulePkg/Application/HelloWorld/HelloWorld.inf b/MdeModulePkg/Application/HelloWorld/HelloWorld.inf index dbe69fced2..80eba65750 100644 --- a/MdeModulePkg/Application/HelloWorld/HelloWorld.inf +++ b/MdeModulePkg/Application/HelloWorld/HelloWorld.inf @@ -64,8 +64,8 @@ ################################################################################ [Packages] - $(WORKSPACE)/MdeModulePkg/MdeModulePkg.dec $(WORKSPACE)/MdePkg/MdePkg.dec + $(WORKSPACE)/MdeModulePkg/MdeModulePkg.dec ################################################################################ diff --git a/MdeModulePkg/MdeModulePkg.dec b/MdeModulePkg/MdeModulePkg.dec index 26663663be..700939fe50 100644 --- a/MdeModulePkg/MdeModulePkg.dec +++ b/MdeModulePkg/MdeModulePkg.dec @@ -28,7 +28,8 @@ PACKAGE_GUID = BA0D78D6-2CAF-414b-BD4D-B6762A894288 PACKAGE_VERSION = 0.1 - +[Includes.common] + Include ################################################################################ # @@ -62,13 +63,6 @@ gEfiMdePkgTokenSpaceGuid = { 0xA1AFF049, 0xFDEB, 0x442a, { 0xB3, 0x20, 0x13, 0xAB, 0x4C, 0xB7, 0x2B, 0xBC }} -[Includes.common] - Include - Include/Library - Include/Ppi - Include/Common - Include/Protocol - ################################################################################ # # Global Protocols Definition section - list of Global Protocols C Name Data diff --git a/MdePkg/MdePkg.dec b/MdePkg/MdePkg.dec index 5f6d8176f9..0a84e9a96f 100644 --- a/MdePkg/MdePkg.dec +++ b/MdePkg/MdePkg.dec @@ -40,26 +40,19 @@ # ################################################################################ [Includes.common] - Include # Base PiPei PiDxe Uefi - Include/Guid # GUIDs that are declared by the MDE Package - Include/Library # All Mde Libraries - Include/IndustryStandard # Acpi Pci22 Scsi Usb SmBus - Include/Protocol # The summary of protocols introduced by UEFI2.0/UEFI2.1/EFI1.1/PI1.0 - Include/Ppi # All PPIs defined in PI1.0 - Include/Pi # PI definitions - Include/Uefi # UEFI definitions + Include # Root include for the package [Includes.Ia32] - Include/Ia32 # ProcessorBind + Include/Ia32 # Processor specific include path for pacakge [Includes.X64] - Include/x64 # ProcessorBind + Include/x64 # Processor specific include path for pacakge [Includes.IPF] - Include/Ipf # IpfDefines IpfMacro ProcessorBind SalApi + Include/Ipf # Processor specific include path for pacakge [Includes.EBC] - Include/Ebc # ProcessorBind + Include/Ebc # Processor specific include path for pacakge ################################################################################ # diff --git a/Nt32Pkg/Include/Library/WinNtLib.h b/Nt32Pkg/Include/Library/WinNtLib.h index 9210a572b5..0d202257c4 100644 --- a/Nt32Pkg/Include/Library/WinNtLib.h +++ b/Nt32Pkg/Include/Library/WinNtLib.h @@ -1,28 +1,22 @@ -/*++ - -Copyright (c) 2006, Intel Corporation -All rights reserved. This program and the accompanying materials -are licensed and made available under the terms and conditions of the BSD License -which accompanies this distribution. The full text of the license may be found at -http://opensource.org/licenses/bsd-license.php - -THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS, -WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED. - -Module Name: - - WinNtLib.h +/** @file + Public include file for the WinNt Library -Abstract: +Copyright (c) 2006 - 2007, Intel Corporation +All rights reserved. This program and the accompanying materials +are licensed and made available under the terms and conditions of the BSD License +which accompanies this distribution. The full text of the license may be found at +http://opensource.org/licenses/bsd-license.php - Public include file for the WinNt Library +THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS, +WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED. ---*/ +**/ #ifndef __WIN_NT_LIB_H__ #define __WIN_NT_LIB_H__ -#include +#include + extern EFI_WIN_NT_THUNK_PROTOCOL *gWinNt; -#endif \ No newline at end of file +#endif diff --git a/Nt32Pkg/Nt32Pkg.dec b/Nt32Pkg/Nt32Pkg.dec index 0476aeb28b..02c19e005a 100644 --- a/Nt32Pkg/Nt32Pkg.dec +++ b/Nt32Pkg/Nt32Pkg.dec @@ -37,11 +37,7 @@ # ################################################################################ [Includes.common] - Include # FlashLayout WinNtDxe WinNtPeim - Include/Library # EdkGenericBdsLib WinNtLib - Include/Ppi # NtAutoscan NtFwh NtPeiLoadFile NtThunk - Include/Common # WinNTInclude - Include/Protocol # WinNtIo WinNtThunk + Include # Root include for the package ################################################################################ -- 2.39.2