Karathan
/
source_of_the_sovereign
mirror of https://github.com/SBird1337/source_of_the_sovereign
Watch 1
Star 0
Fork 0
Code Issues Releases 0 Wiki Activity
Browse Source

more build fixes

Philipp 8 years ago
parent
db7d981831
commit
aa9f20d9ff
13 changed files with 13 additions and 4 deletions
Unified View Show Diff Stats
  1. 1
    3
      .gitignore
  2. 1
    0
      base/.gitignore
  3. 2
    0
      build/.gitignore
  4. 0
    0
      built/.gitignore
  5. 1
    0
      gfx_build/.gitignore
  6. 1
    0
      gfx_build/icons/.gitignore
  7. 1
    0
      gfx_build/sprites/.gitignore
  8. 1
    0
      gfx_build/sprites/back_sprites/.gitignore
  9. 1
    0
      gfx_build/sprites/castform/.gitignore
  10. 1
    0
      gfx_build/sprites/front_sprites/.gitignore
  11. 1
    0
      gfx_build/sprites/normal_pal/.gitignore
  12. 1
    0
      gfx_build/sprites/shiny_pal/.gitignore
  13. 1
    1
      makefile

+ 1
- 3
.gitignore View File

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

+ 1
- 0
base/.gitignore View File

1 
+*.gba

+ 2
- 0
build/.gitignore View File

1 
+*.gba
2 
+*.sym

+ 0
- 0
built/.gitignore View File


+ 1
- 0
gfx_build/.gitignore View File

1 
 *.o
 1 
 *.o
2 
+*.s

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

1 
 *.o
 1 
 *.o
2 
+*.s

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

1 
 *.o
 1 
 *.o
2 
+*.s

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

1 
 *.o
 1 
 *.o
2 
+*.s

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

1 
 *.o
 1 
 *.o
2 
+*.s

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

1 
 *.o
 1 
 *.o
2 
+*.s

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

1 
 *.o
 1 
 *.o
2 
+*.s

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

1 
 *.o
 1 
 *.o
2 
+*.s

+ 1
- 1
makefile View File

67 
 		sed -e '{s/^/0x/g};{/.*\sA\s.*/d};{s/\sT\s/ /g}' > $(OUTPATH)/__symbols.sym
67 
 		sed -e '{s/^/0x/g};{/.*\sA\s.*/d};{s/\sT\s/ /g}' > $(OUTPATH)/__symbols.sym
68 
 	@echo "*** SUCCESSFULLY BUILT PROJECT ***"
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 
 	$(LD) $(LDFLAGS) -T linker.ld -T bpre.sym --whole-archive -r -o $@ --start-group $^ --end-group
71 
 	$(LD) $(LDFLAGS) -T linker.ld -T bpre.sym --whole-archive -r -o $@ --start-group $^ --end-group
72
72
73 
 .PHONY: clean
73 
 .PHONY: clean