update eez-framework

Author: mvladic

.vscode/settings.json

@@ -34,7 +34,9 @@
         "ios": "cpp",
         "xhash": "cpp",
         "sd_diskio.h": "c",
-        "bsp_driver_sd.h": "c"
+        "bsp_driver_sd.h": "c",
+        "ctype.h": "c",
+        "utils_private.h": "c"
     },
     "C_Cpp.errorSquiggles": "Disabled",
     "cmake.configureOnOpen": true

CMakeLists.txt

@@ -33,6 +33,7 @@ endif (UNIX)
 
 add_definitions(-DDEBUG)
 
+add_definitions(-DEEZ_OPTION_GUI=1)
 add_definitions(-DOPTION_SCPI=1)
 add_definitions(-DHAVE_STRTOLL)
 add_definitions(-DHAVE_STDBOOL)
@@ -68,12 +69,13 @@ endif()
 
 include_directories(
     src
-    src/eez/libs/agg
-    src/eez/libs/libscpi/inc
+    src/bb3/conf
     src/bb3/libs/mqtt
-    src/eez/platform/simulator
     src/bb3/scpi
-    src/bb3/conf
+    src/eez-framework/src
+    src/eez-framework/src/eez/libs/agg
+    src/eez-framework/src/eez/libs/libscpi/inc
+    src/eez-framework/src/eez/platform/simulator
 )
 
 include_directories(SYSTEM
@@ -92,15 +94,15 @@ set(header_files)
 ################################################################################
 # EEZ Framework files
 file(GLOB_RECURSE src_eez
-    src/eez/*.cpp
-    src/eez/*.c
+    src/eez-framework/src/eez/*.cpp
+    src/eez-framework/src/eez/*.c
 )
 file(GLOB_RECURSE header_eez
-    src/eez/*.h
+    src/eez-framework/src/eez/*.h
 )
 
 # exclude STM32 platform specific files
-set (EXCLUDE_DIR "src/eez/platform/stm32")
+set (EXCLUDE_DIR "src/eez-framework/src/eez/platform/stm32")
 foreach (TMP_PATH ${src_eez})
     string (FIND ${TMP_PATH} ${EXCLUDE_DIR} EXCLUDE_DIR_FOUND)
     if (NOT ${EXCLUDE_DIR_FOUND} EQUAL -1)
@@ -117,11 +119,11 @@ endforeach(TMP_PATH)
 list (APPEND src_files ${src_eez})
 list (APPEND header_files ${header_eez})
 
-source_group(TREE "../../src/eez" PREFIX "eez" FILES ${src_eez} ${header_eez})
+source_group(TREE "../../src/eez-framework/src/eez" PREFIX "eez" FILES ${src_eez} ${header_eez})
 
 if(MSVC)
     set(libscpi_src_files ${src_files})
-    list(FILTER libscpi_src_files INCLUDE REGEX "${CMAKE_CURRENT_SOURCE_DIR}/src/eez/libs/libscpi")
+    list(FILTER libscpi_src_files INCLUDE REGEX "${CMAKE_CURRENT_SOURCE_DIR}/src/eez-framework/src/eez/libs/libscpi")
     set_source_files_properties(${libscpi_src_files} PROPERTIES COMPILE_FLAGS /W0)
 endif()