Browse Source

fix sprite build

SBird1337 6 years ago
parent
commit
37d84539ae
3 changed files with 3 additions and 3 deletions
  1. 1
    1
      makefile
  2. 1
    1
      sots-private
  3. 1
    1
      sprites.makefile

+ 1
- 1
makefile View File

143
 	@echo "*** SUCCESSFULLY BUILT PROJECT ***"
143
 	@echo "*** SUCCESSFULLY BUILT PROJECT ***"
144
 	@echo "*** REMOVING INTERMEDIATE FILES ***"
144
 	@echo "*** REMOVING INTERMEDIATE FILES ***"
145
 	
145
 	
146
-$(MAIN_OBJ): $(ALL_OBJ) $(ICONS_AR) $(SPRITES) $(MUSIC_AR) $(SMPL_AR) $(VOICE_AR) $(LIST_AR) $(CRY_AR) #$(B_ENGINE)
146
+$(MAIN_OBJ): $(ALL_OBJ) $(SPRITES) $(MUSIC_AR) $(SMPL_AR) $(VOICE_AR) $(LIST_AR) $(CRY_AR) #$(B_ENGINE)
147
 	$(MAKE) -f assets.makefile
147
 	$(MAKE) -f assets.makefile
148
 	@echo -e "\e[1;32mLinking ELF binary $@\e[0m"
148
 	@echo -e "\e[1;32mLinking ELF binary $@\e[0m"
149
 	@echo "INPUT($^)" > $(TMP_LD)
149
 	@echo "INPUT($^)" > $(TMP_LD)

+ 1
- 1
sots-private

1
-Subproject commit aa59ed3ff2537dfb2ea2b637ccaae827ed58945f
1
+Subproject commit 6301e4df9d21551325bd8a0332a0580f4ada7c12

+ 1
- 1
sprites.makefile View File

51
 	rm -f $(GFX_BUILD_DIR)/trainer_sprites/*
51
 	rm -f $(GFX_BUILD_DIR)/trainer_sprites/*
52
 
52
 
53
 
53
 
54
-$(SPRITES_BINARY): $(NORMAL_PAL_OBJ) $(SHINY_PAL_OBJ) $(SPRITE_FRONT_OBJ) $(SPRITE_BACK_OBJ) $(NORMAL_CASTFORM_PAL_OBJ) $(SHINY_CASTFORM_PAL_OBJ) $(CASTFORM_FRONT_OBJ) $(CASTFORM_BACK_OBJ) $(OW_OBJ) $(TS_OBJ) $(ITEM_OBJ)
54
+$(SPRITES_BINARY): $(OW_OBJ) $(TS_OBJ) $(ITEM_OBJ)
55
 	@echo -e "\e[1;32mLinking $@\e[0m"
55
 	@echo -e "\e[1;32mLinking $@\e[0m"
56
 	@echo "INPUT($^)" > $(TMP_LD)
56
 	@echo "INPUT($^)" > $(TMP_LD)
57
 	$(LD) -r -o $@ -T $(TMP_LD)
57
 	$(LD) -r -o $@ -T $(TMP_LD)