Fix compiling with latest wut/devkitppc version

Makefile

@@ -74,7 +74,6 @@ export VPATH	:=	$(foreach dir,$(SOURCES),$(CURDIR)/$(dir)) \
 
 export DEPSDIR	:=	$(CURDIR)/$(BUILD)
 
-FILELIST	:=	$(shell bash ./filelist.sh)
 CFILES		:=	$(foreach dir,$(SOURCES),$(notdir $(wildcard $(dir)/*.c)))
 CPPFILES	:=	$(foreach dir,$(SOURCES),$(notdir $(wildcard $(dir)/*.cpp)))
 SFILES		:=	$(foreach dir,$(SOURCES),$(notdir $(wildcard $(dir)/*.s)))
@@ -146,11 +145,13 @@ $(OFILES_SRC)	: $(HFILES_BIN)
 #---------------------------------------------------------------------------------
 %.tga.o	%_tga.h  : %.tga
 	@echo $(notdir $<)
-	@bin2s -a 32 $< | $(AS) -o $(@)
+	@$(bin2o)
+
 #---------------------------------------------------------------------------------
 %.h264.o	%_h264.h  : %.h264
 	@echo $(notdir $<)
-	@bin2s -a 32 $< | $(AS) -o $(@)
+	@$(bin2o)
+
 #---------------------------------------------------------------------------------
 
 -include $(DEPENDS)

filelist.sh

@@ -1,57 +0,0 @@
-#! /bin/bash
-#
-# Automatic resource file list generation
-# Created by Dimok
-
-outFile="./src/filelist.h"
-count_old=$(cat $outFile 2>/dev/null | tr -d '\n\n' | sed 's/[^0-9]*\([0-9]*\).*/\1/')
-
-count=0
-if [[ $OSTYPE == darwin* ]];
-then
-
-for i in $(gfind ./data/ -maxdepth 1 -type f  \( ! -printf "%f\n" \) | sort -f)
-do
-	files[count]=$i
-	count=$((count+1))
-done
-
-else
-
-for i in $(find ./data/ -maxdepth 1 -type f  \( ! -printf "%f\n" \) | sort -f)
-do
-	files[count]=$i
-	count=$((count+1))
-done
-
-fi
-
-if [ "$count_old" != "$count" ] || [ ! -f $outFile ]
-then
-
-echo "Generating filelist.h for $count files." >&2
-cat <<EOF > $outFile
-/****************************************************************************
- * This file is generated automatically.
- * Includes $count files.
- *
- * NOTE:
- * Any manual modification of this file will be overwriten by the generation.
- ****************************************************************************/
-#ifndef _FILELIST_H_
-#define _FILELIST_H_
-
-EOF
-
-for i in ${files[@]}
-do
-	filename=${i%.*}
-	extension=${i##*.}
-	echo 'extern const unsigned char '$filename'_'$extension'[];' >> $outFile
-	echo 'extern const unsigned int '$filename'_'$extension'_size;' >> $outFile
-	echo '' >> $outFile
-done
-
-echo '#endif' >> $outFile
-
-fi

src/main.cpp

@@ -1,12 +1,14 @@
 #include "main.h"
 #include "FileInfos.h"
 #include "SaveRedirection.h"
-#include "filelist.h"
+#include "bootLogoTex_tga.h"
+#include "bootMovie_h264.h"
 #include "fs/CFile.hpp"
 #include "fs/FSUtils.h"
 #include "fs/FileReader.h"
 #include "fs/FileReaderWUHB.h"
 #include "globals.h"
+#include "iconTex_tga.h"
 #include "utils/StringTools.h"
 #include "utils/ini.h"
 #include <algorithm>