1 files changed, 33 insertions, 12 deletions

diff --git a/firmware/SOURCES b/firmware/SOURCES
index a68c4921ba..070f0d4a62 100644
--- a/firmware/SOURCES
+++ b/firmware/SOURCES
@@ -59,17 +59,27 @@ target/hosted/sdl/lcd-remote-bitmap.c
 target/hosted/sdl/lcd-sdl.c
 target/hosted/sdl/system-sdl.c
 #ifdef HAVE_SDL_THREADS
-target/hosted/sdl/thread-sdl.c
-#else
+target/hosted/sdl/filesystem-sdl.c
 #endif
+target/hosted/sdl/load_code-sdl.c
 target/hosted/sdl/timer-sdl.c
 #ifdef HAVE_TOUCHSCREEN
 target/hosted/sdl/key_to_touch-sdl.c
 #endif
 #ifdef APPLICATION
+target/hosted/sdl/app/load_code-sdl-app.c
 target/hosted/sdl/app/button-application.c
-#endif
-#endif
+#ifdef WIN32
+target/hosted/filesystem-win32.c
+#else /* !WIN32 */
+target/hosted/filesystem-unix.c
+#endif /* WIN32 */
+#endif /* APPLICATION */
+#endif /* HAVE_SDL */
+
+#ifdef APPLICATION
+target/hosted/filesystem-app.c
+#endif /* APPLICATION */
 
 #if defined(SAMSUNG_YPR0) || defined(SAMSUNG_YPR1)
 target/hosted/kernel-unix.c
@@ -163,19 +173,19 @@ common/crc32-mi4.c
 common/crc32-rkw.c
 #endif
 #if (CONFIG_PLATFORM & PLATFORM_NATIVE)
-common/dir_uncached.c
+common/dir.c
+common/disk_cache.c
 common/file.c
+common/file_internal.c
 common/disk.c
+common/fileobj_mgr.c
 #endif /* PLATFORM_NATIVE */
 #ifdef HAVE_DIRCACHE
 common/dircache.c
 #endif /* HAVE_DIRCACHE */
-common/filefuncs.c
+common/pathfuncs.c
 common/format.c
 common/linked_list.c
-#ifdef APPLICATION
-common/rbpaths.c
-#endif
 common/strcasecmp.c
 common/strcasestr.c
 common/strnatcmp.c
@@ -1816,7 +1826,20 @@ target/hosted/android/app/button-application.c
 drivers/audio/android.c
 #endif
 
-#endif /* defined(SIMULATOR) */
+#else /* defined(SIMULATOR) */
+
+#ifdef WIN32
+asm/mempcpy.c
+target/hosted/filesystem-win32.c
+#else /* !WIN32 */ 
+target/hosted/filesystem-unix.c
+#endif /* WIN32 */
+target/hosted/sdl/load_code-sdl.c
+#ifdef HAVE_SDL_THREADS
+target/hosted/sdl/filesystem-sdl.c
+#endif
+
+#endif /* !defined(SIMULATOR) */
 
 #if defined(HAVE_TOUCHPAD) && !defined(HAS_BUTTON_HOLD)
 drivers/touchpad.c
@@ -1826,9 +1849,7 @@ drivers/touchpad.c
 #ifdef HAVE_CORELOCK_OBJECT
 kernel/corelock.c
 #endif
-#if 0 /* pending dependent code */
 kernel/mrsw_lock.c
-#endif
 kernel/mutex.c
 kernel/queue.c
 #ifdef HAVE_SEMAPHORE_OBJECTS