Fix SConscript file

* Previously, the SConscript added all MO subfolders to the global include paths. However, MO expects only ./src to be on include and the superfluous folders may lead to filename conflicts.

* Remove ArduinoJson from the sources as it's a header-only library and only needs to be on the include path

* Add .c files to the list of source objects

Author: Matthias Akstaller

SConscript.py

@@ -7,7 +7,7 @@
 #       Use this file as a starting point for writing your own SCons integration. And as always, any
 #       contributions are highly welcome!
 
-Import("env", "ARDUINOJSON_DIR")
+Import("env")
 
 import os, pathlib
 
@@ -17,16 +17,15 @@ def getAllDirs(root_dir):
         dir_list.append(Dir(root))
     return dir_list
 
-SOURCE_DIR = Dir(".").srcnode()
+SOURCE_DIR = Dir(".").srcnode().Dir("src")
 
-source_dirs = getAllDirs(SOURCE_DIR.Dir("src"))
-source_dirs += getAllDirs(ARDUINOJSON_DIR.Dir("src"))
+source_dirs = getAllDirs(SOURCE_DIR)
 
 source_files = []
 
 for folder in source_dirs:
+    source_files += folder.glob("*.c")
     source_files += folder.glob("*.cpp")
-    env["CPPPATH"].append(folder)
 
 compiled_objects = []
 for source_file in source_files:
@@ -44,7 +43,7 @@ def getAllDirs(root_dir):
 
 exports = {
     'library': libmicroocpp,
-    'CPPPATH': source_dirs.copy()
+    'CPPPATH': SOURCE_DIR
 }
 
 Return("exports")