mirror/oot
1
0
Fork 0
mirror of https://github.com/zeldaret/oot.git synced 2024-12-01 15:26:01 +00:00
Code Issues Projects Releases Wiki Activity
oot/Makefile

256 lines
8.4 KiB
Makefile
Raw Normal View History

Speed up build a bit (#341) * Speed up elf2rom * Remove all built-in make rules * Only perform a single mkdir * Optimize elf2rom further Co-authored-by: zelda2774 <zelda2774@invalid>
2020-08-23 17:43:26 +00:00
MAKEFLAGS += --no-builtin-rules
First proper commit.
2020-03-17 04:31:30 +00:00
Add COMPARE and NON_MATCHING build options (#275) * Add COMPARE and NON_MATCHING build options * Add a -m/--make option to first_diff.py * Minor comment update
2020-07-19 19:42:05 +00:00
# Build options can either be changed by modifying the makefile, or by building with 'make SETTING=value'
# If COMPARE is 1, check the output md5sum after building
COMPARE ?= 1
# If NON_MATCHING is 1, define the NON_MATCHING C flag when building
NON_MATCHING ?= 0
Ido Static Recomp (#337) * Ido Recomp test * try 2 * Recomp by default * Fix Jenkinsfile * Fix 2 * CFE errors * CFE fix -O2 * Update Makefile Co-authored-by: Roman971 <32455037+Roman971@users.noreply.github.com> * Update README.md Co-authored-by: Roman971 <32455037+Roman971@users.noreply.github.com> * Update README.md Co-authored-by: Roman971 <32455037+Roman971@users.noreply.github.com> * PR suggestions * PR updates Co-authored-by: Roman971 <32455037+Roman971@users.noreply.github.com>
2020-08-22 23:06:52 +00:00
# If ORIG_COMPILER is 1, compile with QEMU_IRIX and the original compiler
ORIG_COMPILER ?= 0
Add COMPARE and NON_MATCHING build options (#275) * Add COMPARE and NON_MATCHING build options * Add a -m/--make option to first_diff.py * Minor comment update
2020-07-19 19:42:05 +00:00
ifeq ($(NON_MATCHING),1)
CFLAGS := -DNON_MATCHING
Pass NON_MATCHING to spec when defined. (#549)
2020-12-20 18:10:13 +00:00
CPPFLAGS := -DNON_MATCHING
Add COMPARE and NON_MATCHING build options (#275) * Add COMPARE and NON_MATCHING build options * Add a -m/--make option to first_diff.py * Minor comment update
2020-07-19 19:42:05 +00:00
COMPARE := 0
endif
First proper commit.
2020-03-17 04:31:30 +00:00
PROJECT_DIR := $(dir $(realpath $(firstword $(MAKEFILE_LIST))))
Native MacOS build support (#399) * MacOS build OK * Adding build instructions for building mips-linux-binutils on MacOS * * * Update Makefile Co-authored-by: Roman971 <32455037+Roman971@users.noreply.github.com> Co-authored-by: Roman971 <32455037+Roman971@users.noreply.github.com>
2020-09-21 07:00:28 +00:00
MAKE = make
Pass NON_MATCHING to spec when defined. (#549)
2020-12-20 18:10:13 +00:00
CPPFLAGS += -P
Native MacOS build support (#399) * MacOS build OK * Adding build instructions for building mips-linux-binutils on MacOS * * * Update Makefile Co-authored-by: Roman971 <32455037+Roman971@users.noreply.github.com> Co-authored-by: Roman971 <32455037+Roman971@users.noreply.github.com>
2020-09-21 07:00:28 +00:00
ifeq ($(OS),Windows_NT)
Add Cygwin support (#594) * Add Cygwin support * revert .gitignore changes * Add Cygwin instructions * corrections * specify dependencies in README.md
2021-01-20 19:46:25 +00:00
DETECTED_OS=windows
Native MacOS build support (#399) * MacOS build OK * Adding build instructions for building mips-linux-binutils on MacOS * * * Update Makefile Co-authored-by: Roman971 <32455037+Roman971@users.noreply.github.com> Co-authored-by: Roman971 <32455037+Roman971@users.noreply.github.com>
2020-09-21 07:00:28 +00:00
else
UNAME_S := $(shell uname -s)
ifeq ($(UNAME_S),Linux)
DETECTED_OS=linux
endif
ifeq ($(UNAME_S),Darwin)
DETECTED_OS=macos
MAKE=gmake
CPPFLAGS += -xc++
endif
endif
First proper commit.
2020-03-17 04:31:30 +00:00
#### Tools ####
ifeq ($(shell type mips-linux-gnu-ld >/dev/null 2>/dev/null; echo $$?), 0)
MIPS_BINUTILS_PREFIX := mips-linux-gnu-
else
Various repo improvements (#316) * Narrowing down ido5-required files, assist.py, permuter settings * OSX support changes, +x on setup scripts * ZAP2 Update for OSX * Remove assist.py * Removing ido 5 things
2020-08-15 18:08:53 +00:00
$(error Please install or build mips-linux-gnu)
First proper commit.
2020-03-17 04:31:30 +00:00
endif
Native MacOS build support (#399) * MacOS build OK * Adding build instructions for building mips-linux-binutils on MacOS * * * Update Makefile Co-authored-by: Roman971 <32455037+Roman971@users.noreply.github.com> Co-authored-by: Roman971 <32455037+Roman971@users.noreply.github.com>
2020-09-21 07:00:28 +00:00
CC := tools/ido_recomp/$(DETECTED_OS)/7.1/cc
CC_OLD := tools/ido_recomp/$(DETECTED_OS)/5.3/cc
Ido Static Recomp (#337) * Ido Recomp test * try 2 * Recomp by default * Fix Jenkinsfile * Fix 2 * CFE errors * CFE fix -O2 * Update Makefile Co-authored-by: Roman971 <32455037+Roman971@users.noreply.github.com> * Update README.md Co-authored-by: Roman971 <32455037+Roman971@users.noreply.github.com> * Update README.md Co-authored-by: Roman971 <32455037+Roman971@users.noreply.github.com> * PR suggestions * PR updates Co-authored-by: Roman971 <32455037+Roman971@users.noreply.github.com>
2020-08-22 23:06:52 +00:00
# if ORIG_COMPILER is 1, check that either QEMU_IRIX is set or qemu-irix package installed
ifeq ($(ORIG_COMPILER),1)
ifndef QEMU_IRIX
QEMU_IRIX := $(shell which qemu-irix)
ifeq (, $(QEMU_IRIX))
$(error Please install qemu-irix package or set QEMU_IRIX env var to the full qemu-irix binary path)
endif
First proper commit.
2020-03-17 04:31:30 +00:00
endif
Ido Static Recomp (#337) * Ido Recomp test * try 2 * Recomp by default * Fix Jenkinsfile * Fix 2 * CFE errors * CFE fix -O2 * Update Makefile Co-authored-by: Roman971 <32455037+Roman971@users.noreply.github.com> * Update README.md Co-authored-by: Roman971 <32455037+Roman971@users.noreply.github.com> * Update README.md Co-authored-by: Roman971 <32455037+Roman971@users.noreply.github.com> * PR suggestions * PR updates Co-authored-by: Roman971 <32455037+Roman971@users.noreply.github.com>
2020-08-22 23:06:52 +00:00
CC = $(QEMU_IRIX) -L tools/ido7.1_compiler tools/ido7.1_compiler/usr/bin/cc
CC_OLD = $(QEMU_IRIX) -L tools/ido5.3_compiler tools/ido5.3_compiler/usr/bin/cc
First proper commit.
2020-03-17 04:31:30 +00:00
endif
AS := $(MIPS_BINUTILS_PREFIX)as
LD := $(MIPS_BINUTILS_PREFIX)ld
OBJCOPY := $(MIPS_BINUTILS_PREFIX)objcopy
OBJDUMP := $(MIPS_BINUTILS_PREFIX)objdump
Add .PHONY and add 'test' target to Makefile (#526)
2020-12-22 00:14:25 +00:00
EMULATOR = mupen64plus
EMU_FLAGS = --noosd
First proper commit.
2020-03-17 04:31:30 +00:00
Add `-I.` (#971) * Add `-I.` * Remove unused rule
2021-09-18 12:07:51 +00:00
INC := -Iinclude -Isrc -Iassets -Ibuild -I.
Run gcc checks with NON_MATCHING defined
2020-03-23 22:15:45 +00:00
# Check code syntax with host compiler
Decompile Player (#387) * Setup player decomp * Decompile z_player.c and z_player_lib.c * Decompile remaining z_player.c functions * Various player improvements * Player progress (some non matchings and .data migrated) * Player progress (reposition data and fix some non matchings) * Cleanup, improve and document parts of z_player_lib.c/z_player.c * Fix player renames in z_en_st.c * Fix missing open/close disps in z_player.c * Minor player fixes * Address player comments
2020-09-19 01:45:39 +00:00
CHECK_WARNINGS := -Wall -Wextra -Wno-format-security -Wno-unknown-pragmas -Wno-unused-parameter -Wno-unused-variable -Wno-missing-braces -Wno-int-conversion
Add `-I.` (#971) * Add `-I.` * Remove unused rule
2021-09-18 12:07:51 +00:00
CC_CHECK := gcc -fno-builtin -fsyntax-only -fsigned-char -std=gnu90 -D _LANGUAGE_C -D NON_MATCHING $(INC) -include stdarg.h $(CHECK_WARNINGS)
First proper commit.
2020-03-17 04:31:30 +00:00
CPP := cpp
MKLDSCRIPT := tools/mkldscript
ELF2ROM := tools/elf2rom
Remove submodule and use subrepo for ZAPD (#591) * remove zap * git subrepo clone https://github.com/zeldaret/ZAPD.git tools/ZAPD subrepo: subdir: "tools/ZAPD" merged: "cd4a8760b" upstream: origin: "https://github.com/zeldaret/ZAPD.git" branch: "master" commit: "cd4a8760b" git-subrepo: version: "0.4.3" origin: "https://github.com/ingydotnet/git-subrepo.git" commit: "2f68596" * remove thanks.md * zap2 -> zapd and spec changes * remove submodule init
2021-01-02 04:24:29 +00:00
ZAPD := tools/ZAPD/ZAPD.out
First proper commit.
2020-03-17 04:31:30 +00:00
Various makefile improvements (#99) - Find file and directories automatically, which removes the need for explicit listing and .mk files - Rename OPTIMIZATION to OPTFLAGS for consistency with other variables - Reorder some lines to make the file easier to work with - Remove the recipe for asm/overlays/ going through iconv, which is no longer necessary
2020-05-01 01:49:35 +00:00
OPTFLAGS := -O2
Decompiled ovl_En_Ru1 (#72) * Decompiled ovl_En_Ru1 * Formatting * Actor/TransitionDrawTable struct fixes * addressing PR comments * addressing PR comments (2)
2020-04-18 08:50:41 +00:00
ASFLAGS := -march=vr4300 -32 -Iinclude
code_80106550 / llcvt.c and code_80104450 / ortho.c OK (#163) * llcvt.c OK, added script from mm decomp to set mips3 * ortho.c OK * added entries to functions.h * named guNormalize.s
2020-05-27 07:48:07 +00:00
MIPS_VERSION := -mips2
First proper commit.
2020-03-17 04:31:30 +00:00
# we support Microsoft extensions such as anonymous structs, which the compiler does support but warns for their usage. Surpress the warnings with -woff.
Add `-I.` (#971) * Add `-I.` * Remove unused rule
2021-09-18 12:07:51 +00:00
CFLAGS += -G 0 -non_shared -Xfullwarn -Xcpluscomm $(INC) -Wab,-r4300_mul -woff 649,838,712
First proper commit.
2020-03-17 04:31:30 +00:00
ifeq ($(shell getconf LONG_BIT), 32)
# Work around memory allocation bug in QEMU
export QEMU_GUEST_BASE := 1
else
# Ensure that gcc treats the code as 32-bit
CC_CHECK += -m32
endif
#### Files ####
# ROM image
ROM := zelda_ocarina_mq_dbg.z64
ELF := $(ROM:.z64=.elf)
# description of ROM segments
SPEC := spec
Various makefile improvements (#99) - Find file and directories automatically, which removes the need for explicit listing and .mk files - Rename OPTIMIZATION to OPTFLAGS for consistency with other variables - Reorder some lines to make the file easier to work with - Remove the recipe for asm/overlays/ going through iconv, which is no longer necessary
2020-05-01 01:49:35 +00:00
SRC_DIRS := $(shell find src -type d)
ASM_DIRS := $(shell find asm -type d -not -path "asm/non_matchings*") $(shell find data -type d)
Updated Texture Asset Handling (#478) * Auto stash before rebase of "upstream/master" * A large number of scenes have been decompiled. * Fixed makefile * Decompiled around 40 scenes. * Removed old file * Finished matching remaining scenes. * Removed old commented out spec lines * Decompiled a few object files. * Reorganized xmls a bit. Updated pu_box overlay to use proper symbol. * Updated texture and object file decomp * Fixed newline issue with ZAPD * Moved scenes/ into the assets/ folder * Fixed a few compile errors * Auto stash before rebase of "upstream/master" * A large number of scenes have been decompiled. * Fixed makefile * Decompiled around 40 scenes. * Removed old file * Finished matching remaining scenes. * Removed old commented out spec lines * Decompiled a few object files. * Reorganized xmls a bit. Updated pu_box overlay to use proper symbol. * Updated texture and object file decomp * Moved scenes/ into the assets/ folder * Fixed a few compile errors * Fixed merge issues. * Fixed makefile merge error * Fixed additional merge error * Fixed several more merge issues * Commented out gameplay_keep and sk2 extraction, since currently unused. * Reenabled gameplay_keep extraction since it's used in the spec * Fixed build error * Removed test struct * Fixed makefile error that would happen on fresh builds * Fixed merge issue * Removed relative paths * Multithreading on extraction, spec uses numbers, few changes to XMLs * Removed redundant code from the extract_assets script * object_sk2 and object_spot09_obj OK * object_spot11_obj OK * object_spot17_obj OK * Test: One of the gameplay_keep dlists given a proper symbol * Updated asset symbol names based on new naming scheme * XMLs use "Offset" instead of "Address" now * Fixed merge issues, updated ovl_Magic_Dark xml and gfx file * Updated to use latest build of ZAPD * Updated ZAPD again * Updated ZAP to remove assimp dependency * Jenkins Test: Added .gitkeep file * Updated ZAP once more * Updated png file name to comply with new naming scheme. * Fixed bad include Co-authored-by: Jack Walker <7463599+Jack-Walker@users.noreply.github.com>
2020-12-26 11:39:52 +00:00
ASSET_BIN_DIRS := $(shell find assets/* -type d -not -path "assets/xml*")
ASSET_FILES_XML := $(foreach dir,$(ASSET_BIN_DIRS),$(wildcard $(dir)/*.xml))
ASSET_FILES_BIN := $(foreach dir,$(ASSET_BIN_DIRS),$(wildcard $(dir)/*.bin))
ASSET_FILES_OUT := $(foreach f,$(ASSET_FILES_XML:.xml=.c),$f) \
$(foreach f,$(ASSET_FILES_BIN:.bin=.bin.inc.c),build/$f)
Various makefile improvements (#99) - Find file and directories automatically, which removes the need for explicit listing and .mk files - Rename OPTIMIZATION to OPTFLAGS for consistency with other variables - Reorder some lines to make the file easier to work with - Remove the recipe for asm/overlays/ going through iconv, which is no longer necessary
2020-05-01 01:49:35 +00:00
# source files
Updated Texture Asset Handling (#478) * Auto stash before rebase of "upstream/master" * A large number of scenes have been decompiled. * Fixed makefile * Decompiled around 40 scenes. * Removed old file * Finished matching remaining scenes. * Removed old commented out spec lines * Decompiled a few object files. * Reorganized xmls a bit. Updated pu_box overlay to use proper symbol. * Updated texture and object file decomp * Fixed newline issue with ZAPD * Moved scenes/ into the assets/ folder * Fixed a few compile errors * Auto stash before rebase of "upstream/master" * A large number of scenes have been decompiled. * Fixed makefile * Decompiled around 40 scenes. * Removed old file * Finished matching remaining scenes. * Removed old commented out spec lines * Decompiled a few object files. * Reorganized xmls a bit. Updated pu_box overlay to use proper symbol. * Updated texture and object file decomp * Moved scenes/ into the assets/ folder * Fixed a few compile errors * Fixed merge issues. * Fixed makefile merge error * Fixed additional merge error * Fixed several more merge issues * Commented out gameplay_keep and sk2 extraction, since currently unused. * Reenabled gameplay_keep extraction since it's used in the spec * Fixed build error * Removed test struct * Fixed makefile error that would happen on fresh builds * Fixed merge issue * Removed relative paths * Multithreading on extraction, spec uses numbers, few changes to XMLs * Removed redundant code from the extract_assets script * object_sk2 and object_spot09_obj OK * object_spot11_obj OK * object_spot17_obj OK * Test: One of the gameplay_keep dlists given a proper symbol * Updated asset symbol names based on new naming scheme * XMLs use "Offset" instead of "Address" now * Fixed merge issues, updated ovl_Magic_Dark xml and gfx file * Updated to use latest build of ZAPD * Updated ZAPD again * Updated ZAP to remove assimp dependency * Jenkins Test: Added .gitkeep file * Updated ZAP once more * Updated png file name to comply with new naming scheme. * Fixed bad include Co-authored-by: Jack Walker <7463599+Jack-Walker@users.noreply.github.com>
2020-12-26 11:39:52 +00:00
C_FILES := $(foreach dir,$(SRC_DIRS) $(ASSET_BIN_DIRS),$(wildcard $(dir)/*.c))
First proper commit.
2020-03-17 04:31:30 +00:00
S_FILES := $(foreach dir,$(ASM_DIRS),$(wildcard $(dir)/*.s))
O_FILES := $(foreach f,$(S_FILES:.s=.o),build/$f) \
$(foreach f,$(C_FILES:.c=.o),build/$f) \
Various makefile improvements (#99) - Find file and directories automatically, which removes the need for explicit listing and .mk files - Rename OPTIMIZATION to OPTFLAGS for consistency with other variables - Reorder some lines to make the file easier to work with - Remove the recipe for asm/overlays/ going through iconv, which is no longer necessary
2020-05-01 01:49:35 +00:00
$(foreach f,$(wildcard baserom/*),build/$f.o)
Updated Texture Asset Handling (#478) * Auto stash before rebase of "upstream/master" * A large number of scenes have been decompiled. * Fixed makefile * Decompiled around 40 scenes. * Removed old file * Finished matching remaining scenes. * Removed old commented out spec lines * Decompiled a few object files. * Reorganized xmls a bit. Updated pu_box overlay to use proper symbol. * Updated texture and object file decomp * Fixed newline issue with ZAPD * Moved scenes/ into the assets/ folder * Fixed a few compile errors * Auto stash before rebase of "upstream/master" * A large number of scenes have been decompiled. * Fixed makefile * Decompiled around 40 scenes. * Removed old file * Finished matching remaining scenes. * Removed old commented out spec lines * Decompiled a few object files. * Reorganized xmls a bit. Updated pu_box overlay to use proper symbol. * Updated texture and object file decomp * Moved scenes/ into the assets/ folder * Fixed a few compile errors * Fixed merge issues. * Fixed makefile merge error * Fixed additional merge error * Fixed several more merge issues * Commented out gameplay_keep and sk2 extraction, since currently unused. * Reenabled gameplay_keep extraction since it's used in the spec * Fixed build error * Removed test struct * Fixed makefile error that would happen on fresh builds * Fixed merge issue * Removed relative paths * Multithreading on extraction, spec uses numbers, few changes to XMLs * Removed redundant code from the extract_assets script * object_sk2 and object_spot09_obj OK * object_spot11_obj OK * object_spot17_obj OK * Test: One of the gameplay_keep dlists given a proper symbol * Updated asset symbol names based on new naming scheme * XMLs use "Offset" instead of "Address" now * Fixed merge issues, updated ovl_Magic_Dark xml and gfx file * Updated to use latest build of ZAPD * Updated ZAPD again * Updated ZAP to remove assimp dependency * Jenkins Test: Added .gitkeep file * Updated ZAP once more * Updated png file name to comply with new naming scheme. * Fixed bad include Co-authored-by: Jack Walker <7463599+Jack-Walker@users.noreply.github.com>
2020-12-26 11:39:52 +00:00
Update asm-processor and add make dependencies for global asm and early includes (#801) * Update asm-processor to latest master * Add make dependencies for global asm and early includes * Update asm-processor to latest master
2021-05-02 20:21:27 +00:00
# Automatic dependency files
# (Only asm_processor dependencies are handled for now)
DEP_FILES := $(O_FILES:.o=.asmproc.d)
Simplify PNGs rules in the makefile (#814) * simplify rules * update `-eh`
2021-05-15 18:14:51 +00:00
TEXTURE_FILES_PNG := $(foreach dir,$(ASSET_BIN_DIRS),$(wildcard $(dir)/*.png))
Add needed rules for prerenders extraction (#752) * update makefile Signed-off-by: Angie <angheloalf95@gmail.com> * change jfif to jpg Signed-off-by: angie <angheloalf95@gmail.com>
2021-04-02 22:07:29 +00:00
TEXTURE_FILES_JPG := $(foreach dir,$(ASSET_BIN_DIRS),$(wildcard $(dir)/*.jpg))
Simplify PNGs rules in the makefile (#814) * simplify rules * update `-eh`
2021-05-15 18:14:51 +00:00
TEXTURE_FILES_OUT := $(foreach f,$(TEXTURE_FILES_PNG:.png=.inc.c),build/$f) \
Add needed rules for prerenders extraction (#752) * update makefile Signed-off-by: Angie <angheloalf95@gmail.com> * change jfif to jpg Signed-off-by: angie <angheloalf95@gmail.com>
2021-04-02 22:07:29 +00:00
$(foreach f,$(TEXTURE_FILES_JPG:.jpg=.jpg.inc.c),build/$f) \
First proper commit.
2020-03-17 04:31:30 +00:00
# create build directories
Add distclean rule to makefile (#716) * Add clean_everything rule to makefile Signed-off-by: angie <angheloalf95@gmail.com> * change `clean_everything` to `distclean` Signed-off-by: angie <angheloalf95@gmail.com> * Somehow forgot to commit the makefile Signed-off-by: angie <angheloalf95@gmail.com> * Remove nuke Signed-off-by: angie <angheloalf95@gmail.com> * Remove redundant variables Signed-off-by: angie <angheloalf95@gmail.com> * Forgot to remove `TEXTURE_DIRS` Signed-off-by: angie <angheloalf95@gmail.com>
2021-03-14 16:07:46 +00:00
$(shell mkdir -p build/baserom $(foreach dir,$(SRC_DIRS) $(ASM_DIRS) $(ASSET_BIN_DIRS),build/$(dir)))
First proper commit.
2020-03-17 04:31:30 +00:00
Various makefile improvements (#99) - Find file and directories automatically, which removes the need for explicit listing and .mk files - Rename OPTIMIZATION to OPTFLAGS for consistency with other variables - Reorder some lines to make the file easier to work with - Remove the recipe for asm/overlays/ going through iconv, which is no longer necessary
2020-05-01 01:49:35 +00:00
build/src/libultra_boot_O1/%.o: OPTFLAGS := -O1
build/src/libultra_boot_O2/%.o: OPTFLAGS := -O2
libultra cleanup (#215) * cleanup libultra * fixes - use quotes instead of <> for includes - add macros for zelda specific thread priorities - fix Makefile - properly format the remaining pfs structs * fix button macros + add CHECK_BTN_ANY/CHECK_BTN_ALL * remove ULTRA_ABS * fix includes * update z_player.c/z_lib.c + run format.sh * merge upstream/master * fix include in En_Goroiwa * fix includes
2020-10-03 15:22:44 +00:00
build/src/libultra_code_O1/%.o: OPTFLAGS := -O1
build/src/libultra_code_O2/%.o: OPTFLAGS := -O2
build/src/libultra_code_O2_g3/%.o: OPTFLAGS := -O2 -g3
libm.s -> ll.c (#661) * . * remove tools/ZAP2 from origin master * libm.s -> ll.c * fix progress.py (i think?)
2021-01-31 18:27:50 +00:00
build/src/libultra_boot_O1/ll.o: MIPS_VERSION := -mips3 -32
libultra cleanup (#215) * cleanup libultra * fixes - use quotes instead of <> for includes - add macros for zelda specific thread priorities - fix Makefile - properly format the remaining pfs structs * fix button macros + add CHECK_BTN_ANY/CHECK_BTN_ALL * remove ULTRA_ABS * fix includes * update z_player.c/z_lib.c + run format.sh * merge upstream/master * fix include in En_Goroiwa * fix includes
2020-10-03 15:22:44 +00:00
build/src/libultra_code_O1/llcvt.o: MIPS_VERSION := -mips3 -32
First proper commit.
2020-03-17 04:31:30 +00:00
build/src/code/fault.o: CFLAGS += -trapuv
Various makefile improvements (#99) - Find file and directories automatically, which removes the need for explicit listing and .mk files - Rename OPTIMIZATION to OPTFLAGS for consistency with other variables - Reorder some lines to make the file easier to work with - Remove the recipe for asm/overlays/ going through iconv, which is no longer necessary
2020-05-01 01:49:35 +00:00
build/src/code/fault.o: OPTFLAGS := -O2 -g3
First proper commit.
2020-03-17 04:31:30 +00:00
build/src/code/fault_drawer.o: CFLAGS += -trapuv
Various makefile improvements (#99) - Find file and directories automatically, which removes the need for explicit listing and .mk files - Rename OPTIMIZATION to OPTFLAGS for consistency with other variables - Reorder some lines to make the file easier to work with - Remove the recipe for asm/overlays/ going through iconv, which is no longer necessary
2020-05-01 01:49:35 +00:00
build/src/code/fault_drawer.o: OPTFLAGS := -O2 -g3
ucode_disas.c progress (#188) * ucode_disas.c progress * fix * minor fixes * minor comment changes
2020-06-05 17:18:39 +00:00
build/src/code/ucode_disas.o: OPTFLAGS := -O2 -g3
Various makefile improvements (#99) - Find file and directories automatically, which removes the need for explicit listing and .mk files - Rename OPTIMIZATION to OPTFLAGS for consistency with other variables - Reorder some lines to make the file easier to work with - Remove the recipe for asm/overlays/ going through iconv, which is no longer necessary
2020-05-01 01:49:35 +00:00
build/src/code/code_801068B0.o: OPTFLAGS := -g
build/src/code/code_80106860.o: OPTFLAGS := -g
build/src/code/code_801067F0.o: OPTFLAGS := -g
build/src/libultra_boot_O1/%.o: CC := $(CC_OLD)
build/src/libultra_boot_O2/%.o: CC := $(CC_OLD)
Only use the ASM processor where it is needed (#919) * remove fake match * Remove asm processor from files that don't need it * Update Makefile
2021-09-18 17:13:53 +00:00
build/src/libultra_code_O1/%.o: CC := $(CC_OLD)
build/src/libultra_code_O2/%.o: CC := $(CC_OLD)
build/src/libultra_code_O2_g3/%.o: CC := $(CC_OLD)
Various makefile improvements (#99) - Find file and directories automatically, which removes the need for explicit listing and .mk files - Rename OPTIMIZATION to OPTFLAGS for consistency with other variables - Reorder some lines to make the file easier to work with - Remove the recipe for asm/overlays/ going through iconv, which is no longer necessary
2020-05-01 01:49:35 +00:00
Only use the ASM processor where it is needed (#919) * remove fake match * Remove asm processor from files that don't need it * Update Makefile
2021-09-18 17:13:53 +00:00
build/src/code/jpegutils.o: CC := $(CC_OLD)
build/src/code/jpegdecoder.o: CC := $(CC_OLD)
First proper commit.
2020-03-17 04:31:30 +00:00
Various makefile improvements (#99) - Find file and directories automatically, which removes the need for explicit listing and .mk files - Rename OPTIMIZATION to OPTFLAGS for consistency with other variables - Reorder some lines to make the file easier to work with - Remove the recipe for asm/overlays/ going through iconv, which is no longer necessary
2020-05-01 01:49:35 +00:00
build/src/boot/%.o: CC := python3 tools/asm_processor/build.py $(CC) -- $(AS) $(ASFLAGS) --
build/src/code/%.o: CC := python3 tools/asm_processor/build.py $(CC) -- $(AS) $(ASFLAGS) --
build/src/overlays/actors/%.o: CC := python3 tools/asm_processor/build.py $(CC) -- $(AS) $(ASFLAGS) --
build/src/overlays/effects/%.o: CC := python3 tools/asm_processor/build.py $(CC) -- $(AS) $(ASFLAGS) --
build/src/overlays/gamestates/%.o: CC := python3 tools/asm_processor/build.py $(CC) -- $(AS) $(ASFLAGS) --
Updated to use latest version of ZAPD (#777) * Updated config file * Added missing files * Temporarily removed asm_processor changes. * git subrepo pull --force tools/ZAPD subrepo: subdir: "tools/ZAPD" merged: "96ffc1e62" upstream: origin: "https://github.com/zeldaret/ZAPD.git" branch: "master" commit: "96ffc1e62" git-subrepo: version: "0.4.3" origin: "???" commit: "???" * git subrepo pull --force tools/ZAPD subrepo: subdir: "tools/ZAPD" merged: "179af7d11" upstream: origin: "https://github.com/zeldaret/ZAPD.git" branch: "master" commit: "179af7d11" git-subrepo: version: "0.4.3" origin: "???" commit: "???" * Cleanup and fixes. * git subrepo pull --force tools/ZAPD subrepo: subdir: "tools/ZAPD" merged: "50ad2fe78" upstream: origin: "https://github.com/zeldaret/ZAPD.git" branch: "master" commit: "50ad2fe78" git-subrepo: version: "0.4.3" origin: "???" commit: "???" * Makefile fix * git subrepo pull --force tools/ZAPD subrepo: subdir: "tools/ZAPD" merged: "b9120803e" upstream: origin: "https://github.com/zeldaret/ZAPD.git" branch: "master" commit: "b9120803e" git-subrepo: version: "0.4.3" origin: "???" commit: "???" Co-authored-by: Jack Walker <7463599+Jack-Walker@users.noreply.github.com>
2021-04-30 21:23:22 +00:00
build/assets/%.o: CC := python3 tools/asm_processor/build.py $(CC) -- $(AS) $(ASFLAGS) --
Decompile jpegutils.c (#75) * Decompile jpegutils.c jpegutils.c : OK * Fix a typo * Fixes in PR #75 - Fix a type in JpegWork - Remove clang-format off/on in z_quake.c - Move the jpegutils rule at the end of makefile
2020-04-16 18:08:23 +00:00
First proper commit.
2020-03-17 04:31:30 +00:00
#### Main Targets ###
Add COMPARE and NON_MATCHING build options (#275) * Add COMPARE and NON_MATCHING build options * Add a -m/--make option to first_diff.py * Minor comment update
2020-07-19 19:42:05 +00:00
all: $(ROM)
ifeq ($(COMPARE),1)
First proper commit.
2020-03-17 04:31:30 +00:00
@md5sum $(ROM)
@md5sum -c checksum.md5
Add COMPARE and NON_MATCHING build options (#275) * Add COMPARE and NON_MATCHING build options * Add a -m/--make option to first_diff.py * Minor comment update
2020-07-19 19:42:05 +00:00
endif
First proper commit.
2020-03-17 04:31:30 +00:00
$(ROM): $(ELF)
$(ELF2ROM) -cic 6105 $< $@
Updated Texture Asset Handling (#478) * Auto stash before rebase of "upstream/master" * A large number of scenes have been decompiled. * Fixed makefile * Decompiled around 40 scenes. * Removed old file * Finished matching remaining scenes. * Removed old commented out spec lines * Decompiled a few object files. * Reorganized xmls a bit. Updated pu_box overlay to use proper symbol. * Updated texture and object file decomp * Fixed newline issue with ZAPD * Moved scenes/ into the assets/ folder * Fixed a few compile errors * Auto stash before rebase of "upstream/master" * A large number of scenes have been decompiled. * Fixed makefile * Decompiled around 40 scenes. * Removed old file * Finished matching remaining scenes. * Removed old commented out spec lines * Decompiled a few object files. * Reorganized xmls a bit. Updated pu_box overlay to use proper symbol. * Updated texture and object file decomp * Moved scenes/ into the assets/ folder * Fixed a few compile errors * Fixed merge issues. * Fixed makefile merge error * Fixed additional merge error * Fixed several more merge issues * Commented out gameplay_keep and sk2 extraction, since currently unused. * Reenabled gameplay_keep extraction since it's used in the spec * Fixed build error * Removed test struct * Fixed makefile error that would happen on fresh builds * Fixed merge issue * Removed relative paths * Multithreading on extraction, spec uses numbers, few changes to XMLs * Removed redundant code from the extract_assets script * object_sk2 and object_spot09_obj OK * object_spot11_obj OK * object_spot17_obj OK * Test: One of the gameplay_keep dlists given a proper symbol * Updated asset symbol names based on new naming scheme * XMLs use "Offset" instead of "Address" now * Fixed merge issues, updated ovl_Magic_Dark xml and gfx file * Updated to use latest build of ZAPD * Updated ZAPD again * Updated ZAP to remove assimp dependency * Jenkins Test: Added .gitkeep file * Updated ZAP once more * Updated png file name to comply with new naming scheme. * Fixed bad include Co-authored-by: Jack Walker <7463599+Jack-Walker@users.noreply.github.com>
2020-12-26 11:39:52 +00:00
$(ELF): $(TEXTURE_FILES_OUT) $(ASSET_FILES_OUT) $(O_FILES) build/ldscript.txt build/undefined_syms.txt
First proper commit.
2020-03-17 04:31:30 +00:00
$(LD) -T build/undefined_syms.txt -T build/ldscript.txt --no-check-sections --accept-unknown-input-arch --emit-relocs -Map build/z64.map -o $@
build/ldscript.txt: $(SPEC)
Native MacOS build support (#399) * MacOS build OK * Adding build instructions for building mips-linux-binutils on MacOS * * * Update Makefile Co-authored-by: Roman971 <32455037+Roman971@users.noreply.github.com> Co-authored-by: Roman971 <32455037+Roman971@users.noreply.github.com>
2020-09-21 07:00:28 +00:00
$(CPP) $(CPPFLAGS) $< > build/spec
First proper commit.
2020-03-17 04:31:30 +00:00
$(MKLDSCRIPT) build/spec $@
build/undefined_syms.txt: undefined_syms.txt
Native MacOS build support (#399) * MacOS build OK * Adding build instructions for building mips-linux-binutils on MacOS * * * Update Makefile Co-authored-by: Roman971 <32455037+Roman971@users.noreply.github.com> Co-authored-by: Roman971 <32455037+Roman971@users.noreply.github.com>
2020-09-21 07:00:28 +00:00
$(CPP) $(CPPFLAGS) $< > build/undefined_syms.txt
First proper commit.
2020-03-17 04:31:30 +00:00
clean:
Various repo improvements (#316) * Narrowing down ido5-required files, assist.py, permuter settings * OSX support changes, +x on setup scripts * ZAP2 Update for OSX * Remove assist.py * Removing ido 5 things
2020-08-15 18:08:53 +00:00
$(RM) -r $(ROM) $(ELF) build
First proper commit.
2020-03-17 04:31:30 +00:00
Add clean assets (#785) * makefile change * also delete * Add cleantools * rename cleanassets and assetclean * add rules to PHONY in makefile * Remove toolsclean
2021-05-17 17:50:19 +00:00
assetclean:
Add distclean rule to makefile (#716) * Add clean_everything rule to makefile Signed-off-by: angie <angheloalf95@gmail.com> * change `clean_everything` to `distclean` Signed-off-by: angie <angheloalf95@gmail.com> * Somehow forgot to commit the makefile Signed-off-by: angie <angheloalf95@gmail.com> * Remove nuke Signed-off-by: angie <angheloalf95@gmail.com> * Remove redundant variables Signed-off-by: angie <angheloalf95@gmail.com> * Forgot to remove `TEXTURE_DIRS` Signed-off-by: angie <angheloalf95@gmail.com>
2021-03-14 16:07:46 +00:00
$(RM) -r $(ASSET_BIN_DIRS)
Track XML extraction time (#826) * extracted-assets.json * delete `.extracted-assets.json` in distclean * Move `rm .extracted-assets.json` to `assetclean`
2021-05-26 23:40:48 +00:00
$(RM) -r build/assets
$(RM) -r .extracted-assets.json
Add clean assets (#785) * makefile change * also delete * Add cleantools * rename cleanassets and assetclean * add rules to PHONY in makefile * Remove toolsclean
2021-05-17 17:50:19 +00:00
distclean: clean assetclean
Add distclean rule to makefile (#716) * Add clean_everything rule to makefile Signed-off-by: angie <angheloalf95@gmail.com> * change `clean_everything` to `distclean` Signed-off-by: angie <angheloalf95@gmail.com> * Somehow forgot to commit the makefile Signed-off-by: angie <angheloalf95@gmail.com> * Remove nuke Signed-off-by: angie <angheloalf95@gmail.com> * Remove redundant variables Signed-off-by: angie <angheloalf95@gmail.com> * Forgot to remove `TEXTURE_DIRS` Signed-off-by: angie <angheloalf95@gmail.com>
2021-03-14 16:07:46 +00:00
$(RM) -r baserom/
$(MAKE) -C tools distclean
Updated jenkins file, readme, and replaced 'extract' target with 'setup'
2020-03-28 21:34:57 +00:00
setup:
Delete `-j` from `make setup` and document use of `-jN` and `-j` in readme (#804) * Add nproc to make setup * Add cross-platform nproc equivalents * Scrap that, just ditch -j in makefile altogether * Clarified thread advice
2021-05-03 17:37:54 +00:00
$(MAKE) -C tools
Added 'extract' target to makefile Created a THANKS.md file for credits. Updated checksum.md5 for a "vanilla" debug ROM Added fixbaserom.py which automatically removes the overdump, byte swaps, and patches the ROM header.
2020-03-28 02:30:19 +00:00
python3 fixbaserom.py
python3 extract_baserom.py
python3 extract_assets.py
First proper commit.
2020-03-17 04:31:30 +00:00
Updated Texture Asset Handling (#478) * Auto stash before rebase of "upstream/master" * A large number of scenes have been decompiled. * Fixed makefile * Decompiled around 40 scenes. * Removed old file * Finished matching remaining scenes. * Removed old commented out spec lines * Decompiled a few object files. * Reorganized xmls a bit. Updated pu_box overlay to use proper symbol. * Updated texture and object file decomp * Fixed newline issue with ZAPD * Moved scenes/ into the assets/ folder * Fixed a few compile errors * Auto stash before rebase of "upstream/master" * A large number of scenes have been decompiled. * Fixed makefile * Decompiled around 40 scenes. * Removed old file * Finished matching remaining scenes. * Removed old commented out spec lines * Decompiled a few object files. * Reorganized xmls a bit. Updated pu_box overlay to use proper symbol. * Updated texture and object file decomp * Moved scenes/ into the assets/ folder * Fixed a few compile errors * Fixed merge issues. * Fixed makefile merge error * Fixed additional merge error * Fixed several more merge issues * Commented out gameplay_keep and sk2 extraction, since currently unused. * Reenabled gameplay_keep extraction since it's used in the spec * Fixed build error * Removed test struct * Fixed makefile error that would happen on fresh builds * Fixed merge issue * Removed relative paths * Multithreading on extraction, spec uses numbers, few changes to XMLs * Removed redundant code from the extract_assets script * object_sk2 and object_spot09_obj OK * object_spot11_obj OK * object_spot17_obj OK * Test: One of the gameplay_keep dlists given a proper symbol * Updated asset symbol names based on new naming scheme * XMLs use "Offset" instead of "Address" now * Fixed merge issues, updated ovl_Magic_Dark xml and gfx file * Updated to use latest build of ZAPD * Updated ZAPD again * Updated ZAP to remove assimp dependency * Jenkins Test: Added .gitkeep file * Updated ZAP once more * Updated png file name to comply with new naming scheme. * Fixed bad include Co-authored-by: Jack Walker <7463599+Jack-Walker@users.noreply.github.com>
2020-12-26 11:39:52 +00:00
resources: $(ASSET_FILES_OUT)
Add .PHONY and add 'test' target to Makefile (#526)
2020-12-22 00:14:25 +00:00
test: $(ROM)
$(EMULATOR) $(EMU_FLAGS) $<
Add clean assets (#785) * makefile change * also delete * Add cleantools * rename cleanassets and assetclean * add rules to PHONY in makefile * Remove toolsclean
2021-05-17 17:50:19 +00:00
.PHONY: all clean setup test distclean assetclean
Add .PHONY and add 'test' target to Makefile (#526)
2020-12-22 00:14:25 +00:00
First proper commit.
2020-03-17 04:31:30 +00:00
#### Various Recipes ####
build/baserom/%.o: baserom/%
$(OBJCOPY) -I binary -O elf32-big $< $@
build/asm/%.o: asm/%.s
Update asm-processor and add make dependencies for global asm and early includes (#801) * Update asm-processor to latest master * Add make dependencies for global asm and early includes * Update asm-processor to latest master
2021-05-02 20:21:27 +00:00
$(AS) $(ASFLAGS) $< -o $@
First proper commit.
2020-03-17 04:31:30 +00:00
build/data/%.o: data/%.s
Update asm-processor and add make dependencies for global asm and early includes (#801) * Update asm-processor to latest master * Add make dependencies for global asm and early includes * Update asm-processor to latest master
2021-05-02 20:21:27 +00:00
iconv --from UTF-8 --to EUC-JP $< | $(AS) $(ASFLAGS) -o $@
First proper commit.
2020-03-17 04:31:30 +00:00
build/assets/%.o: assets/%.c
Update asm-processor and add make dependencies for global asm and early includes (#801) * Update asm-processor to latest master * Add make dependencies for global asm and early includes * Update asm-processor to latest master
2021-05-02 20:21:27 +00:00
$(CC) -c $(CFLAGS) $(MIPS_VERSION) $(OPTFLAGS) -o $@ $<
First proper commit.
2020-03-17 04:31:30 +00:00
$(OBJCOPY) -O binary $@ $@.bin
build/src/overlays/%.o: src/overlays/%.c
Update asm-processor and add make dependencies for global asm and early includes (#801) * Update asm-processor to latest master * Add make dependencies for global asm and early includes * Update asm-processor to latest master
2021-05-02 20:21:27 +00:00
$(CC) -c $(CFLAGS) $(MIPS_VERSION) $(OPTFLAGS) -o $@ $<
$(CC_CHECK) $<
Simplify PNGs rules in the makefile (#814) * simplify rules * update `-eh`
2021-05-15 18:14:51 +00:00
$(ZAPD) bovl -eh -i $@ -cfg $< --outputpath $(@D)/$(notdir $(@D))_reloc.s
Split ovl_file_choose and ovl_kaleido_scope (#167) * Split ovl_file_choose and ovl_kaleido_scope * Split ovl_kaleido_scope's rodata/data/bss * fix * fix spec * spec fix * hopefully last spec fix * hopefully last spec fix 2 * fix * Add comments on file boundaries * fix
2020-06-07 17:52:43 +00:00
-test -f $(@D)/$(notdir $(@D))_reloc.s && $(AS) $(ASFLAGS) $(@D)/$(notdir $(@D))_reloc.s -o $(@D)/$(notdir $(@D))_reloc.o
First proper commit.
2020-03-17 04:31:30 +00:00
@$(OBJDUMP) -d $@ > $(@:.o=.s)
build/src/%.o: src/%.c
Update asm-processor and add make dependencies for global asm and early includes (#801) * Update asm-processor to latest master * Add make dependencies for global asm and early includes * Update asm-processor to latest master
2021-05-02 20:21:27 +00:00
$(CC) -c $(CFLAGS) $(MIPS_VERSION) $(OPTFLAGS) -o $@ $<
$(CC_CHECK) $<
First proper commit.
2020-03-17 04:31:30 +00:00
@$(OBJDUMP) -d $@ > $(@:.o=.s)
libm.s -> ll.c (#661) * . * remove tools/ZAP2 from origin master * libm.s -> ll.c * fix progress.py (i think?)
2021-01-31 18:27:50 +00:00
build/src/libultra_boot_O1/ll.o: src/libultra_boot_O1/ll.c
Update asm-processor and add make dependencies for global asm and early includes (#801) * Update asm-processor to latest master * Add make dependencies for global asm and early includes * Update asm-processor to latest master
2021-05-02 20:21:27 +00:00
$(CC) -c $(CFLAGS) $(MIPS_VERSION) $(OPTFLAGS) -o $@ $<
$(CC_CHECK) $<
libm.s -> ll.c (#661) * . * remove tools/ZAP2 from origin master * libm.s -> ll.c * fix progress.py (i think?)
2021-01-31 18:27:50 +00:00
python3 tools/set_o32abi_bit.py $@
@$(OBJDUMP) -d $@ > $(@:.o=.s)
libultra cleanup (#215) * cleanup libultra * fixes - use quotes instead of <> for includes - add macros for zelda specific thread priorities - fix Makefile - properly format the remaining pfs structs * fix button macros + add CHECK_BTN_ANY/CHECK_BTN_ALL * remove ULTRA_ABS * fix includes * update z_player.c/z_lib.c + run format.sh * merge upstream/master * fix include in En_Goroiwa * fix includes
2020-10-03 15:22:44 +00:00
build/src/libultra_code_O1/llcvt.o: src/libultra_code_O1/llcvt.c
Update asm-processor and add make dependencies for global asm and early includes (#801) * Update asm-processor to latest master * Add make dependencies for global asm and early includes * Update asm-processor to latest master
2021-05-02 20:21:27 +00:00
$(CC) -c $(CFLAGS) $(MIPS_VERSION) $(OPTFLAGS) -o $@ $<
$(CC_CHECK) $<
code_80106550 / llcvt.c and code_80104450 / ortho.c OK (#163) * llcvt.c OK, added script from mm decomp to set mips3 * ortho.c OK * added entries to functions.h * named guNormalize.s
2020-05-27 07:48:07 +00:00
python3 tools/set_o32abi_bit.py $@
@$(OBJDUMP) -d $@ > $(@:.o=.s)
Simplify PNGs rules in the makefile (#814) * simplify rules * update `-eh`
2021-05-15 18:14:51 +00:00
build/%.inc.c: %.png
$(ZAPD) btex -eh -tt $(subst .,,$(suffix $*)) -i $< -o $@
First proper commit.
2020-03-17 04:31:30 +00:00
Updated Texture Asset Handling (#478) * Auto stash before rebase of "upstream/master" * A large number of scenes have been decompiled. * Fixed makefile * Decompiled around 40 scenes. * Removed old file * Finished matching remaining scenes. * Removed old commented out spec lines * Decompiled a few object files. * Reorganized xmls a bit. Updated pu_box overlay to use proper symbol. * Updated texture and object file decomp * Fixed newline issue with ZAPD * Moved scenes/ into the assets/ folder * Fixed a few compile errors * Auto stash before rebase of "upstream/master" * A large number of scenes have been decompiled. * Fixed makefile * Decompiled around 40 scenes. * Removed old file * Finished matching remaining scenes. * Removed old commented out spec lines * Decompiled a few object files. * Reorganized xmls a bit. Updated pu_box overlay to use proper symbol. * Updated texture and object file decomp * Moved scenes/ into the assets/ folder * Fixed a few compile errors * Fixed merge issues. * Fixed makefile merge error * Fixed additional merge error * Fixed several more merge issues * Commented out gameplay_keep and sk2 extraction, since currently unused. * Reenabled gameplay_keep extraction since it's used in the spec * Fixed build error * Removed test struct * Fixed makefile error that would happen on fresh builds * Fixed merge issue * Removed relative paths * Multithreading on extraction, spec uses numbers, few changes to XMLs * Removed redundant code from the extract_assets script * object_sk2 and object_spot09_obj OK * object_spot11_obj OK * object_spot17_obj OK * Test: One of the gameplay_keep dlists given a proper symbol * Updated asset symbol names based on new naming scheme * XMLs use "Offset" instead of "Address" now * Fixed merge issues, updated ovl_Magic_Dark xml and gfx file * Updated to use latest build of ZAPD * Updated ZAPD again * Updated ZAP to remove assimp dependency * Jenkins Test: Added .gitkeep file * Updated ZAP once more * Updated png file name to comply with new naming scheme. * Fixed bad include Co-authored-by: Jack Walker <7463599+Jack-Walker@users.noreply.github.com>
2020-12-26 11:39:52 +00:00
build/assets/%.bin.inc.c: assets/%.bin
Simplify PNGs rules in the makefile (#814) * simplify rules * update `-eh`
2021-05-15 18:14:51 +00:00
$(ZAPD) bblb -eh -i $< -o $@
Add needed rules for prerenders extraction (#752) * update makefile Signed-off-by: Angie <angheloalf95@gmail.com> * change jfif to jpg Signed-off-by: angie <angheloalf95@gmail.com>
2021-04-02 22:07:29 +00:00
build/assets/%.jpg.inc.c: assets/%.jpg
Simplify PNGs rules in the makefile (#814) * simplify rules * update `-eh`
2021-05-15 18:14:51 +00:00
$(ZAPD) bren -eh -i $< -o $@
Update asm-processor and add make dependencies for global asm and early includes (#801) * Update asm-processor to latest master * Add make dependencies for global asm and early includes * Update asm-processor to latest master
2021-05-02 20:21:27 +00:00
-include $(DEP_FILES)
Reference in a new issue Copy permalink