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,6 +63,7 @@ TS_GEN_SRC	:= $(TSPNG:%.png=%.s)
63 63
 TS_GEN_O	:= $(TSPNG:%.png=$(BLDPATH)/%.o)
64 64
 
65 65
 GEN_SRC		:= $(IMAGES:$(AUTO_ASSET_ROOT)/%.png=generated_image/%.c)
66
+GEN_H		:= $(IMAGES:$(AUTO_ASSET_ROOT)/%.png=generated_image/%.h)
66 67
 ASM_SRC     := $(call rwildcard,src/,*.s)
67 68
 C_SRC       := $(call rwildcard,src/,*.c)
68 69
 DATA_SRC    := $(call rwildcard,data/,*.s)
@@ -117,16 +118,17 @@ $(MAPTS)/%.s: $(MAPTS)/%.png
117 118
 	@echo -e "\e[34mProcessing image (tileset) $<\e[0m"
118 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 122
 	@echo -e "\e[34mProcessing image $<\e[0m"
122 123
 	$(shell mkdir -p $(dir $@))
123 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 127
 	@echo -e "\e[34mProcessing image $< (using directory grit file)\e[0m"
127 128
 	$(shell mkdir -p $(dir $@))
128 129
 	$(GRIT) $< -o $@ -ftc -ff $(<D)/$(notdir $(<D)).grit
129
-all: rom
130
+
131
+all: $(GEN_H) rom 
130 132
 
131 133
 .PHONY: rom
132 134
 rom: main.asm $(MAIN_OBJ)
@@ -209,5 +211,5 @@ $(CRY_AR):
209 211
 constants:
210 212
 	python ../tools/v_tools/constants.py src/include/
211 213
 
212
-run: rom
214
+run: all
213 215
 	$(VBA) "build/pkmn_sots.gba"

+ 1
- 1
sots-private

@@ -1 +1 @@
1
-Subproject commit 04d6d99a48f025594551fe535770abbc3b9d8075
1
+Subproject commit f9e6ee59b56752bf25f71986a0fcd69690992ff2