Upstream/CloverBootloader
1
0
Fork 0
mirror of https://github.com/CloverHackyColor/CloverBootloader.git synced 2024-11-10 09:40:53 +01:00
Code Issues Packages Projects Releases Wiki Activity

Fix CCPV compilation.

Browse Source
This commit is contained in:
jief666 2022-05-20 11:29:26 +02:00
parent 3216ec0696
commit ff012267ca
5 changed files with 22 additions and 32 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
Xcode/CloverConfigPlistValidator/CloverConfigPlistValidator.xcodeproj/project.pbxproj
View File

@ -61,6 +61,13 @@
9A0B084A2402FE9300E2B470 /* XArray.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = XArray.h; sourceTree = "<group>"; };
9A0B084B2402FE9300E2B470 /* XObjArray.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = XObjArray.h; sourceTree = "<group>"; };
9A0B085D240300E000E2B470 /* Platform.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; path = Platform.cpp; sourceTree = "<group>"; };
9A12A1F328378FC80021CA78 /* DsdtFixList.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = DsdtFixList.h; sourceTree = "<group>"; };
9A12A1F428378FC80021CA78 /* TagTypes.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = TagTypes.h; sourceTree = "<group>"; };
9A12A1F528378FC80021CA78 /* QuirksCodes.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = QuirksCodes.h; sourceTree = "<group>"; };
9A12A1F628378FC80021CA78 /* remove_ref.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = remove_ref.h; sourceTree = "<group>"; };
9A12A1F728378FC80021CA78 /* Guid++.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = "Guid++.h"; sourceTree = "<group>"; };
9A12A1F82837905E0021CA78 /* Net.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = Net.h; sourceTree = "<group>"; };
9A12A1F9283794760021CA78 /* Settings.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = Settings.h; sourceTree = "<group>"; };
9A27554E2639E04F0095D456 /* Readme.md */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = net.daringfireball.markdown; path = Readme.md; sourceTree = "<group>"; };
9A2755522639E04F0095D456 /* SMBIOSPlist.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = SMBIOSPlist.h; sourceTree = "<group>"; };
9A2755532639E04F0095D456 /* Config_GUI.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = Config_GUI.cpp; sourceTree = "<group>"; };
@ -324,6 +331,7 @@
9A28CCAC241B816400F3D247 /* Platform */ = {
isa = PBXGroup;
children = (
9A12A1F9283794760021CA78 /* Settings.h */,
9A3E3A4F271F35C40077F37E /* VersionString.cpp */,
9A3E3A4E271F35C40077F37E /* VersionString.h */,
9A27557D263A02600095D456 /* CloverVersion.cpp */,
@ -504,6 +512,12 @@
9AA3911925CC56E60099DC1F /* include */ = {
isa = PBXGroup;
children = (
9A12A1F82837905E0021CA78 /* Net.h */,
9A12A1F328378FC80021CA78 /* DsdtFixList.h */,
9A12A1F728378FC80021CA78 /* Guid++.h */,
9A12A1F528378FC80021CA78 /* QuirksCodes.h */,
9A12A1F628378FC80021CA78 /* remove_ref.h */,
9A12A1F428378FC80021CA78 /* TagTypes.h */,
9AB6EB9E25CF1FAD0001BDBB /* BootTypes.h */,
9AA3911A25CC56E60099DC1F /* Devices.h */,
9AA3912325CC56E60099DC1F /* Efi.h */,

2
Xcode/CloverConfigPlistValidator/CloverConfigPlistValidator.xcodeproj/xcshareddata/xcschemes/CloverConfigPlistValidator_Debug.xcscheme
View File

@ -64,7 +64,7 @@
</BuildableProductRunnable>
<CommandLineArguments>
<CommandLineArgument
argument = "--productname=zziMac18,1"
argument = "--productname=iMac18,1"
isEnabled = "YES">
</CommandLineArgument>
<CommandLineArgument

3
rEFIt_UEFI/Platform/platformdata.cpp
View File

@ -809,7 +809,8 @@ XString8 GetReleaseDate(MacModel Model)
void SetDMISettingsForModel(MacModel Model, SETTINGS_DATA* settingsData)
{
GlobalConfig.CurrentModel = Model;
// GlobalConfig.CurrentModel = Model; // 2022-05 Not using Goblal config to avoid inter-dependancy. CCPV wouldn't compile anymore.
// be sure to to assign GlobalConfig.CurrentModel if you need to.
settingsData->Smbios.BiosVersion = ApplePlatformDataArray[Model].firmwareVersion;
settingsData->Smbios.BiosReleaseDate = GetReleaseDate(Model);
settingsData->Smbios.EfiVersion = ApplePlatformDataArray[Model].efiversion;

3
rEFIt_UEFI/Platform/platformdata.h
View File

@ -609,6 +609,9 @@ public:
extern ApplePlatformDataArrayClass ApplePlatformDataArray;
/*
* ATTENTION : SetDMISettingsForModel does not assign GlobalConfig.CurrentModel = Model;
*/
void SetDMISettingsForModel(MacModel Model, SETTINGS_DATA* settingsData);
MacModel GetModelFromString (const XString8& ProductName);

32
rEFIt_UEFI/PlatformPOSIX/include/Platform.h
View File

@ -35,40 +35,12 @@
#include "../../cpp_foundation/XBool.h"
#endif
#ifdef __cplusplus
extern "C" {
#endif
#include <Uefi.h>
#include <Base.h>
#include <Library/BaseLib.h>
//#include <Library/BaseMemoryLib.h>
//#include <Library/MemoryAllocationLib.h>
#include "../../../../rEFIt_UEFI/Platform/BootLog.h"
#include <Library/DebugLib.h> // this is just to define DEBUG, because Slice wrongly did some #ifdef DEBUG
#ifdef __cplusplus
}
#endif
#include <stdio.h>
#include <limits.h>
#include <stdarg.h>
#include <stdbool.h>
#include <stdint.h>
#include <string.h>
#include <inttypes.h>
#include <wchar.h>
#include "posix/posix.h"
#include <Efi.h>
#include "../../../../rEFIt_UEFI/include/OneLinerMacros.h"
//#ifndef __cplusplus
////typedef uint16_t wchar_t;
//typedef uint32_t char32_t;
//typedef uint16_t char16_t;
//typedef uint8_t bool;
//#endif
#include "./posix/abort.h"
#include "../../../rEFIt_UEFI/cpp_foundation/unicode_conversions.h"