diff --git a/3rd/nanovg/SConscript b/3rd/nanovg/SConscript
index 124ee0829..035221f8d 100644
--- a/3rd/nanovg/SConscript
+++ b/3rd/nanovg/SConscript
@@ -17,18 +17,18 @@ NANOVG_BACKEND=os.environ['NANOVG_BACKEND'];
 if NANOVG_BACKEND == 'AGG':
   env.Library(os.path.join(LIB_DIR, 'nanovg-agg'), Glob('agg/*.cpp'))
 
-  env['LIBS'] = ['nanovg-agg', 'agg', 'nanovg'] + env['LIBS']
-  env.Program(os.path.join(BIN_DIR, 'agg_stroke'), Glob('demos/agg_stroke.c'));
-  env.Program(os.path.join(BIN_DIR, 'agg_fill'), Glob('demos/agg_fill.c'));
-  env.Program(os.path.join(BIN_DIR, 'agg_draw_image'), Glob('demos/agg_draw_image.c'));
+#  env['LIBS'] = ['nanovg-agg', 'agg', 'nanovg'] + env['LIBS']
+#  env.Program(os.path.join(BIN_DIR, 'agg_stroke'), Glob('demos/agg_stroke.c'));
+#  env.Program(os.path.join(BIN_DIR, 'agg_fill'), Glob('demos/agg_fill.c'));
+#  env.Program(os.path.join(BIN_DIR, 'agg_draw_image'), Glob('demos/agg_draw_image.c'));
 
 elif NANOVG_BACKEND == 'AGGE':
   env.Library(os.path.join(LIB_DIR, 'nanovg-agge'), Glob('agge/*.cpp'))
   
-  env['LIBS'] = ['nanovg-agge', 'agge', 'nanovg'] + env['LIBS']
-  env.Program(os.path.join(BIN_DIR, 'agge_stroke'), Glob('demos/agge_stroke.c'));
-  env.Program(os.path.join(BIN_DIR, 'agge_fill'), Glob('demos/agge_fill.c'));
-  env.Program(os.path.join(BIN_DIR, 'agge_draw_image'), Glob('demos/agge_draw_image.c'));
+#  env['LIBS'] = ['nanovg-agge', 'agge', 'nanovg'] + env['LIBS']
+#  env.Program(os.path.join(BIN_DIR, 'agge_stroke'), Glob('demos/agge_stroke.c'));
+#  env.Program(os.path.join(BIN_DIR, 'agge_fill'), Glob('demos/agge_fill.c'));
+#  env.Program(os.path.join(BIN_DIR, 'agge_draw_image'), Glob('demos/agge_draw_image.c'));
 elif NANOVG_BACKEND == 'BGFX':
   CPPPATH = [
       joinPath(TK_3RD_ROOT, 'nanovg/base'), 
diff --git a/src/SConscript b/src/SConscript
index 4a4b705f2..2fe7552c2 100644
--- a/src/SConscript
+++ b/src/SConscript
@@ -21,7 +21,6 @@ sources=Glob('tkc/*.c') +\
   Glob('image_loader/*.c') + \
   Glob('designer_support/*.c') + \
   Glob('widget_animators/*.c') + \
-  Glob('platforms/pc/*.c') + \
   Glob('misc/*.cpp') + \
   Glob('window_animators/*.c') + \
   Glob('dialog_highlighters/*.c') + \
@@ -30,8 +29,12 @@ sources=Glob('tkc/*.c') +\
 sources += ['main_loop/main_loop_simple.c'];
 if os.environ['LCD'] == 'SDL_GPU':
   sources += ['lcd/lcd_nanovg.c', 'main_loop/main_loop_sdl_gpu.c'];
+  sources += Glob('platforms/pc/*.c')
 elif os.environ['LCD'] == 'SDL_FB':
   sources += ['lcd/lcd_sdl2.c', 'main_loop/main_loop_sdl_fb.c']
+  sources += Glob('platforms/pc/*.c')
+elif os.environ['LCD'] == 'LINUX_FB':
+  sources += Glob('platforms/pc/*.c')
 
 sources += [
   'input_methods/input_method_creator.c'