Procházet zdrojové kódy

add better dependency rules for some header files

SBird1337 před 7 roky
rodič
revize
bf04debba3
3 změnil soubory, kde provedl 7 přidání a 10 odebrání
  1. 3
    3
      makefile
  2. 3
    6
      src/interface/mugshot_table.s
  3. 1
    1
      src/interface/textbox_mugshots.c

+ 3
- 3
makefile Zobrazit soubor

@@ -20,7 +20,7 @@ PYSETS	:= $(PYTHON_BIN) ../tools/v_tools/pyset2s.py
20 20
 export PATH := $(realpath ../tools):$(PATH)
21 21
 
22 22
 PAGB_MAIN := g3headers
23
-PAGB_INCLUDE := $(PAGB_MAIN)/build/include/
23
+PAGB_INCLUDE := $(PAGB_MAIN)/build/include
24 24
 PAGB_LINK := $(PAGB_MAIN)/build/linker/BPRE.ld
25 25
 
26 26
 AUTO_ASSET_ROOT := sots-private/assets/images
@@ -105,12 +105,12 @@ $(STRINGDIR)/%.s: $(STRINGDIR)/%.txt
105 105
 	@echo -e "\e[93mGenerating strings $<\e[0m"
106 106
 	$(STRAGB) -o $@ -i $< -t string/table.tbl -e 0xFF
107 107
 
108
-$(BLDPATH)/%.o: %.c $(ASSETS)
108
+$(BLDPATH)/%.o: %.c $(ASSETS) $(PAGB_INCLUDE)/pokeagb/pokeagb.h src/include/script_language.h src/include/hiddenflags.h
109 109
 	@echo -e "\e[32mCompiling $<\e[0m"
110 110
 	$(shell mkdir -p $(dir $@))
111 111
 	$(CC) $(CFLAGS) -c $< -o $@
112 112
 
113
-$(BLDPATH)/%.o: %.s
113
+$(BLDPATH)/%.o: %.s $(PAGB_INCLUDE)/pokeagb/pokeagb.h src/include/script_language.h src/include/hiddenflags.h
114 114
 	@echo -e "\e[32mAssembling $<\e[0m"
115 115
 	$(shell mkdir -p $(dir $@))
116 116
 	$(PREPROC) $< $(CHARMAP) > $*.i

+ 3
- 6
src/interface/mugshot_table.s Zobrazit soubor

@@ -2,7 +2,8 @@
2 2
 .thumb
3 3
 .section .rodata
4 4
 
5
-mugshot_table_int:
5
+.global mugshots
6
+mugshots:
6 7
 .word mug_00Tiles
7 8
 .word mug_00Pal
8 9
 
@@ -31,8 +32,4 @@ mugshot_table_int:
31 32
 .word mug_08Pal
32 33
 
33 34
 .word mug_09Tiles
34
-.word mug_09Pal
35
-
36
-.global mugshots
37
-mugshots:
38
-.word mugshot_table_int
35
+.word mug_09Pal

+ 1
- 1
src/interface/textbox_mugshots.c Zobrazit soubor

@@ -65,7 +65,7 @@ typedef struct mug_mugshot {
65 65
 
66 66
 /* === STATIC GLOBALS === */
67 67
 
68
-extern mug_mugshot *mugshots;
68
+extern mug_mugshot mugshots[0xFF];
69 69
 
70 70
 u8 *temp_obj_id1 = (u8*) OBJ_1_TEMP;
71 71
 u8 *temp_obj_id2 = (u8*) OBJ_2_TEMP;