From 5284a662181ff4b81dd19d1279aedb68725b827f Mon Sep 17 00:00:00 2001 From: vit9696 Date: Tue, 7 May 2024 15:43:14 +0300 Subject: [PATCH] Fix compilation with recent audk-stable-202305 references acidanthera/bugtracker#2398 --- .github/workflows/main.yml | 5 +-- Changelog.md | 3 ++ edk2misc.c | 31 +--------------- .../project.pbxproj | 32 +++++++++++++---- gfxutil.xcodeproj/project.pbxproj | 36 +++++++++++++++---- .../xcshareddata/xcschemes/gfxutil.xcscheme | 2 +- .../project.pbxproj | 32 +++++++++++++---- .../project.pbxproj | 32 +++++++++++++---- 8 files changed, 116 insertions(+), 57 deletions(-) diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index c9194d2..0d44ef5 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -17,12 +17,13 @@ jobs: env: JOB_TYPE: BUILD steps: - - uses: actions/checkout@v3 + - uses: actions/checkout@v4 with: path: gfxutil - - uses: actions/checkout@v3 + - uses: actions/checkout@v4 with: repository: acidanthera/audk + ref: audk-stable-202305 path: edk2 - name: CI Bootstrap run: | diff --git a/Changelog.md b/Changelog.md index 29a82dc..383cec1 100644 --- a/Changelog.md +++ b/Changelog.md @@ -1,5 +1,8 @@ gfxutil changelog ================= +#### 1.84b +- Switched to audk-stable-202305 for base EDK II version + #### 1.83b - Fixed version in asset names diff --git a/edk2misc.c b/edk2misc.c index fe3c7b9..21e6f04 100644 --- a/edk2misc.c +++ b/edk2misc.c @@ -40,35 +40,6 @@ EFI_GUID gEfiVTUTF8Guid = EFI_VT_UTF8_GUID; EFI_GUID gEfiDevicePathProtocolGuid = EFI_DEVICE_PATH_PROTOCOL_GUID; - -VOID * -InternalAllocateCopyPool ( - UINTN AllocationSize, - CONST VOID *Buffer - ) -{ - VOID *Memory; - - ASSERT (Buffer != NULL); - - Memory = malloc (AllocationSize); - if (Memory != NULL) { - Memory = memcpy (Memory, Buffer, AllocationSize); - } - return Memory; -} - - -VOID * -AllocateCopyPool ( - UINTN AllocationSize, - CONST VOID *Buffer - ) -{ - return InternalAllocateCopyPool (AllocationSize, Buffer); -} - - EFI_STATUS EFIAPI DontHandleProtocol ( @@ -511,7 +482,7 @@ void VerifyDevicePathNodeSizes(VOID * DevicePath) { EFI_STATUS EFIAPI -UefiBootServicesTableLibConstructor () +UefiBootServicesTableLibConstructor (void) { ZeroMem(&BS, sizeof(&BS)); BS.HandleProtocol = &DontHandleProtocol; diff --git a/gfxutil xcode 3.2.1 10.6 i386 x86_64.xcodeproj/project.pbxproj b/gfxutil xcode 3.2.1 10.6 i386 x86_64.xcodeproj/project.pbxproj index a22fd8c..b2070a1 100644 --- a/gfxutil xcode 3.2.1 10.6 i386 x86_64.xcodeproj/project.pbxproj +++ b/gfxutil xcode 3.2.1 10.6 i386 x86_64.xcodeproj/project.pbxproj @@ -19,7 +19,7 @@ 6374FFED266ACF1800ABDA7F /* MemLibGeneric.c in Sources */ = {isa = PBXBuildFile; fileRef = 6377A5B223A56E5400AE5FF7 /* MemLibGeneric.c */; }; 6374FFEE266ACF1800ABDA7F /* RShiftU64.c in Sources */ = {isa = PBXBuildFile; fileRef = 6377A5AF23A56E5400AE5FF7 /* RShiftU64.c */; }; 6374FFEF266ACF1800ABDA7F /* MultU64x32.c in Sources */ = {isa = PBXBuildFile; fileRef = 6377A5A423A56E5400AE5FF7 /* MultU64x32.c */; }; - 6374FFF0266ACF1800ABDA7F /* DevicePathUtilitiesStandaloneMm.c in Sources */ = {isa = PBXBuildFile; fileRef = 639FC4072664B551006E6C44 /* DevicePathUtilitiesStandaloneMm.c */; }; + 6374FFF0266ACF1800ABDA7F /* DevicePathUtilitiesBase.c in Sources */ = {isa = PBXBuildFile; fileRef = 639FC4072664B551006E6C44 /* DevicePathUtilitiesBase.c */; }; 6374FFF1266ACF1800ABDA7F /* MemLibGuid.c in Sources */ = {isa = PBXBuildFile; fileRef = 6377A5AA23A56E5400AE5FF7 /* MemLibGuid.c */; }; 6374FFF2266ACF1800ABDA7F /* SafeString.c in Sources */ = {isa = PBXBuildFile; fileRef = 6377A5A723A56E5400AE5FF7 /* SafeString.c */; }; 6374FFF3266ACF1800ABDA7F /* CopyMemWrapper.c in Sources */ = {isa = PBXBuildFile; fileRef = 6377A5AE23A56E5400AE5FF7 /* CopyMemWrapper.c */; }; @@ -42,6 +42,10 @@ 8DD76F770486A8DE00D96B5E /* main.c in Sources */ = {isa = PBXBuildFile; fileRef = 08FB7796FE84155DC02AAC07 /* main.c */; settings = {ATTRIBUTES = (); }; }; 8DD76F7C0486A8DE00D96B5E /* gfxutil.1 in CopyFiles */ = {isa = PBXBuildFile; fileRef = C6859E970290921104C91782 /* gfxutil.1 */; }; 9813AB380D12A271001DF28C /* utils.c in Sources */ = {isa = PBXBuildFile; fileRef = 9813AB360D12A271001DF28C /* utils.c */; }; + CE72D6952BEA58E0000F48A9 /* CommonMemoryAllocationLib.c in Sources */ = {isa = PBXBuildFile; fileRef = CE72D6922BEA58E0000F48A9 /* CommonMemoryAllocationLib.c */; }; + CE72D6962BEA58E0000F48A9 /* CommonMemoryAllocationLibEx.c in Sources */ = {isa = PBXBuildFile; fileRef = CE72D6932BEA58E0000F48A9 /* CommonMemoryAllocationLibEx.c */; }; + CE72D6972BEA58E0000F48A9 /* AlignedPages.c in Sources */ = {isa = PBXBuildFile; fileRef = CE72D6942BEA58E0000F48A9 /* AlignedPages.c */; }; + CE72D6992BEA5902000F48A9 /* BaseMemoryProfileLibNull.c in Sources */ = {isa = PBXBuildFile; fileRef = CE72D6982BEA5902000F48A9 /* BaseMemoryProfileLibNull.c */; }; /* End PBXBuildFile section */ /* Begin PBXBuildRule section */ @@ -104,7 +108,7 @@ 6377A5BD23A56E5500AE5FF7 /* PrintLibInternal.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = PrintLibInternal.c; path = ../edk2/MdePkg/Library/BasePrintLib/PrintLibInternal.c; sourceTree = ""; }; 6377A5DA23A572B000AE5FF7 /* edk2misc.c */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.c; path = edk2misc.c; sourceTree = ""; }; 6377A5DC23A5C97100AE5FF7 /* edk2misc.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = edk2misc.h; sourceTree = ""; }; - 639FC4072664B551006E6C44 /* DevicePathUtilitiesStandaloneMm.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = DevicePathUtilitiesStandaloneMm.c; path = ../edk2/MdePkg/Library/UefiDevicePathLib/DevicePathUtilitiesStandaloneMm.c; sourceTree = ""; }; + 639FC4072664B551006E6C44 /* DevicePathUtilitiesBase.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = DevicePathUtilitiesBase.c; path = ../edk2/MdePkg/Library/UefiDevicePathLib/DevicePathUtilitiesBase.c; sourceTree = ""; }; 63C2792A23B32CAA008C348C /* efidevp.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = efidevp.h; sourceTree = ""; }; 63C2792B23B32CAA008C348C /* efidevp.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = efidevp.c; sourceTree = ""; }; 63C2792D23B33648008C348C /* DevicePath.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = DevicePath.h; path = ../edk2/MdePkg/Include/Protocol/DevicePath.h; sourceTree = ""; }; @@ -117,6 +121,10 @@ 98CAD3FE0D3381B500808BB2 /* main.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = main.h; sourceTree = ""; }; C6859E970290921104C91782 /* gfxutil.1 */ = {isa = PBXFileReference; lastKnownFileType = text.man; path = gfxutil.1; sourceTree = ""; }; CE147CCF2185E87400536AE6 /* Changelog.md */ = {isa = PBXFileReference; lastKnownFileType = text; path = Changelog.md; sourceTree = ""; }; + CE72D6922BEA58E0000F48A9 /* CommonMemoryAllocationLib.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = CommonMemoryAllocationLib.c; path = ../edk2/MdeModulePkg/Library/CommonMemoryAllocationLib/CommonMemoryAllocationLib.c; sourceTree = ""; }; + CE72D6932BEA58E0000F48A9 /* CommonMemoryAllocationLibEx.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = CommonMemoryAllocationLibEx.c; path = ../edk2/MdeModulePkg/Library/CommonMemoryAllocationLib/CommonMemoryAllocationLibEx.c; sourceTree = ""; }; + CE72D6942BEA58E0000F48A9 /* AlignedPages.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = AlignedPages.c; path = ../edk2/MdeModulePkg/Library/CommonMemoryAllocationLib/AlignedPages.c; sourceTree = ""; }; + CE72D6982BEA5902000F48A9 /* BaseMemoryProfileLibNull.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = BaseMemoryProfileLibNull.c; path = ../edk2/MdeModulePkg/Library/BaseMemoryProfileLibNull/BaseMemoryProfileLibNull.c; sourceTree = ""; }; CEC0494720FEA1B300FBCAC9 /* README.md */ = {isa = PBXFileReference; lastKnownFileType = text; path = README.md; sourceTree = ""; }; /* End PBXFileReference section */ @@ -173,6 +181,10 @@ 6377A5D923A56EDA00AE5FF7 /* edk */ = { isa = PBXGroup; children = ( + CE72D6942BEA58E0000F48A9 /* AlignedPages.c */, + CE72D6922BEA58E0000F48A9 /* CommonMemoryAllocationLib.c */, + CE72D6932BEA58E0000F48A9 /* CommonMemoryAllocationLibEx.c */, + CE72D6982BEA5902000F48A9 /* BaseMemoryProfileLibNull.c */, 6377A5AC23A56E5400AE5FF7 /* BitField.c */, 6377A5A823A56E5400AE5FF7 /* CopyMem.c */, 6377A5AE23A56E5400AE5FF7 /* CopyMemWrapper.c */, @@ -181,7 +193,7 @@ 6377A5B523A56E5500AE5FF7 /* DevicePathFromText.c */, 6377A5B323A56E5500AE5FF7 /* DevicePathToText.c */, 6377A5B623A56E5500AE5FF7 /* DevicePathUtilities.c */, - 639FC4072664B551006E6C44 /* DevicePathUtilitiesStandaloneMm.c */, + 639FC4072664B551006E6C44 /* DevicePathUtilitiesBase.c */, 6377A5B123A56E5400AE5FF7 /* DivU64x32.c */, 6377A5A323A56E5300AE5FF7 /* DivU64x32Remainder.c */, 6377A5B723A56E5500AE5FF7 /* LShiftU64.c */, @@ -305,12 +317,15 @@ 6374FFF5266ACF1800ABDA7F /* SetMem.c in Sources */, 6374FFE7266ACF1800ABDA7F /* SwapBytes64.c in Sources */, 6374FFF8266ACF1800ABDA7F /* SwapBytes32.c in Sources */, + CE72D6952BEA58E0000F48A9 /* CommonMemoryAllocationLib.c in Sources */, + CE72D6962BEA58E0000F48A9 /* CommonMemoryAllocationLibEx.c in Sources */, 6374FFFE266ACF1800ABDA7F /* LShiftU64.c in Sources */, 6374FFEC266ACF1800ABDA7F /* PrintLib.c in Sources */, 63740002266ACF1800ABDA7F /* SwapBytes16.c in Sources */, + CE72D6992BEA5902000F48A9 /* BaseMemoryProfileLibNull.c in Sources */, 6374FFF2266ACF1800ABDA7F /* SafeString.c in Sources */, 6374FFEB266ACF1800ABDA7F /* Math64.c in Sources */, - 6374FFF0266ACF1800ABDA7F /* DevicePathUtilitiesStandaloneMm.c in Sources */, + 6374FFF0266ACF1800ABDA7F /* DevicePathUtilitiesBase.c in Sources */, 6374FFFA266ACF1800ABDA7F /* UefiDevicePathLib.c in Sources */, 6374FFEF266ACF1800ABDA7F /* MultU64x32.c in Sources */, 6374FFE9266ACF1800ABDA7F /* DevicePathFromText.c in Sources */, @@ -322,6 +337,7 @@ 6374FFED266ACF1800ABDA7F /* MemLibGeneric.c in Sources */, 6374FFF6266ACF1800ABDA7F /* Unaligned.c in Sources */, 63740001266ACF1800ABDA7F /* PrintLibInternal.c in Sources */, + CE72D6972BEA58E0000F48A9 /* AlignedPages.c in Sources */, 6374FFFF266ACF1800ABDA7F /* String.c in Sources */, 6374FFFB266ACF1800ABDA7F /* CopyMem.c in Sources */, 6374FFE8266ACF1800ABDA7F /* ZeroMemWrapper.c in Sources */, @@ -354,6 +370,8 @@ ../edk2/MdePkg/Library/UefiMemoryLib, ../edk2/MdePkg/Library/BaseLib, ../edk2/MdePkg/Library/BasePrintLib, + ../edk2/MdeModulePkg/Include, + ../edk2/MdeModulePkg/Library, ., ); INSTALL_PATH = /usr/local/bin; @@ -367,7 +385,7 @@ OTHER_LDFLAGS = ""; PRODUCT_NAME = gfxutil; SDKROOT = "$(DEVELOPER_SDK_DIR)/MacOSX10.6.sdk"; - USER_HEADER_SEARCH_PATHS = "../edk2/MdePkg/Include ../edk2/MdePkg/Library/UefiDevicePathLib ../edk2/MdePkg/Library/UefiMemoryLib ../edk2/MdePkg/Library/BaseLib ../edk2/MdePkg/Library/BasePrintLib"; + USER_HEADER_SEARCH_PATHS = "../edk2/MdePkg/Include ../edk2/MdePkg/Library/UefiDevicePathLib ../edk2/MdePkg/Library/UefiMemoryLib ../edk2/MdePkg/Library/BaseLib ../edk2/MdePkg/Library/BasePrintLib ../edk2/MdeModulePkg/Include ../edk2/MdeModulePkg/Library"; }; name = Debug; }; @@ -388,6 +406,8 @@ ../edk2/MdePkg/Library/UefiMemoryLib, ../edk2/MdePkg/Library/BaseLib, ../edk2/MdePkg/Library/BasePrintLib, + ../edk2/MdeModulePkg/Include, + ../edk2/MdeModulePkg/Library, ., ); INSTALL_PATH = /usr/local/bin; @@ -401,7 +421,7 @@ OTHER_LDFLAGS = ""; PRODUCT_NAME = gfxutil; SDKROOT = "$(DEVELOPER_SDK_DIR)/MacOSX10.6.sdk"; - USER_HEADER_SEARCH_PATHS = "../edk2/MdePkg/Include ../edk2/MdePkg/Library/UefiDevicePathLib ../edk2/MdePkg/Library/UefiMemoryLib ../edk2/MdePkg/Library/BaseLib ../edk2/MdePkg/Library/BasePrintLib"; + USER_HEADER_SEARCH_PATHS = "../edk2/MdePkg/Include ../edk2/MdePkg/Library/UefiDevicePathLib ../edk2/MdePkg/Library/UefiMemoryLib ../edk2/MdePkg/Library/BaseLib ../edk2/MdePkg/Library/BasePrintLib ../edk2/MdeModulePkg/Include ../edk2/MdeModulePkg/Library"; }; name = Release; }; diff --git a/gfxutil.xcodeproj/project.pbxproj b/gfxutil.xcodeproj/project.pbxproj index 02665ab..0005a57 100644 --- a/gfxutil.xcodeproj/project.pbxproj +++ b/gfxutil.xcodeproj/project.pbxproj @@ -3,7 +3,7 @@ archiveVersion = 1; classes = { }; - objectVersion = 52; + objectVersion = 54; objects = { /* Begin PBXBuildFile section */ @@ -19,7 +19,7 @@ 6374FFED266ACF1800ABDA7F /* MemLibGeneric.c in Sources */ = {isa = PBXBuildFile; fileRef = 6377A5B223A56E5400AE5FF7 /* MemLibGeneric.c */; }; 6374FFEE266ACF1800ABDA7F /* RShiftU64.c in Sources */ = {isa = PBXBuildFile; fileRef = 6377A5AF23A56E5400AE5FF7 /* RShiftU64.c */; }; 6374FFEF266ACF1800ABDA7F /* MultU64x32.c in Sources */ = {isa = PBXBuildFile; fileRef = 6377A5A423A56E5400AE5FF7 /* MultU64x32.c */; }; - 6374FFF0266ACF1800ABDA7F /* DevicePathUtilitiesStandaloneMm.c in Sources */ = {isa = PBXBuildFile; fileRef = 639FC4072664B551006E6C44 /* DevicePathUtilitiesStandaloneMm.c */; }; + 6374FFF0266ACF1800ABDA7F /* DevicePathUtilitiesBase.c in Sources */ = {isa = PBXBuildFile; fileRef = 639FC4072664B551006E6C44 /* DevicePathUtilitiesBase.c */; }; 6374FFF1266ACF1800ABDA7F /* MemLibGuid.c in Sources */ = {isa = PBXBuildFile; fileRef = 6377A5AA23A56E5400AE5FF7 /* MemLibGuid.c */; }; 6374FFF2266ACF1800ABDA7F /* SafeString.c in Sources */ = {isa = PBXBuildFile; fileRef = 6377A5A723A56E5400AE5FF7 /* SafeString.c */; }; 6374FFF3266ACF1800ABDA7F /* CopyMemWrapper.c in Sources */ = {isa = PBXBuildFile; fileRef = 6377A5AE23A56E5400AE5FF7 /* CopyMemWrapper.c */; }; @@ -42,6 +42,10 @@ 9813AB380D12A271001DF28C /* utils.c in Sources */ = {isa = PBXBuildFile; fileRef = 9813AB360D12A271001DF28C /* utils.c */; }; CE363A8220FE90F000ED7DC0 /* IOKit.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = CE363A8120FE90F000ED7DC0 /* IOKit.framework */; }; CE363A8420FE90FC00ED7DC0 /* CoreFoundation.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = CE363A8320FE90FC00ED7DC0 /* CoreFoundation.framework */; }; + CE72D68B2BEA53EA000F48A9 /* CommonMemoryAllocationLib.c in Sources */ = {isa = PBXBuildFile; fileRef = CE72D68A2BEA53EA000F48A9 /* CommonMemoryAllocationLib.c */; }; + CE72D68D2BEA5491000F48A9 /* AlignedPages.c in Sources */ = {isa = PBXBuildFile; fileRef = CE72D68C2BEA5491000F48A9 /* AlignedPages.c */; }; + CE72D68F2BEA54C1000F48A9 /* CommonMemoryAllocationLibEx.c in Sources */ = {isa = PBXBuildFile; fileRef = CE72D68E2BEA54C1000F48A9 /* CommonMemoryAllocationLibEx.c */; }; + CE72D6912BEA5504000F48A9 /* BaseMemoryProfileLibNull.c in Sources */ = {isa = PBXBuildFile; fileRef = CE72D6902BEA5504000F48A9 /* BaseMemoryProfileLibNull.c */; }; /* End PBXBuildFile section */ /* Begin PBXBuildRule section */ @@ -108,7 +112,7 @@ 6377A5BD23A56E5500AE5FF7 /* PrintLibInternal.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = PrintLibInternal.c; path = ../edk2/MdePkg/Library/BasePrintLib/PrintLibInternal.c; sourceTree = ""; }; 6377A5DA23A572B000AE5FF7 /* edk2misc.c */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.c; path = edk2misc.c; sourceTree = ""; }; 6377A5DC23A5C97100AE5FF7 /* edk2misc.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = edk2misc.h; sourceTree = ""; }; - 639FC4072664B551006E6C44 /* DevicePathUtilitiesStandaloneMm.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = DevicePathUtilitiesStandaloneMm.c; path = ../edk2/MdePkg/Library/UefiDevicePathLib/DevicePathUtilitiesStandaloneMm.c; sourceTree = ""; }; + 639FC4072664B551006E6C44 /* DevicePathUtilitiesBase.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = DevicePathUtilitiesBase.c; path = ../edk2/MdePkg/Library/UefiDevicePathLib/DevicePathUtilitiesBase.c; sourceTree = ""; }; 63C2792A23B32CAA008C348C /* efidevp.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = efidevp.h; sourceTree = ""; }; 63C2792B23B32CAA008C348C /* efidevp.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = efidevp.c; sourceTree = ""; }; 63C2792D23B33648008C348C /* DevicePath.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = DevicePath.h; path = ../edk2/MdePkg/Include/Protocol/DevicePath.h; sourceTree = ""; }; @@ -121,6 +125,10 @@ CE147CCF2185E87400536AE6 /* Changelog.md */ = {isa = PBXFileReference; lastKnownFileType = net.daringfireball.markdown; path = Changelog.md; sourceTree = ""; }; CE363A8120FE90F000ED7DC0 /* IOKit.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = IOKit.framework; path = System/Library/Frameworks/IOKit.framework; sourceTree = SDKROOT; }; CE363A8320FE90FC00ED7DC0 /* CoreFoundation.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = CoreFoundation.framework; path = System/Library/Frameworks/CoreFoundation.framework; sourceTree = SDKROOT; }; + CE72D68A2BEA53EA000F48A9 /* CommonMemoryAllocationLib.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = CommonMemoryAllocationLib.c; path = ../edk2/MdeModulePkg/Library/CommonMemoryAllocationLib/CommonMemoryAllocationLib.c; sourceTree = ""; }; + CE72D68C2BEA5491000F48A9 /* AlignedPages.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = AlignedPages.c; path = ../edk2/MdeModulePkg/Library/CommonMemoryAllocationLib/AlignedPages.c; sourceTree = ""; }; + CE72D68E2BEA54C1000F48A9 /* CommonMemoryAllocationLibEx.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = CommonMemoryAllocationLibEx.c; path = ../edk2/MdeModulePkg/Library/CommonMemoryAllocationLib/CommonMemoryAllocationLibEx.c; sourceTree = ""; }; + CE72D6902BEA5504000F48A9 /* BaseMemoryProfileLibNull.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = BaseMemoryProfileLibNull.c; path = ../edk2/MdeModulePkg/Library/BaseMemoryProfileLibNull/BaseMemoryProfileLibNull.c; sourceTree = ""; }; CEC0494720FEA1B300FBCAC9 /* README.md */ = {isa = PBXFileReference; lastKnownFileType = net.daringfireball.markdown; path = README.md; sourceTree = ""; }; /* End PBXFileReference section */ @@ -176,7 +184,11 @@ 6377A5D923A56EDA00AE5FF7 /* edk */ = { isa = PBXGroup; children = ( + CE72D68C2BEA5491000F48A9 /* AlignedPages.c */, + CE72D6902BEA5504000F48A9 /* BaseMemoryProfileLibNull.c */, 6377A5AC23A56E5400AE5FF7 /* BitField.c */, + CE72D68A2BEA53EA000F48A9 /* CommonMemoryAllocationLib.c */, + CE72D68E2BEA54C1000F48A9 /* CommonMemoryAllocationLibEx.c */, 6377A5A823A56E5400AE5FF7 /* CopyMem.c */, 6377A5AE23A56E5400AE5FF7 /* CopyMemWrapper.c */, 6377A5B923A56E5500AE5FF7 /* DebugLib.c */, @@ -184,7 +196,7 @@ 6377A5B523A56E5500AE5FF7 /* DevicePathFromText.c */, 6377A5B323A56E5500AE5FF7 /* DevicePathToText.c */, 6377A5B623A56E5500AE5FF7 /* DevicePathUtilities.c */, - 639FC4072664B551006E6C44 /* DevicePathUtilitiesStandaloneMm.c */, + 639FC4072664B551006E6C44 /* DevicePathUtilitiesBase.c */, 6377A5B123A56E5400AE5FF7 /* DivU64x32.c */, 6377A5A323A56E5300AE5FF7 /* DivU64x32Remainder.c */, 6377A5B723A56E5500AE5FF7 /* LShiftU64.c */, @@ -258,7 +270,7 @@ 08FB7793FE84155DC02AAC07 /* Project object */ = { isa = PBXProject; attributes = { - LastUpgradeCheck = 1250; + LastUpgradeCheck = 1530; }; buildConfigurationList = 1DEB924B08733DCA0010E9CD /* Build configuration list for PBXProject "gfxutil" */; compatibilityVersion = "Xcode 3.0"; @@ -307,17 +319,21 @@ 8DD76F770486A8DE00D96B5E /* main.c in Sources */, 9813AB380D12A271001DF28C /* utils.c in Sources */, 63C2792C23B32CAA008C348C /* efidevp.c in Sources */, + CE72D68D2BEA5491000F48A9 /* AlignedPages.c in Sources */, 6374FFFC266ACF1800ABDA7F /* BitField.c in Sources */, + CE72D68B2BEA53EA000F48A9 /* CommonMemoryAllocationLib.c in Sources */, 6374FFF3266ACF1800ABDA7F /* CopyMemWrapper.c in Sources */, 6374FFF5266ACF1800ABDA7F /* SetMem.c in Sources */, 6374FFE7266ACF1800ABDA7F /* SwapBytes64.c in Sources */, 6374FFF8266ACF1800ABDA7F /* SwapBytes32.c in Sources */, + CE72D68F2BEA54C1000F48A9 /* CommonMemoryAllocationLibEx.c in Sources */, 6374FFFE266ACF1800ABDA7F /* LShiftU64.c in Sources */, 6374FFEC266ACF1800ABDA7F /* PrintLib.c in Sources */, + CE72D6912BEA5504000F48A9 /* BaseMemoryProfileLibNull.c in Sources */, 63740002266ACF1800ABDA7F /* SwapBytes16.c in Sources */, 6374FFF2266ACF1800ABDA7F /* SafeString.c in Sources */, 6374FFEB266ACF1800ABDA7F /* Math64.c in Sources */, - 6374FFF0266ACF1800ABDA7F /* DevicePathUtilitiesStandaloneMm.c in Sources */, + 6374FFF0266ACF1800ABDA7F /* DevicePathUtilitiesBase.c in Sources */, 6374FFFA266ACF1800ABDA7F /* UefiDevicePathLib.c in Sources */, 6374FFEF266ACF1800ABDA7F /* MultU64x32.c in Sources */, 6374FFE9266ACF1800ABDA7F /* DevicePathFromText.c in Sources */, @@ -367,6 +383,8 @@ ../edk2/MdePkg/Library/UefiMemoryLib, ../edk2/MdePkg/Library/BaseLib, ../edk2/MdePkg/Library/BasePrintLib, + ../edk2/MdeModulePkg/Include, + ../edk2/MdeModulePkg/Library/CommonMemoryAllocationLib, ., ); USER_HEADER_SEARCH_PATHS = ( @@ -375,6 +393,8 @@ ../edk2/MdePkg/Library/UefiMemoryLib, ../edk2/MdePkg/Library/BaseLib, ../edk2/MdePkg/Library/BasePrintLib, + ../edk2/MdeModulePkg/Include, + ../edk2/MdeModulePkg/Library/CommonMemoryAllocationLib, ); }; name = Debug; @@ -403,6 +423,8 @@ ../edk2/MdePkg/Library/UefiMemoryLib, ../edk2/MdePkg/Library/BaseLib, ../edk2/MdePkg/Library/BasePrintLib, + ../edk2/MdeModulePkg/Include, + ../edk2/MdeModulePkg/Library/CommonMemoryAllocationLib, ., ); USER_HEADER_SEARCH_PATHS = ( @@ -411,6 +433,8 @@ ../edk2/MdePkg/Library/UefiMemoryLib, ../edk2/MdePkg/Library/BaseLib, ../edk2/MdePkg/Library/BasePrintLib, + ../edk2/MdeModulePkg/Include, + ../edk2/MdeModulePkg/Library/CommonMemoryAllocationLib, ); }; name = Release; diff --git a/gfxutil.xcodeproj/xcshareddata/xcschemes/gfxutil.xcscheme b/gfxutil.xcodeproj/xcshareddata/xcschemes/gfxutil.xcscheme index eed3569..dd087e7 100644 --- a/gfxutil.xcodeproj/xcshareddata/xcschemes/gfxutil.xcscheme +++ b/gfxutil.xcodeproj/xcshareddata/xcschemes/gfxutil.xcscheme @@ -1,6 +1,6 @@