From 74e02269e829e243b0092e7dfa323c3f74243bea Mon Sep 17 00:00:00 2001 From: James Lambert Date: Mon, 16 Oct 2023 21:45:01 -0600 Subject: [PATCH] Fix a build problem around subtitles --- Makefile | 2 +- src/levels/level_definition.h | 1 - tools/level_scripts/static_export.lua | 1 + 3 files changed, 2 insertions(+), 2 deletions(-) diff --git a/Makefile b/Makefile index 5d352f8..5a14ba9 100644 --- a/Makefile +++ b/Makefile @@ -383,7 +383,7 @@ build/%.fbx: %.blend @mkdir -p $(@D) $(BLENDER_3_0) $< --background --python tools/export_fbx.py -- $@ -build/assets/test_chambers/%.h build/assets/test_chambers/%_geo.c build/assets/test_chambers/%_anim.c: build/assets/test_chambers/%.fbx assets/test_chambers/%.yaml build/assets/materials/static.h $(SKELATOOL64) $(TEXTURE_IMAGES) $(LUA_FILES) +build/assets/test_chambers/%.h build/assets/test_chambers/%_geo.c build/assets/test_chambers/%_anim.c: build/assets/test_chambers/%.fbx assets/test_chambers/%.yaml build/assets/materials/static.h build/src/audio/subtitles.h $(SKELATOOL64) $(TEXTURE_IMAGES) $(LUA_FILES) $(SKELATOOL64) --script tools/export_level.lua --fixed-point-scale ${SCENE_SCALE} --model-scale 0.01 --name $(<:build/assets/test_chambers/%.fbx=%) -m assets/materials/static.skm.yaml -o $(<:%.fbx=%.h) $< build/assets/test_chambers/%.o: build/assets/test_chambers/%.c build/assets/materials/static.h diff --git a/src/levels/level_definition.h b/src/levels/level_definition.h index 1e9fdf3..0aec7da 100644 --- a/src/levels/level_definition.h +++ b/src/levels/level_definition.h @@ -10,7 +10,6 @@ #include "../sk64/skelatool_clip.h" #include "../sk64/skelatool_armature.h" #include "../physics/collision_box.h" -#include "../../build/src/audio/subtitles.h" #define NO_TRANSFORM_INDEX 0xFF diff --git a/tools/level_scripts/static_export.lua b/tools/level_scripts/static_export.lua index bcb5441..098a140 100644 --- a/tools/level_scripts/static_export.lua +++ b/tools/level_scripts/static_export.lua @@ -9,6 +9,7 @@ local animation = require('tools.level_scripts.animation') local signals = require('tools.level_scripts.signals') sk_definition_writer.add_header('"../build/assets/materials/static.h"') +sk_definition_writer.add_header('"../build/src/audio/subtitles.h"') sk_definition_writer.add_header('"levels/level_definition.h"') local portalable_surfaces = {