mirror of
https://github.com/HackerN64/HackerOoT.git
synced 2026-01-21 10:37:37 -08:00
aa0341f97b
* Match retail BSS ordering (#1927) * Match retail BSS ordering * Revert moving some global variables to headers * Adjust block numbers after header changes * Fix debug build * Overlay bss ordering * Fix BSS ordering after header changes * gc-eu-mq OK * Implement preprocessor for #pragma increment_block_number * Transfer usage comment from reencode.sh * Use temporary directory instead of temporary file * Move ColChkMassType back * Player: Document "WaitForPutAway" (#1936) * document put away delay * functions.txt * add a note on delaying indefinitely * format * typo * delay -> wait for put away * revert unintended formatting change * add comment to struct member * format * fix functions.txt * Set up gc-eu and match all code (#1938) * Set up gc-eu and match all code * Format * Mark gc-eu-mq as WIP until it builds OK * Move original/MQ map mark data to separate files * Add #includes to .inc.c files to help out VS Code * Use #if in spec instead of .inc.c files * Delete disassembly data for gc-eu-mq (#1942) * Player Docs: "sUpperBodyIsBusy" (#1944) * document upperbodybusy * change wording for comment and rename upperanimblendweight * format * review * Fix miscategorized scenes (#1946) * Fix miscategorized scenes * Sort includes * Player Docs: Action Interrupt (#1947) * document action interrupt * format * new function comment * format * add a note about items * format * Add gc-eu-mq to CI (#1943) * Add gc-eu-mq to CI * Give up on scripting * Revert quotes changes * Player Docs: Name some high level update calls (#1593) * name some low hanging fruit * revert burn and shock, doing in seperate pr * add some function comments * yaw func * adjust comment * some review * unname UpdateZTarget * Player_DetectRumbleSecrets * fix dive do action name * Player Docs: Control stick buffers (#1945) * name vars and add enum * name some spin attack stuff * fix right and left * forward/backward * format * fix retail bss * sControlStickWorldYaw * Force string.o to be in boot for gcc builds (#1948) In retail builds, memcpy is linked in code, not boot, but GCC likes to call memcpy when copying structs so currently GCC builds immediately crash in __osInitialize_common. * Rename yDistToWater -> depthInWater (#1950) * Rename yDistToWater -> yDistUnderWater * yDistUnderWater -> depthInWater * Check baserom hash before decompression (#1952) * Remove Cygwin support (#1951) * Document pause page switching (#1550) * Document pause page switching * document initial scroll left setup, when opening the pause menu * `PAUSE_MAIN_STATE_1` -> `PAUSE_MAIN_STATE_SWITCHING_PAGE` * try a diagram of the pages layout in world space as a comment * expand `nextPageMode` comment * touch up pause camera header comments * expand comment on irrelevant init `mainState = PAUSE_MAIN_STATE_SWITCHING_PAGE` * expand doc on `sKaleidoSetup*` data * expand docs on `gPageSwitchNextButtonStatus` * add some doc on `sPageSwitch*` arrays * SwitchPage -> PageSwitch * add `PAGE_SWITCH_NSTEPS` * `SWITCH_PAGE_*_PT` -> `PAGE_SWITCH_PT_*` * peepoArtist --------- Co-authored-by: fig02 <fig02srl@gmail.com> * Fix LensMode Enum Names (#1954) * Change linker script so gGameOverTimer can be in z_game_over.c (#1939) * Change linker script so gGameOverTimer can be in z_game_over.c * gGameOverTimer -> sGameOverTimer * include_data_only_with_rodata -> include_data_only_within_rodata * fix build issues * Check buffers segment in check_ordering.py (#1960) * Delete unused yaz0tool (#1959) * Revamp "AnimationContext" Docs, now called "AnimTaskQueue" (#1941) * start using task terminology * more docs * format * cleanups * MoveActor -> ActorMove * missed a couple * hopefully the last changes * comment explaining the group change * some review * dragorn review * remove accidental file * fix matching issue, now use while loop * Experiment: remove global.h dependency from sys_math, sys_math3d, z_lib (#1956) * split sys_math, sys_math3d, z_lib from global.h * suggestions * forgot this * more math stuff * nit fix * re-add ichain.h * resolve tharo's comments * Fix check_ordering.py checking for shifted/nonmatching-besides-relocs (#1961) * Run CC_CHECK with the correct CPP defines (#1963) * Run CC_CHECK with the correct CPP defines * Add "CPP_DEFINES ?=" --------- Co-authored-by: cadmic <cadmic24@gmail.com> Co-authored-by: fig02 <fig02srl@gmail.com> Co-authored-by: Dragorn421 <Dragorn421@users.noreply.github.com> Co-authored-by: inspectredc <78732756+inspectredc@users.noreply.github.com> Co-authored-by: mzxrules <mzxrules@gmail.com>
57 lines
1.2 KiB
Makefile
57 lines
1.2 KiB
Makefile
CFLAGS := -Wall -Wextra -pedantic -std=c99 -g -O2
|
|
PROGRAMS := elf2rom makeromfs mkdmadata mkldscript reloc_prereq
|
|
|
|
ifeq ($(shell command -v clang >/dev/null 2>&1; echo $$?),0)
|
|
CC := clang
|
|
else
|
|
CC := gcc
|
|
endif
|
|
|
|
LLD ?= 0
|
|
|
|
ifeq ($(shell command -v ld.lld >/dev/null 2>&1; echo $$?),0)
|
|
LLD := 1
|
|
endif
|
|
|
|
ifneq ($(LLD),0)
|
|
CFLAGS += -fuse-ld=lld
|
|
endif
|
|
|
|
all: $(PROGRAMS)
|
|
$(MAKE) -C ZAPD
|
|
$(MAKE) -C fado
|
|
ifeq ($(wildcard ./gzinject/Makefile),)
|
|
cd ./gzinject && ./configure
|
|
endif
|
|
$(MAKE) -C gzinject
|
|
$(MAKE) -C z64compress
|
|
$(MAKE) -C Flips TARGET=cli
|
|
|
|
clean:
|
|
$(RM) $(PROGRAMS) $(addsuffix .exe,$(PROGRAMS))
|
|
$(MAKE) -C ZAPD clean
|
|
$(MAKE) -C fado clean
|
|
ifneq ($(wildcard ./gzinject/Makefile),)
|
|
$(MAKE) -C gzinject clean
|
|
endif
|
|
$(MAKE) -C z64compress clean
|
|
$(MAKE) -C Flips clean
|
|
rm Flips/flips
|
|
|
|
distclean: clean
|
|
|
|
.PHONY: all clean distclean
|
|
|
|
elf2rom_SOURCES := elf2rom.c elf32.c n64chksum.c util.c
|
|
makeromfs_SOURCES := makeromfs.c n64chksum.c util.c
|
|
mkdmadata_SOURCES := mkdmadata.c spec.c util.c
|
|
mkldscript_SOURCES := mkldscript.c spec.c util.c
|
|
reloc_prereq_SOURCES := reloc_prereq.c spec.c util.c
|
|
|
|
define COMPILE =
|
|
$(1): $($1_SOURCES)
|
|
$(CC) $(CFLAGS) $$^ -o $$@
|
|
endef
|
|
|
|
$(foreach p,$(PROGRAMS),$(eval $(call COMPILE,$(p))))
|