X-Git-Url: http://git.code-monkey.de/?a=blobdiff_plain;f=SConscript.target;h=a927dd7292259df9195a792a06735dd65558e6ea;hb=6b632e25e7a08c19ccb6f36d1a8529e35bfee4e8;hp=74ea714f918ad0a9d3ff5887ee1d28f0771d69f0;hpb=2e626bc722375f441e826cb403967206eacf2161;p=gps-watch.git

diff --git a/SConscript.target b/SConscript.target
index 74ea714..a927dd7 100644
--- a/SConscript.target
+++ b/SConscript.target
@@ -36,7 +36,7 @@ env.Append(LINKFLAGS = [
 
 libgcc_path = \
     subprocess.check_output('{} -print-libgcc-file-name'.format(env['CC']),
-                            shell=True).strip()
+                            shell=True).strip().decode('utf-8')
 
 env.Append(RUSTCFLAGS = [
     '-C', 'opt-level=s',
@@ -50,7 +50,8 @@ env.Append(LINKFLAGS = [
     '-Wl,--gc-sections'
 ])
 
-SConscript('SConscript.libcommon', exports='env', duplicate=0)
+SConscript('SConscript.libcommon.c', exports='env', duplicate=0)
+SConscript('SConscript.libcommon.rs', exports='env', duplicate=0)
 
 bootloader_source_files = [
     'src/bootloader/main.rs', # Must be listed first (see below).
@@ -58,6 +59,8 @@ bootloader_source_files = [
     'src/bootloader/flash.rs',
 ]
 
+bootloader_bins = []
+
 for s in ['intermediate', 'final']:
     bootloader_env = env.Clone()
 
@@ -81,8 +84,18 @@ for s in ['intermediate', 'final']:
 
     Default(bootloader_bin)
 
+    bootloader_bins.append(bootloader_bin)
+
+bootloader_intermediate_frm = \
+    bootloader_env.Frm(bootloader_bins[0])
+
+Default(bootloader_intermediate_frm)
+
 application_source_files = [
     'src/application/main.rs', # Must be listed first (see below).
+    'src/application/button.rs',
+    'src/application/model.rs',
+    'src/application/views.rs',
     'src/application/uart0.rs',
 ]