Browse Source

fix image build

SBird1337 7 years ago
parent
commit
7085962d00
2 changed files with 7 additions and 5 deletions
  1. 6
    4
      makefile
  2. 1
    1
      sots-private

+ 6
- 4
makefile View File

63
 TS_GEN_O	:= $(TSPNG:%.png=$(BLDPATH)/%.o)
63
 TS_GEN_O	:= $(TSPNG:%.png=$(BLDPATH)/%.o)
64
 
64
 
65
 GEN_SRC		:= $(IMAGES:$(AUTO_ASSET_ROOT)/%.png=generated_image/%.c)
65
 GEN_SRC		:= $(IMAGES:$(AUTO_ASSET_ROOT)/%.png=generated_image/%.c)
66
+GEN_H		:= $(IMAGES:$(AUTO_ASSET_ROOT)/%.png=generated_image/%.h)
66
 ASM_SRC     := $(call rwildcard,src/,*.s)
67
 ASM_SRC     := $(call rwildcard,src/,*.s)
67
 C_SRC       := $(call rwildcard,src/,*.c)
68
 C_SRC       := $(call rwildcard,src/,*.c)
68
 DATA_SRC    := $(call rwildcard,data/,*.s)
69
 DATA_SRC    := $(call rwildcard,data/,*.s)
117
 	@echo -e "\e[34mProcessing image (tileset) $<\e[0m"
118
 	@echo -e "\e[34mProcessing image (tileset) $<\e[0m"
118
 	$(GRIT) $< -o $@ -fts -gzl -pz! -pu16 -gB4 -m! -mR!
119
 	$(GRIT) $< -o $@ -fts -gzl -pz! -pu16 -gB4 -m! -mR!
119
 
120
 
120
-generated_image/%.c: $(AUTO_ASSET_ROOT)/%.png $(AUTO_ASSET_ROOT)/%.grit
121
+generated_image/%.c generated_image/%.h: $(AUTO_ASSET_ROOT)/%.png $(AUTO_ASSET_ROOT)/%.grit
121
 	@echo -e "\e[34mProcessing image $<\e[0m"
122
 	@echo -e "\e[34mProcessing image $<\e[0m"
122
 	$(shell mkdir -p $(dir $@))
123
 	$(shell mkdir -p $(dir $@))
123
 	$(GRIT) $< -o $@ -ftc -ff $(<:%.png=%.grit)
124
 	$(GRIT) $< -o $@ -ftc -ff $(<:%.png=%.grit)
124
 
125
 
125
-generated_image/%.c: $(AUTO_ASSET_ROOT)/%.png
126
+generated_image/%.c generated_image/%.h: $(AUTO_ASSET_ROOT)/%.png
126
 	@echo -e "\e[34mProcessing image $< (using directory grit file)\e[0m"
127
 	@echo -e "\e[34mProcessing image $< (using directory grit file)\e[0m"
127
 	$(shell mkdir -p $(dir $@))
128
 	$(shell mkdir -p $(dir $@))
128
 	$(GRIT) $< -o $@ -ftc -ff $(<D)/$(notdir $(<D)).grit
129
 	$(GRIT) $< -o $@ -ftc -ff $(<D)/$(notdir $(<D)).grit
129
-all: rom
130
+
131
+all: $(GEN_H) rom 
130
 
132
 
131
 .PHONY: rom
133
 .PHONY: rom
132
 rom: main.asm $(MAIN_OBJ)
134
 rom: main.asm $(MAIN_OBJ)
209
 constants:
211
 constants:
210
 	python ../tools/v_tools/constants.py src/include/
212
 	python ../tools/v_tools/constants.py src/include/
211
 
213
 
212
-run: rom
214
+run: all
213
 	$(VBA) "build/pkmn_sots.gba"
215
 	$(VBA) "build/pkmn_sots.gba"

+ 1
- 1
sots-private

1
-Subproject commit 04d6d99a48f025594551fe535770abbc3b9d8075
1
+Subproject commit f9e6ee59b56752bf25f71986a0fcd69690992ff2