Browse Source

remove old icons.makefile

SBird1337 6 years ago
parent
commit
ed3da16e77
2 changed files with 0 additions and 36 deletions
  1. 0
    29
      icons.makefile
  2. 0
    7
      makefile

+ 0
- 29
icons.makefile View File

@@ -1,29 +0,0 @@
1
-AS = @arm-none-eabi-as
2
-LD = @arm-none-eabi-ld
3
-AR = @arm-none-eabi-ar
4
-GRIT = @grit
5
-
6
-GFX_BUILD_DIR = gfx_build
7
-
8
-ICON_AR = object/pkmn_icons.a
9
-I_ASSET_ROOT = sots-private/assets
10
-ICON_FILES = $(wildcard $(I_ASSET_ROOT)/pkmn_icons/*.png)
11
-OBJ_FILES = $(addprefix $(GFX_BUILD_DIR)/icons/,$(notdir $(ICON_FILES:.png=.o)))
12
-
13
-all: $(ICON_AR)
14
-
15
-.PHONY: clean
16
-clean:
17
-	@echo -e "TRYING TO CLEAN ICONS FROM WRONG MAKEFILE"
18
-
19
-#$(ICON_AR): $(OBJ_FILES)
20
-#	@echo "\033[1;32mCreating archive $@\033[0m"
21
-#	$(AR) rcs $@ $^
22
-
23
-#$(GFX_BUILD_DIR)/icons/%.o: $(GFX_BUILD_DIR)/icons/%.s
24
-#	@echo "\033[32mAssembling $<\033[0m"
25
-#	$(AS) -o $@ $<
26
-
27
-#$(GFX_BUILD_DIR)/icons/%.s: $(I_ASSET_ROOT)/pkmn_icons/%.png
28
-#	@echo  "\033[34mProcessing image $<\033[0m"
29
-#	$(GRIT) $< -fts -fh! -g -gB 4 -gt -gz! -m! -p! -s icon_$(notdir $(basename $<)) -o $@

+ 0
- 7
makefile View File

@@ -46,7 +46,6 @@ SCRIPTROOT := $(MAPROOT)/script
46 46
 MAIN_OBJ  := $(BLDPATH)/linked.o
47 47
 B_ENGINE  := battle_engine/build/linked.o
48 48
 SPRITES   := $(BLDPATH)/pkmn_sprites.o
49
-ICONS_AR  := $(BLDPATH)/pkmn_icons.a
50 49
 DYN_OVER  := built/dynamic_overworld.o
51 50
 
52 51
 TMP_LD	  := tmp.ld
@@ -177,7 +176,6 @@ clean:
177 176
 	$(MAKE) -C $(dir $(LIST_AR)) clean
178 177
 	$(MAKE) -C $(dir $(CRY_AR)) clean
179 178
 	$(MAKE) -f sprites.makefile clean
180
-	$(MAKE) -f icons.makefile clean
181 179
 
182 180
 .PHONY: cleannogfx
183 181
 	rm -f  $(OUTPATH)/__symbols.sym $(OUTPATH)/pkmn_sots.gba
@@ -199,11 +197,6 @@ $(SPRITES):
199 197
 	@printf "\e[1,33mMaking Sprites\e[0m\n"
200 198
 	$(MAKE) -f sprites.makefile
201 199
 
202
-.PHONY: $(ICONS_AR)
203
-$(ICONS_AR):
204
-	@printf "\e[1,33mMaking Icons\e[0m\n"
205
-	$(MAKE) -f icons.makefile
206
-
207 200
 .PHONY: $(MUSIC_AR)
208 201
 $(MUSIC_AR):
209 202
 	@printf "\e[1,32mMaking Music\e[0m\n"