Skip to content

External data fixes and improvements #98

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
AloXado320 wants to merge 6 commits into
base: master
Choose a base branch
from
Open

External data fixes and improvements #98

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
faf972e
New script to pack external data assets, way faster to process
AloXado320 Sep 1, 2025
4237018
Use STBI callbacks to load textures
AloXado320 Sep 1, 2025
2a90e1c
Support address textures in external data, extra checks for file text…
AloXado320 Sep 1, 2025
52a9dc9
Print precaching files and correct prefix todo
AloXado320 Sep 1, 2025
34da5bd
Update script, fixes zip regen and exclude list
AloXado320 Sep 6, 2025
6c9e60f
Make precache off by default and only apply to non console ports
AloXado320 Sep 11, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
52 changes: 18 additions & 34 deletions Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -777,6 +777,8 @@ ifeq ($(TARGET_SWITCH),1)
endif

C_DEFINES := $(foreach d,$(DEFINES),-D$(d))
C_DEFINES += $(CUSTOM_C_DEFINES)

DEF_INC_CFLAGS := $(foreach i,$(INCLUDE_DIRS),-I $(i)) $(C_DEFINES)

# Set C Preprocessor flags
Expand All @@ -786,7 +788,7 @@ else ifeq ($(COMPILER_TYPE),clang)
CPPFLAGS := -E -P -x c -Wno-trigraphs
endif

CPPFLAGS += $(DEF_INC_CFLAGS) $(CUSTOM_C_DEFINES)
CPPFLAGS += $(DEF_INC_CFLAGS)

ASMDEFINES := $(VER_DEFINES) $(GRU_DEFINES) $(ULTRA_VER_DEF)

Expand Down Expand Up @@ -857,6 +859,7 @@ ifeq ($(CPP_ASSEMBLY),1)
ASFLAGS := -march=vr4300 -mabi=32 $(foreach i,$(INCLUDE_DIRS),-I$(i)) $(foreach d,$(ASMDEFINES),--defsym $(d))
else
ASMFLAGS := -G 0 $(DEF_INC_CFLAGS) -w -nostdinc -c -march=vr4300 -mfix4300 -mno-abicalls -DMIPSEB -D_LANGUAGE_ASSEMBLY -D_MIPS_SIM=1 -D_MIPS_SZLONG=32
ASMFLAGS += $(CUSTOM_C_DEFINES)
endif

RSPASMFLAGS := $(foreach d,$(ASMDEFINES),-definelabel $(subst =, ,$(d)))
Expand All @@ -865,9 +868,6 @@ OBJCOPYFLAGS := --pad-to=0x800000 --gap-fill=0xFF
SYMBOL_LINKING_FLAGS := --no-check-sections $(addprefix -R ,$(SEG_FILES))
LDFLAGS := -T $(BUILD_DIR)/$(LD_SCRIPT) -Map $(BUILD_DIR)/sm64.$(VERSION).map $(SYMBOL_LINKING_FLAGS)

CFLAGS += $(CUSTOM_C_DEFINES)
ASMFLAGS += $(CUSTOM_C_DEFINES)

else # TARGET_N64

ifeq ($(TARGET_WII_U),1)
Expand Down Expand Up @@ -1087,11 +1087,9 @@ ifeq ($(CPP_ASSEMBLY),1)
endif
else
ASMFLAGS := $(DEF_INC_CFLAGS) -D_LANGUAGE_ASSEMBLY
ASMFLAGS += $(CUSTOM_C_DEFINES)
endif

CFLAGS += $(CUSTOM_C_DEFINES)
ASMFLAGS += $(CUSTOM_C_DEFINES)

# Load external textures
ifeq ($(EXTERNAL_DATA),1)
CFLAGS += -DFS_BASEDIR="\"$(BASEDIR)\""
Expand Down Expand Up @@ -1250,40 +1248,17 @@ endif

ifeq ($(EXTERNAL_DATA),1)
BASEPACK_PATH := $(BUILD_DIR)/$(BASEDIR)/$(BASEPACK)
BASEPACK_LST := $(BUILD_DIR)/basepack.lst

# depend on resources as well
all: $(BASEPACK_PATH)

# phony target for building resources
res: $(BASEPACK_PATH)

# prepares the basepack.lst
$(BASEPACK_LST): $(EXE_DEPEND)
@$(PRINT) "$(GREEN)Generating external data list: $(BLUE)$@ $(NO_COL)\n"
@mkdir -p $(BUILD_DIR)/$(BASEDIR)
@echo "$(BUILD_DIR)/sound/bank_sets sound/bank_sets" > $(BASEPACK_LST)
@echo "$(BUILD_DIR)/sound/sequences.bin sound/sequences.bin" >> $(BASEPACK_LST)
@echo "$(BUILD_DIR)/sound/sound_data.ctl sound/sound_data.ctl" >> $(BASEPACK_LST)
@echo "$(BUILD_DIR)/sound/sound_data.tbl sound/sound_data.tbl" >> $(BASEPACK_LST)
ifeq ($(VERSION),sh)
@echo "$(BUILD_DIR)/sound/sequences_header sound/sequences_header" >> $(BASEPACK_LST)
@echo "$(BUILD_DIR)/sound/ctl_header sound/ctl_header" >> $(BASEPACK_LST)
@echo "$(BUILD_DIR)/sound/tbl_header sound/tbl_header" >> $(BASEPACK_LST)
endif
@$(foreach f, $(wildcard $(SKYTILE_DIR)/*), echo $(f) gfx/$(f:$(BUILD_DIR)/%=%) >> $(BASEPACK_LST);)
@find actors -name \*.png -exec echo "{} gfx/{}" >> $(BASEPACK_LST) \;
@find levels -name \*.png -exec echo "{} gfx/{}" >> $(BASEPACK_LST) \;
@find textures -name \*.png -exec echo "{} gfx/{}" >> $(BASEPACK_LST) \;
ifeq ($(PORT_MOP_OBJS),1)
@find src/extras/mop/actors -name \*.png -exec echo "{} gfx/{}" >> $(BASEPACK_LST) \;
endif

# prepares the resource ZIP with base data
$(BASEPACK_PATH): $(BASEPACK_LST)
$(call print,Zipping from list:,$<,$@)
$(V)$(PYTHON) $(TOOLS_DIR)/mkzip.py $(BASEPACK_LST) $(BASEPACK_PATH)

# Combined generation and packing
$(BASEPACK_PATH): $(EXE_DEPEND)
@$(PRINT) "$(GREEN)Packing external data list: $(BLUE)$@ $(NO_COL)\n"
$(V)$(PYTHON) pack_extdata.py --build-dir "$(BUILD_DIR)" --skytile-dir "$(SKYTILE_DIR)" --output "$@" $(C_DEFINES) > /dev/null
endif

clean:
Expand Down Expand Up @@ -1453,6 +1428,15 @@ $(BUILD_DIR)/%: %.png
$(BUILD_DIR)/%.inc.c: $(BUILD_DIR)/% %.png
$(call print,Converting:,$<,$@)
$(V)hexdump -v -e '1/1 "0x%X,"' $< > $@

# Store crash screen textures so they render even without any texture data
$(BUILD_DIR)/$(TEXTURE_DIR)/crash_screen_pc/%.inc.c: $(TEXTURE_DIR)/crash_screen_pc/%.png
$(call print,Converting crash textures:,$<,$@)
$(V)$(N64GRAPHICS) -s $(TEXTURE_ENCODING) -i $@ -g $< -f $(lastword $(subst ., ,$(basename $<)))

$(BUILD_DIR)/$(TEXTURE_DIR)/crash_screen_pc/%: $(TEXTURE_DIR)/crash_screen_pc/%.png
$(call print,Converting crash textures:,$<,$@)
$(V)$(N64GRAPHICS) -s raw -i $@ -g $< -f $(lastword $(subst ., ,$@))
else
$(BUILD_DIR)/%: %.png
$(call print,Converting:,$<,$@)
Expand Down
Loading