mirror/oot
1
0
Fork 0
mirror of https://github.com/zeldaret/oot.git synced 2025-06-08 09:31:52 +00:00
Code Issues Projects Releases Wiki Activity

Run CC_CHECK in CI (#2109)

Browse source 
* Run CC_CHECK in CI

* Fix n64dd.h (guess this is why we need this change)
This commit is contained in:
cadmic 2024-09-04 00:15:52 -07:00 • committed by GitHub
parent 7937be87e4
commit eab37fe54a
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
2 changed files with 12 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

18
Jenkinsfile vendored
View file

@ -28,7 +28,7 @@ pipeline {
steps { steps {
sh 'ln -s /usr/local/etc/roms/oot-ntsc-1.2-us.z64 baseroms/ntsc-1.2/baserom.z64' sh 'ln -s /usr/local/etc/roms/oot-ntsc-1.2-us.z64 baseroms/ntsc-1.2/baserom.z64'
sh 'make -j setup VERSION=ntsc-1.2' sh 'make -j setup VERSION=ntsc-1.2'
sh 'make -j RUN_CC_CHECK=0 VERSION=ntsc-1.2' sh 'make -j VERSION=ntsc-1.2'
sh '.venv/bin/python3 tools/check_disasm_metadata_unksyms.py -v ntsc-1.2' sh '.venv/bin/python3 tools/check_disasm_metadata_unksyms.py -v ntsc-1.2'
sh 'make clean assetclean VERSION=ntsc-1.2' sh 'make clean assetclean VERSION=ntsc-1.2'
} }
@ -40,7 +40,7 @@ pipeline {
steps { steps {
sh 'ln -s /usr/local/etc/roms/oot-gc-jp.z64 baseroms/gc-jp/baserom.z64' sh 'ln -s /usr/local/etc/roms/oot-gc-jp.z64 baseroms/gc-jp/baserom.z64'
sh 'make -j setup VERSION=gc-jp' sh 'make -j setup VERSION=gc-jp'
sh 'make -j RUN_CC_CHECK=0 VERSION=gc-jp' sh 'make -j VERSION=gc-jp'
sh 'make clean assetclean VERSION=gc-jp' sh 'make clean assetclean VERSION=gc-jp'
} }
} }
@ -48,7 +48,7 @@ pipeline {
steps { steps {
sh 'ln -s /usr/local/etc/roms/oot-gc-eu-mq.z64 baseroms/gc-eu-mq/baserom.z64' sh 'ln -s /usr/local/etc/roms/oot-gc-eu-mq.z64 baseroms/gc-eu-mq/baserom.z64'
sh 'make -j setup VERSION=gc-eu-mq' sh 'make -j setup VERSION=gc-eu-mq'
sh 'make -j RUN_CC_CHECK=0 VERSION=gc-eu-mq' sh 'make -j VERSION=gc-eu-mq'
sh 'make clean assetclean VERSION=gc-eu-mq' sh 'make clean assetclean VERSION=gc-eu-mq'
} }
} }
@ -56,7 +56,7 @@ pipeline {
steps { steps {
sh 'ln -s /usr/local/etc/roms/oot-gc-eu-mq-dbg.z64 baseroms/gc-eu-mq-dbg/baserom.z64' sh 'ln -s /usr/local/etc/roms/oot-gc-eu-mq-dbg.z64 baseroms/gc-eu-mq-dbg/baserom.z64'
sh 'make -j setup VERSION=gc-eu-mq-dbg' sh 'make -j setup VERSION=gc-eu-mq-dbg'
sh 'make -j RUN_CC_CHECK=0 VERSION=gc-eu-mq-dbg' sh 'make -j VERSION=gc-eu-mq-dbg'
sh 'make clean assetclean VERSION=gc-eu-mq-dbg' sh 'make clean assetclean VERSION=gc-eu-mq-dbg'
} }
} }
@ -64,7 +64,7 @@ pipeline {
steps { steps {
sh 'ln -s /usr/local/etc/roms/oot-gc-us.z64 baseroms/gc-us/baserom.z64' sh 'ln -s /usr/local/etc/roms/oot-gc-us.z64 baseroms/gc-us/baserom.z64'
sh 'make -j setup VERSION=gc-us' sh 'make -j setup VERSION=gc-us'
sh 'make -j RUN_CC_CHECK=0 VERSION=gc-us' sh 'make -j VERSION=gc-us'
sh 'make clean assetclean VERSION=gc-us' sh 'make clean assetclean VERSION=gc-us'
} }
} }
@ -72,7 +72,7 @@ pipeline {
steps { steps {
sh 'ln -s /usr/local/etc/roms/oot-gc-jp-ce.z64 baseroms/gc-jp-ce/baserom.z64' sh 'ln -s /usr/local/etc/roms/oot-gc-jp-ce.z64 baseroms/gc-jp-ce/baserom.z64'
sh 'make -j setup VERSION=gc-jp-ce' sh 'make -j setup VERSION=gc-jp-ce'
sh 'make -j RUN_CC_CHECK=0 VERSION=gc-jp-ce' sh 'make -j VERSION=gc-jp-ce'
sh 'make clean assetclean VERSION=gc-jp-ce' sh 'make clean assetclean VERSION=gc-jp-ce'
} }
} }
@ -80,7 +80,7 @@ pipeline {
steps { steps {
sh 'ln -s /usr/local/etc/roms/oot-gc-eu.z64 baseroms/gc-eu/baserom.z64' sh 'ln -s /usr/local/etc/roms/oot-gc-eu.z64 baseroms/gc-eu/baserom.z64'
sh 'make -j setup VERSION=gc-eu' sh 'make -j setup VERSION=gc-eu'
sh 'make -j RUN_CC_CHECK=0 VERSION=gc-eu' sh 'make -j VERSION=gc-eu'
sh 'make clean assetclean VERSION=gc-eu' sh 'make clean assetclean VERSION=gc-eu'
} }
} }
@ -88,7 +88,7 @@ pipeline {
steps { steps {
sh 'ln -s /usr/local/etc/roms/oot-gc-jp-mq.z64 baseroms/gc-jp-mq/baserom.z64' sh 'ln -s /usr/local/etc/roms/oot-gc-jp-mq.z64 baseroms/gc-jp-mq/baserom.z64'
sh 'make -j setup VERSION=gc-jp-mq' sh 'make -j setup VERSION=gc-jp-mq'
sh 'make -j RUN_CC_CHECK=0 VERSION=gc-jp-mq' sh 'make -j VERSION=gc-jp-mq'
sh 'make clean assetclean VERSION=gc-jp-mq' sh 'make clean assetclean VERSION=gc-jp-mq'
} }
} }
@ -96,7 +96,7 @@ pipeline {
steps { steps {
sh 'ln -s /usr/local/etc/roms/oot-gc-us-mq.z64 baseroms/gc-us-mq/baserom.z64' sh 'ln -s /usr/local/etc/roms/oot-gc-us-mq.z64 baseroms/gc-us-mq/baserom.z64'
sh 'make -j setup VERSION=gc-us-mq' sh 'make -j setup VERSION=gc-us-mq'
sh 'make -j RUN_CC_CHECK=0 VERSION=gc-us-mq' sh 'make -j VERSION=gc-us-mq'
sh 'make clean assetclean VERSION=gc-us-mq' sh 'make clean assetclean VERSION=gc-us-mq'
} }
} }

6
include/n64dd.h
View file

@ -2,12 +2,12 @@
#define N64DD_H #define N64DD_H
#include "ultra64.h" #include "ultra64.h"
#include "z64pause.h"
#include "z64scene.h" #include "z64scene.h"
struct GameState; struct GameState;
union Gfx; union Gfx;
struct PlayState; struct PlayState;
struct PauseMapMarksData;
struct RegEditor; struct RegEditor;
struct RoomContext; struct RoomContext;
struct SaveContext; struct SaveContext;
@ -33,8 +33,8 @@ typedef struct n64ddStruct_80121AF0 {
void (*unk_10)(struct PlayState* play); void (*unk_10)(struct PlayState* play);
void (*unk_14)(struct PlayState* play); void (*unk_14)(struct PlayState* play);
char unk_18[0x1C]; char unk_18[0x1C];
void (*unk_34)(struct PauseMapMarksData**); void (*unk_34)(PauseMapMarksData**);
void (*unk_38)(struct PauseMapMarksData**); void (*unk_38)(PauseMapMarksData**);
void (*unk_3C)(void); void (*unk_3C)(void);
void (*unk_40)(void); void (*unk_40)(void);
s32 (*unk_44)(struct PlayState*); s32 (*unk_44)(struct PlayState*);