Browse Source

added dynamic overworlds to build correctly

Philipp 8 years ago
parent
commit
f38d1d87bd
4 changed files with 4 additions and 4 deletions
  1. 2
    2
      .gitignore
  2. BIN
      built/dynamic_overworld.o
  3. 1
    1
      makefile
  4. 1
    1
      sots-private

+ 2
- 2
.gitignore View File

@@ -10,5 +10,5 @@ assets/pkmn_icons/*.png
10 10
 *.ogg
11 11
 *.wav
12 12
 *.mid
13
-*.o
14
-*.a
13
+object/*.o
14
+*.a

BIN
built/dynamic_overworld.o View File


+ 1
- 1
makefile View File

@@ -21,7 +21,7 @@ SOURCEDIR := src
21 21
 MAIN_OBJ  := $(BLDPATH)/linked.o
22 22
 SPRITES   := $(BLDPATH)/pkmn_sprites.o
23 23
 ICONS_AR  := $(BLDPATH)/pkmn_icons.a
24
-DYN_OVER  := $(BLDPATH)/dynamic_overworld.o
24
+DYN_OVER  := built/dynamic_overworld.o
25 25
 
26 26
 SND_ROOT := sots-private/sound
27 27
 MUSIC_AR := $(SND_ROOT)/Music/music.a

+ 1
- 1
sots-private

@@ -1 +1 @@
1
-Subproject commit 30ff21dd66436d5bf710f5d9633d5e4998bcaa6c
1
+Subproject commit 13bf7e806c20682c77f3f5756b348a34466d7a09