Fix a build problem around subtitles
This commit is contained in:
parent
0e66c24d38
commit
74e02269e8
2
Makefile
2
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
|
||||
|
|
|
@ -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
|
||||
|
||||
|
|
|
@ -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 = {
|
||||
|
|
Loading…
Reference in a new issue