--- a/core/src/fshell.mmp	Sat Jul 31 21:32:20 2010 +0100
+++ b/core/src/fshell.mmp	Wed Aug 25 21:19:19 2010 +0100
@@ -78,9 +78,26 @@
 source          ymodem.cpp
 source          version.cpp
 
-sourcepath      \epoc32\build\fshell\core\generated
+// There doesn't seem to be a nice way of turning the platform into a string, like you have $(PLATFORM) in extension makefiles, sigh.
+#if defined(WINSCW)
+#define PLAT platform_WINSCW
+#elif defined(GCCE)
+#define PLAT platform_GCCE
+#elif defined(MARM_ARM4)
+#define PLAT platform_ARM4
+#elif defined(MARM_ARMV5)
+#define PLAT platform_ARMV5
+#endif
+
+#ifdef SBSV2
+sourcepath      /epoc32/build/fshell/core/generated/PLAT
+#else
+sourcepath      \epoc32\build\fshell\core\generated\ ## PLAT
+#endif
 source          fshell_version.cpp
+
 #ifdef FSHELL_CORE_SUPPORT_LICENSE
+sourcepath      \epoc32\build\fshell\core\generated
 source          license.cpp
 #endif
 
@@ -90,7 +107,3 @@
 library         iocli.lib
 library			lineeditor.lib
 library			ltkutils-tcb.lib
-
-START WINS
-win32_library   kernel32.lib
-END