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

diff --git a/SConscript.target b/SConscript.target
index 74ea714..2da14a4 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).
@@ -83,6 +84,9 @@ for s in ['intermediate', 'final']:
 
 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',
 ]