Browse Source

FIX SLOW BUILD

ipatix 7 years ago
parent
commit
81cd9bf639
3 changed files with 6 additions and 16 deletions
  1. 2
    1
      gfx_build/.gitignore
  2. 1
    1
      sots-private
  3. 3
    14
      sprites.makefile

+ 2
- 1
gfx_build/.gitignore View File

@@ -1,2 +1,3 @@
1 1
 *.o
2
-*.s
2
+*.s
3
+tmp.ld

+ 1
- 1
sots-private

@@ -1 +1 @@
1
-Subproject commit e0c9161af72cceec0ef48b5131cc346e69b490c9
1
+Subproject commit 8b86896d6b3b94c2f59267d0cca48a64dd17e1fc

+ 3
- 14
sprites.makefile View File

@@ -3,8 +3,7 @@ AR = arm-none-eabi-ar
3 3
 LD = arm-none-eabi-ld
4 4
 
5 5
 GFX_BUILD_DIR = gfx_build
6
-TMP_FILE = $(GFX_BUILD_DIR)/tmp.o
7
-TMP_FILE2 = $(GFX_BUILD_DIR)/tmp2.o
6
+TMP_LD = $(GFX_BUILD_DIR)/tmp.ld
8 7
 
9 8
 ASSET_ROOT = sots-private/assets
10 9
 
@@ -44,18 +43,8 @@ clean:
44 43
 	rm -f $(GFX_BUILD_DIR)/overworlds/*
45 44
 
46 45
 $(SPRITES_BINARY): $(NORMAL_PAL_OBJ) $(SHINY_PAL_OBJ) $(SPRITE_FRONT_OBJ) $(SPRITE_BACK_OBJ) $(NORMAL_CASTFORM_PAL_OBJ) $(SHINY_CASTFORM_PAL_OBJ) $(CASTFORM_FRONT_OBJ) $(CASTFORM_BACK_OBJ) $(OW_OBJ) $(TS_OBJ)
47
-	rm -f $(TMP_FILE2)
48
-	rm -f $(TMP_FILE)
49
-	for file in $^;\
50
-	do \
51
-		if [ ! -f $(TMP_FILE) ]; then\
52
-			$(LD) -r -o $(TMP_FILE) $$file;\
53
-		else\
54
-			$(LD) -r -o $(TMP_FILE2) $$file $(TMP_FILE);\
55
-			mv -f $(TMP_FILE2) $(TMP_FILE);\
56
-		fi;\
57
-	done
58
-	mv $(TMP_FILE) $@
46
+	echo "INPUT($^)" > $(TMP_LD)
47
+	$(LD) -r -o $@ -T $(TMP_LD)
59 48
 
60 49
 # OW Targets
61 50
 $(GFX_BUILD_DIR)/overworlds/%.o: $(GFX_BUILD_DIR)/overworlds/%.s