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

diff --git a/SConscript.target b/SConscript.target
index 74ea714..539db88 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,7 @@ for s in ['intermediate', 'final']:
 
 application_source_files = [
     'src/application/main.rs', # Must be listed first (see below).
+    'src/application/button.rs',
     'src/application/uart0.rs',
 ]