AxioDL
/
metaforce
mirror of https://github.com/AxioDL/metaforce.git
2
0
Fork 0
Code Issues Projects Releases Wiki Activity

GCC build fix

This commit is contained in:
Jack Andersen 2019-02-15 15:32:05 -10:00
parent 95890088a5
commit 6441bcc3a2
5 changed files with 4 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
NESEmulator/malloc.h
View File

@ -7,6 +7,7 @@
#include <../ucrt/malloc.h> #include <../ucrt/malloc.h>
#else #else
#pragma GCC diagnostic push #pragma GCC diagnostic push
#pragma GCC diagnostic ignored "-Wpragmas"
#pragma GCC diagnostic ignored "-Winclude-next-absolute-path" #pragma GCC diagnostic ignored "-Winclude-next-absolute-path"
#include_next <malloc.h> #include_next <malloc.h>
#pragma GCC diagnostic pop #pragma GCC diagnostic pop

2
README.md
View File

@ -1,8 +1,6 @@
## URDE ## URDE
**Status:** Extract Only **Status:** Extract Only
[![Build status](https://ci.appveyor.com/api/projects/status/avx3mpu1gd75ju1b?svg=true)](https://ci.appveyor.com/project/jackoalan/urde)
### Download ### 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. 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.

2
Runtime/CPakFile.hpp
View File

@ -16,7 +16,7 @@ public:
struct SResInfo { struct SResInfo {
CAssetId x0_id; CAssetId x0_id;
bool x4_compressed : 1; bool x4_compressed : 1;
CFactoryMgr::ETypeTable x4_typeIdx : 7; CFactoryMgr::ETypeTable x4_typeIdx;
u32 x5_offsetDiv32 : 27; u32 x5_offsetDiv32 : 27;
u32 x7_sizeDiv32 : 27; u32 x7_sizeDiv32 : 27;
SResInfo(CAssetId id, FourCC fcc, u32 offset, u32 size, u32 flags) : x0_id(id) { SResInfo(CAssetId id, FourCC fcc, u32 offset, u32 size, u32 flags) : x0_id(id) {

2
hecl

@ -1 +1 @@
Subproject commit 769f4269919026e74ae245c612a8014bef660a50 Subproject commit 829f3dba27b1acf59a274c6dbcb156b72c9ff483

2
specter

@ -1 +1 @@
Subproject commit 2aacce53c352cf21144bec2bb1971eb554de9911 Subproject commit b28b91a91f4a30400707efc50f27e79114b72abc