From 6441bcc3a232bf5139e206933ce604ef3bdc9747 Mon Sep 17 00:00:00 2001 From: Jack Andersen Date: Fri, 15 Feb 2019 15:32:05 -1000 Subject: [PATCH] GCC build fix --- NESEmulator/malloc.h | 1 + README.md | 2 -- Runtime/CPakFile.hpp | 2 +- hecl | 2 +- specter | 2 +- 5 files changed, 4 insertions(+), 5 deletions(-) diff --git a/NESEmulator/malloc.h b/NESEmulator/malloc.h index c3dcd7c10..0b02dae2c 100644 --- a/NESEmulator/malloc.h +++ b/NESEmulator/malloc.h @@ -7,6 +7,7 @@ #include <../ucrt/malloc.h> #else #pragma GCC diagnostic push +#pragma GCC diagnostic ignored "-Wpragmas" #pragma GCC diagnostic ignored "-Winclude-next-absolute-path" #include_next #pragma GCC diagnostic pop diff --git a/README.md b/README.md index b0e5ee022..0cf97eda6 100644 --- a/README.md +++ b/README.md @@ -1,8 +1,6 @@ ## URDE **Status:** Extract Only -[![Build status](https://ci.appveyor.com/api/projects/status/avx3mpu1gd75ju1b?svg=true)](https://ci.appveyor.com/project/jackoalan/urde) - ### Download Precompiled builds of the command-line extraction utility (`hecl`) with embedded dataspec libraries are available at https://github.com/AxioDL/urde/releases. This will give you intermediate dumps of original formats as *blender* and *yaml* representations. diff --git a/Runtime/CPakFile.hpp b/Runtime/CPakFile.hpp index d5fbd37e9..0f6b7c084 100644 --- a/Runtime/CPakFile.hpp +++ b/Runtime/CPakFile.hpp @@ -16,7 +16,7 @@ public: struct SResInfo { CAssetId x0_id; bool x4_compressed : 1; - CFactoryMgr::ETypeTable x4_typeIdx : 7; + CFactoryMgr::ETypeTable x4_typeIdx; u32 x5_offsetDiv32 : 27; u32 x7_sizeDiv32 : 27; SResInfo(CAssetId id, FourCC fcc, u32 offset, u32 size, u32 flags) : x0_id(id) { diff --git a/hecl b/hecl index 769f42699..829f3dba2 160000 --- a/hecl +++ b/hecl @@ -1 +1 @@ -Subproject commit 769f4269919026e74ae245c612a8014bef660a50 +Subproject commit 829f3dba27b1acf59a274c6dbcb156b72c9ff483 diff --git a/specter b/specter index 2aacce53c..b28b91a91 160000 --- a/specter +++ b/specter @@ -1 +1 @@ -Subproject commit 2aacce53c352cf21144bec2bb1971eb554de9911 +Subproject commit b28b91a91f4a30400707efc50f27e79114b72abc