Integrate the warble tool in the regular build system.

Only sdl app builds work properly for now.

Change-Id: I7807d42f69b8577b401e48cdc63de71e54f49217

3 files changed, 18 insertions, 3 deletions

diff --git a/tools/checkwps/checkwps.make b/tools/checkwps/checkwps.make
index e021024901..1e92e3d63e 100644
--- a/tools/checkwps/checkwps.make
+++ b/tools/checkwps/checkwps.make
@@ -15,6 +15,8 @@ INCLUDES = -I$(ROOTDIR)/apps/gui \
            -I$(ROOTDIR)/apps/gui/skin_engine \
            -I$(ROOTDIR)/firmware/export \
            -I$(ROOTDIR)/firmware/include \
+           -I$(ROOTDIR)/firmware/target/hosted \
+           -I$(ROOTDIR)/firmware/target/hosted/sdl \
            -I$(ROOTDIR)/apps \
            -I$(ROOTDIR)/apps/recorder \
            -I$(ROOTDIR)/apps/radio \
diff --git a/tools/configure b/tools/configure
index 87dc78f27d..84e87c9fdf 100755
--- a/tools/configure
+++ b/tools/configure
@@ -3383,7 +3383,7 @@ esac
 if [ "$ARG_TYPE" ]; then
   btype=$ARG_TYPE
 else
-  echo "Build (N)ormal, (A)dvanced, (S)imulator, (B)ootloader, (C)heckWPS, (D)atabase tool$gdbstub: (Defaults to N)"
+  echo "Build (N)ormal, (A)dvanced, (S)imulator, (B)ootloader, (C)heckWPS, (D)atabase tool, (W)arble codec tool$gdbstub: (Defaults to N)"
   btype=`input`;
 fi
 
@@ -3484,6 +3484,17 @@ fi
 
       echo "Database tool build selected"
       ;;
+    [Ww])
+      uname=`uname`
+      simcc "warble"
+      toolset='';
+      t_cpu='';
+      GCCOPTS='';
+      extradefines="$extradefines  -DDEBUG"
+      output='warble.'${modelname};
+      archosrom='';
+      echo "Warble build selected"
+      ;;
     *)
       if [ "$modelname" = "sansae200r" ]; then
           echo "Do not use the e200R target for regular builds.  Use e200 instead."
diff --git a/tools/root.make b/tools/root.make
index 74279064bf..3231b73053 100644
--- a/tools/root.make
+++ b/tools/root.make
@@ -87,11 +87,13 @@ ifneq (,$(findstring bootloader,$(APPSDIR)))
 else ifneq (,$(findstring bootbox,$(APPSDIR)))
   BOOTBOXLDOPTS = -Wl,--gc-sections
   include $(APPSDIR)/bootbox.make
-else ifneq (,$(findstring checkwps,$(APPSDIR)))
+else ifneq (,$(findstring checkwps,$(APP_TYPE)))
   include $(APPSDIR)/checkwps.make
   include $(ROOTDIR)/lib/skin_parser/skin_parser.make
-else ifneq (,$(findstring database,$(APPSDIR)))
+else ifneq (,$(findstring database,$(APP_TYPE)))
   include $(APPSDIR)/database.make
+else ifneq (,$(findstring warble,$(APP_TYPE)))
+  include $(ROOTDIR)/lib/rbcodec/test/warble.make
 else
   include $(APPSDIR)/apps.make
   include $(APPSDIR)/lang/lang.make