Browse Source

more build fixes

Philipp 8 years ago
parent
commit
aa9f20d9ff

+ 1
- 3
.gitignore View File

@@ -1,7 +1,6 @@
1 1
 *.gba
2 2
 base/*.gba
3
-build
4
-gfx_build/*.o
3
+*.o
5 4
 object
6 5
 temp
7 6
 assets/pkmn_sprites/*.png
@@ -10,5 +9,4 @@ assets/pkmn_icons/*.png
10 9
 *.ogg
11 10
 *.wav
12 11
 *.mid
13
-object/*.o
14 12
 *.a

+ 1
- 0
base/.gitignore View File

@@ -0,0 +1 @@
1
+*.gba

+ 2
- 0
build/.gitignore View File

@@ -0,0 +1,2 @@
1
+*.gba
2
+*.sym

+ 0
- 0
built/.gitignore View File


+ 1
- 0
gfx_build/.gitignore View File

@@ -1 +1,2 @@
1 1
 *.o
2
+*.s

+ 1
- 0
gfx_build/icons/.gitignore View File

@@ -1 +1,2 @@
1 1
 *.o
2
+*.s

+ 1
- 0
gfx_build/sprites/.gitignore View File

@@ -1 +1,2 @@
1 1
 *.o
2
+*.s

+ 1
- 0
gfx_build/sprites/back_sprites/.gitignore View File

@@ -1 +1,2 @@
1 1
 *.o
2
+*.s

+ 1
- 0
gfx_build/sprites/castform/.gitignore View File

@@ -1 +1,2 @@
1 1
 *.o
2
+*.s

+ 1
- 0
gfx_build/sprites/front_sprites/.gitignore View File

@@ -1 +1,2 @@
1 1
 *.o
2
+*.s

+ 1
- 0
gfx_build/sprites/normal_pal/.gitignore View File

@@ -1 +1,2 @@
1 1
 *.o
2
+*.s

+ 1
- 0
gfx_build/sprites/shiny_pal/.gitignore View File

@@ -1 +1,2 @@
1 1
 *.o
2
+*.s

+ 1
- 1
makefile View File

@@ -67,7 +67,7 @@ rom: main.asm $(MAIN_OBJ)
67 67
 		sed -e '{s/^/0x/g};{/.*\sA\s.*/d};{s/\sT\s/ /g}' > $(OUTPATH)/__symbols.sym
68 68
 	@echo "*** SUCCESSFULLY BUILT PROJECT ***"
69 69
 
70
-$(MAIN_OBJ): $(ALL_OBJ) $(ICONS_AR) $(SPRITES) $(DYN_OVER) $(MUSIC_AR) $(SMPL_AR) $(VOICE_AR) $(LIST_AR) $(CRY_AR) "built/dynamic_overworld.o"
70
+$(MAIN_OBJ): $(ALL_OBJ) $(ICONS_AR) $(SPRITES) $(DYN_OVER) $(MUSIC_AR) $(SMPL_AR) $(VOICE_AR) $(LIST_AR) $(CRY_AR)
71 71
 	$(LD) $(LDFLAGS) -T linker.ld -T bpre.sym --whole-archive -r -o $@ --start-group $^ --end-group
72 72
 
73 73
 .PHONY: clean