Merge branch 'master' of https://github.com/CloverHackyColor/CloverBootloader

BaseTools/Source/C/Include/Ia32/ProcessorBind.h

@@ -135,6 +135,7 @@ typedef INT32   INTN;
   // Microsoft* compiler requires _EFIAPI usage, __cdecl is Microsoft* specific C.
   //
   #define EFIAPI __cdecl
+
 #endif
 
 #if __GNUC__

Include/Guid/AppleApfsInfo.h

@@ -12,9 +12,9 @@
   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
   See the License for the specific language governing permissions and
   limitations under the License.
-**/
-
-#ifndef APPLE_APFS_INFO_H_
+**/
+
+#ifndef APPLE_APFS_INFO_H_
 #define APPLE_APFS_INFO_H_
 
 #define APFS_GPT_PARTITION_UUID  \
@@ -214,6 +214,6 @@ typedef struct {
   APPLE_APFS_VOLUME_ROLE Role;
 } APPLE_APFS_VOLUME_INFO;
 
-extern EFI_GUID gAppleApfsVolumeInfoGuid;
-
-#endif // APPLE_APFS_H_
+extern EFI_GUID gAppleApfsVolumeInfoGuid;
+
+#endif // APPLE_APFS_H_

MdePkg/Include/IndustryStandard/Acpi10.h

@@ -24,10 +24,10 @@ typedef struct {
 /// The common ACPI description table header.  This structure prefaces most ACPI tables.
 ///
 typedef struct {
-  union {
+//  union {
     UINT32  Signature;
-    CHAR8   SignatureAs4Char[4];
-  };
+//    CHAR8   SignatureAs4Char[4];
+//  };
   UINT32  Length;
   UINT8   Revision;
   UINT8   Checksum;

OpenCorePkg

@@ -1 +1 @@
-Subproject commit 9986fac808929b06af6db8888aab08cf34946871
+Subproject commit 718db6190f93bacd4a4e19c96baed3cfd8070286

cbuild.bat

@@ -18,7 +18,7 @@ set EDK_BUILDINFOS=
 set EDK2SHELL=
 set BUILD_IA32=
 set BUILD_X64=
-set EDK2_BUILD_OPTIONS=-D NO_GRUB_DRIVERS -D MDEPKG_NDEBUG
+set EDK2_BUILD_OPTIONS=-D NO_GRUB_DRIVERS -D MDEPKG_NDEBUG -D MSFT
 set VBIOSPATCHCLOVEREFI=0
 set ONLY_SATA_0=0
 set USE_BIOS_BLOCKIO=0