5 files changed, 28 insertions, 27 deletions

diff --git a/tools/checkwps/SOURCES b/tools/checkwps/SOURCES
index 828b7965ea..425e8de7b9 100644
--- a/tools/checkwps/SOURCES
+++ b/tools/checkwps/SOURCES
@@ -1,13 +1,21 @@
+#undef unix /* messes up filesystem-unix.c below */
 ../../apps/gui/skin_engine/skin_parser.c
 ../../apps/gui/skin_engine/skin_backdrops.c
 ../../apps/gui/viewport.c
 ../../apps/misc.c
 ../../firmware/common/strlcpy.c
-checkwps.c
-
+../../firmware/common/pathfuncs.c
+../../firmware/asm/mempcpy.c
+../../firmware/target/hosted/filesystem-unix.c
 #ifdef APPLICATION
-../../firmware/common/rbpaths.c
+../../firmware/target/hosted/filesystem-app.c
+#else
+../../uisimulator/common/filesystem-sim.c
 #endif
+#ifdef DEBUG
+../../firmware/debug.c
+#endif
+checkwps.c
 
 #ifdef HAVE_LCD_BITMAP
 ../../apps/recorder/bmp.c
diff --git a/tools/checkwps/checkwps.c b/tools/checkwps/checkwps.c
index 10e505f006..c2cadc7444 100644
--- a/tools/checkwps/checkwps.c
+++ b/tools/checkwps/checkwps.c
@@ -39,11 +39,14 @@ bool debug_wps = true;
 int wps_verbose_level = 0;
 char *skin_buffer;
 
-int errno;
-
+const char *sim_root_dir = ".";
 const struct settings_list *settings;
 const int nb_settings = 0;
 
+#ifdef SIMULATOR
+#error beep beep
+#endif
+
 /* static endianness conversion */
 #define SWAP_16(x) ((typeof(x))(unsigned short)(((unsigned short)(x) >> 8) | \
                                                 ((unsigned short)(x) << 8)))
diff --git a/tools/checkwps/file.h b/tools/checkwps/file.h
deleted file mode 100644
index a14d7f5b91..0000000000
--- a/tools/checkwps/file.h
+++ /dev/null
@@ -1,16 +0,0 @@
-#ifndef MAX_PATH
-#define MAX_PATH 260
-#endif
-
-/* Wrapper - required for O_RDONLY */
-
-#include <fcntl.h>
-
-extern ssize_t read(int fd, void *buf, size_t count);
-extern ssize_t write(int fd, const void *buf, size_t count);
-extern off_t lseek(int fildes, off_t offset, int whence);
-extern int close(int fd);
-
-/* strlcpy doesn't belong here (it's in string.h in the rockbox sources),
- * but this avoids complicated magic to override the system string.h */
-size_t  strlcpy(char *dst, const char *src, size_t siz);
diff --git a/tools/database/SOURCES b/tools/database/SOURCES
index 5c9b971583..71593bba11 100644
--- a/tools/database/SOURCES
+++ b/tools/database/SOURCES
@@ -1,15 +1,21 @@
+#undef unix /* messes up filesystem-unix.c below */
 database.c
 ../../apps/misc.c
 ../../apps/tagcache.c
 ../../firmware/common/crc32.c
-../../firmware/common/filefuncs.c
+../../firmware/common/pathfuncs.c
 ../../firmware/common/strlcpy.c
 ../../firmware/common/strcasestr.c
 ../../firmware/common/structec.c
 ../../firmware/common/unicode.c
 ../../firmware/target/hosted/debug-hosted.c
 ../../firmware/logf.c
-../../uisimulator/common/io.c
+../../firmware/target/hosted/filesystem-unix.c
+#ifdef APPLICATION
+../../firmware/target/hosted/filesystem-app.c
+#else /* !APPLICATION */
+../../uisimulator/common/filesystem-sim.c
+#endif /* APPLICATION */
 #if CONFIG_CODEC != SWCODEC
 ../../lib/rbcodec/metadata/id3tags.c
 ../../lib/rbcodec/metadata/metadata.c
diff --git a/tools/root.make b/tools/root.make
index 4d58e26e8e..4e0ca7c4f0 100644
--- a/tools/root.make
+++ b/tools/root.make
@@ -356,22 +356,22 @@ endif
 
 ifeq (,$(findstring android, $(APP_TYPE)))
 
-simext:
+simext1:
         $(SILENT)mkdir -p $@
 
 bininstall: $(BUILDDIR)/$(BINARY)
         @echo "Installing your rockbox binary in your '$(RBPREFIX)' dir"
         $(SILENT)cp $(BINARY) "$(RBPREFIX)/.rockbox/"
 
-install: simext
+install: simext1
         @echo "Installing your build in your '$(RBPREFIX)' dir"
         $(SILENT)$(TOOLSDIR)/buildzip.pl $(VERBOSEOPT) --app=$(APPLICATION) -m "$(MODELNAME)" -i "$(TARGET_ID)" $(INSTALL) -z "zip -r0" -r "$(ROOTDIR)" --rbdir="$(RBDIR)" -f 0 $(TARGET) $(BINARY)
 
-fullinstall: simext
+fullinstall: simext1
         @echo "Installing a full setup in your '$(RBPREFIX)' dir"
         $(SILENT)$(TOOLSDIR)/buildzip.pl $(VERBOSEOPT) --app=$(APPLICATION) -m "$(MODELNAME)" -i "$(TARGET_ID)" $(INSTALL) -z "zip -r0" -r "$(ROOTDIR)" --rbdir="$(RBDIR)" -f 2 $(TARGET) $(BINARY)
 
-symlinkinstall: simext
+symlinkinstall: simext1
         @echo "Installing a full setup with links in your '$(RBPREFIX)' dir"
         $(SILENT)$(TOOLSDIR)/buildzip.pl $(VERBOSEOPT) --app=$(APPLICATION) -m "$(MODELNAME)" -i "$(TARGET_ID)" $(INSTALL) -z "zip -r0" -r "$(ROOTDIR)" --rbdir="$(RBDIR)" -f 2 $(TARGET) $(BINARY) -l
 endif