2 files changed, 9 insertions, 13 deletions

diff --git a/firmware/test/fat/Makefile b/firmware/test/fat/Makefile
index 74d2628ab7..3e04724f67 100644
--- a/firmware/test/fat/Makefile
+++ b/firmware/test/fat/Makefile
@@ -1,26 +1,21 @@
 FIRMWARE = ../..
 
-export BUILDDATE=$(shell date -u +'-DYEAR=%Y -DMONTH=%m -DDAY=%d')
-export CPU=arm
-export TARGET=-DIPOD_VIDEO
-export TARGET_INC=-I$(FIRMWARE)/target/arm/ipod/video -I$(FIRMWARE)/target/arm/ipod -I$(FIRMWARE)/target/arm
-
 DRIVERS = ../../drivers
 EXPORT = ../../export
 
-INCLUDE = -I$(EXPORT) -I$(FIRMWARE)/include 
-
-DEFINES =  -DTEST_FAT -DDEBUG -DCRT_DISPLAY -DDISK_WRITE -DHAVE_FAT16SUPPORT -D__PCTOOL__
+BUILDDATE=$(shell date -u +'-DYEAR=%Y -DMONTH=%m -DDAY=%d')
+INCLUDE = -I$(EXPORT) -I$(FIRMWARE)/include -I$(FIRMWARE)/target/hosted -I$(FIRMWARE)/target/hosted/sdl
+DEFINES =  -DTEST_FAT -DDEBUG -DDISK_WRITE -DHAVE_FAT16SUPPORT -D__PCTOOL__
 
-CFLAGS = -g -Wall -std=gnu99 -Wno-pointer-sign $(DEFINES) -I. $(INCLUDE) $(BUILDDATE) -I$(FIRMWARE)/libc/include
-SIMFLAGS = -g -Wall -std=gnu99 -Wno-pointer-sign $(DEFINES) -I. $(INCLUDE)
+CFLAGS = -g -m32 -Wall -std=gnu99 -Wno-pointer-sign $(DEFINES) $(BUILDDATE) -I. $(INCLUDE) -I$(FIRMWARE)/libc/include
+SIMFLAGS = -g -m32 -Wall -std=gnu99 -Wno-pointer-sign $(DEFINES) -I. $(INCLUDE)
 
 TARGET = fat
 
 all: $(TARGET)
 
 $(TARGET): fat.o ata-sim.o main.o disk.o dir.o file.o ctype.o unicode.o strlcpy.o
-        gcc -g -o fat $+ -lfl
+        gcc -g -m32 -o fat $+
 
 fat.o: $(DRIVERS)/fat.c $(EXPORT)/fat.h $(EXPORT)/ata.h
         $(CC) $(CFLAGS) -c $< -o $@
diff --git a/firmware/test/fat/main.c b/firmware/test/fat/main.c
index a9220d15b7..756f326bb3 100644
--- a/firmware/test/fat/main.c
+++ b/firmware/test/fat/main.c
@@ -9,6 +9,7 @@
 #include "dir.h"
 #include "file.h"
 #include "ata.h"
+#include "storage.h"
 
 void dbg_dump_sector(int sec);
 void dbg_dump_buffer(unsigned char *buf, int len, int offset);
@@ -432,7 +433,7 @@ void dbg_tail(char* name)
         if( rc > 0 )
         {
             buf[rc]=0;
-            printf("%d:\n%s\n", strlen(buf), buf);
+            printf("%d:\n%s\n", (int)strlen(buf), buf);
         }
         else if ( rc == 0 ) {
             DEBUGF("EOF\n");
@@ -463,7 +464,7 @@ int dbg_head(char* name)
     if( rc > 0 )
     {
         buf[rc]=0;
-        printf("%d:\n%s\n", strlen(buf), buf);
+        printf("%d:\n%s\n", (int)strlen(buf), buf);
     }
     else if ( rc == 0 ) {
         DEBUGF("EOF\n");