Integrate the warble tool in the regular build system.

Only sdl app builds work properly for now.

Change-Id: I7807d42f69b8577b401e48cdc63de71e54f49217

2 files changed, 2 insertions, 1 deletions

diff --git a/firmware/core_alloc.c b/firmware/core_alloc.c
index 34ed48b39f..47faed6e95 100644
--- a/firmware/core_alloc.c
+++ b/firmware/core_alloc.c
@@ -9,7 +9,7 @@
 struct buflib_context core_ctx;
 
 /* defined in linker script */
-#if (CONFIG_PLATFORM & PLATFORM_NATIVE)
+#if (CONFIG_PLATFORM & PLATFORM_NATIVE) && !defined(__PCTOOL__)
 #if defined(IPOD_VIDEO) && !defined(BOOTLOADER)
 extern unsigned char *audiobufend_lds[];
 unsigned char *audiobufend;
diff --git a/firmware/export/system.h b/firmware/export/system.h
index b33edc6d3e..d93d10c9e2 100644
--- a/firmware/export/system.h
+++ b/firmware/export/system.h
@@ -192,6 +192,7 @@ enum {
 #include "system-sdl.h"
 #define NEED_GENERIC_BYTESWAPS
 #elif defined(__PCTOOL__)
+#include "system-sdl.h"
 #define NEED_GENERIC_BYTESWAPS
 #endif
 #include "bitswap.h"