update eez-framework

CMakeLists.txt

@@ -13,8 +13,8 @@ endif()
 set(CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} "${CMAKE_SOURCE_DIR}/cmake/")
 
 if(${CMAKE_SYSTEM_NAME} STREQUAL "Emscripten")
-    set(CMAKE_CXX_FLAGS  "${CMAKE_CXX_FLAGS} -Wunused-const-variable -Wno-nested-anon-types -Wno-dollar-in-identifier-extension -O2")
-    set(CMAKE_EXE_LINKER_FLAGS  "${CMAKE_CXX_FLAGS} -s DEMANGLE_SUPPORT=1 -s FORCE_FILESYSTEM=1 -s ALLOW_MEMORY_GROWTH=1 -s INITIAL_MEMORY=83886080 -s LLD_REPORT_UNDEFINED --bind -lidbfs.js --pre-js ${PROJECT_SOURCE_DIR}/src/platform/simulator/emscripten/pre.js")
+    set(CMAKE_CXX_FLAGS  "${CMAKE_CXX_FLAGS} -Wunused-const-variable -Wno-nested-anon-types -Wno-dollar-in-identifier-extension -O2 -sUSE_SDL=2")
+    set(CMAKE_EXE_LINKER_FLAGS  "${CMAKE_CXX_FLAGS} -s DEMANGLE_SUPPORT=1 -s FORCE_FILESYSTEM=1 -s ALLOW_MEMORY_GROWTH=1 -s INITIAL_MEMORY=83886080 -s LLD_REPORT_UNDEFINED -sUSE_SDL=2 --bind -lidbfs.js --pre-js ${PROJECT_SOURCE_DIR}/src/platform/simulator/emscripten/pre.js")
     #set(CMAKE_EXE_LINKER_FLAGS  "${CMAKE_EXE_LINKER_FLAGS} --preload-file ../../images/eez.png")
     add_definitions(-DEMCC_DEBUG)
 endif()

eez-framework

@@ -1 +1 @@
-Subproject commit 14893cc2bd54490a79434beec406b8e59e86b623
+Subproject commit c3e0ac049e0fda5a0d5518e2e00ee2f708099158

src/gui/document.h

@@ -114,8 +114,8 @@ enum ColorsEnum {
     COLOR_ID_TEXT_INPUT_BACKGROUND = 29,
     COLOR_ID_TEXT_INPUT_ACTIVE_BACKGROUND = 30,
     COLOR_ID_TEXT_INPUT_BORDER = 31,
-	COLOR_ID_CUSTOM_UNDEFINED = 32,
-	COLOR_ID_CUSTOM_000000 = 33,
+	COLOR_ID_CUSTOM_000000 = 32,
+	COLOR_ID_CUSTOM_FFFFFF = 33,
 	COLOR_ID_CUSTOM_00FF1E = 34,
 	COLOR_ID_CUSTOM_C0C0C0 = 35,
 	COLOR_ID_CUSTOM_808080 = 36
@@ -126,7 +126,7 @@ enum PagesEnum {
     PAGE_ID_MAIN = 1
 };
 
-extern const uint8_t assets[8971];
+extern const uint8_t assets[8959];
 
 } // namespace gui
 } // namespace eez