LVGL to current master.

Author: kdschlosser

ext_mod/lvgl/micropython.cmake

@@ -4,18 +4,34 @@ find_package(Python3 REQUIRED COMPONENTS Interpreter)
 
 get_filename_component(BINDING_DIR ${CMAKE_CURRENT_LIST_DIR}/../.. ABSOLUTE)
 
+set(LVGL_HEADER "${BINDING_DIR}/build/lvgl_header.h")
+set(FAKE_LIBC_PATH "${BINDING_DIR}/gen/fake_libc")
+
 separate_arguments(LV_CFLAGS_ENV UNIX_COMMAND $ENV{LV_CFLAGS})
+separate_arguments(SECOND_BUILD_ENV UNIX_COMMAND $ENV{SECOND_BUILD})
+
+list(APPEND LV_CFLAGS_ENV
+    -std=c11
+    -Wno-incompatible-pointer-types
+    -I${BINDING_DIR}/lib
+    -I${BINDING_DIR}/lib/lvgl
+)
+
+list(APPEND LV_CFLAGS ${LV_CFLAGS_ENV})
 list(APPEND LV_CFLAGS
-    ${LV_CFLAGS_ENV}
-    -Wno-unused-function
     -DMICROPY_FLOAT=1
 )
 
-separate_arguments(SECOND_BUILD_ENV UNIX_COMMAND $ENV{SECOND_BUILD})
+list(APPEND LV_PP_CFLAGS ${LV_CFLAGS_ENV})
+list(APPEND LV_PP_CFLAGS
+    -E
+    -I{FAKE_LIBC_PATH}
+    -Wno-unused-function
+    -DPYCPARSER
+)
 
-set(LVGL_HEADER "${BINDING_DIR}/build/lvgl_header.h")
 
-file(GLOB_RECURSE LVGL_HEADERS ${BINDING_DIR}/lib/lvgl/src/*.h ${BINDING_DIR}/lib/lv_conf.h)
+# file(GLOB_RECURSE LVGL_HEADERS ${BINDING_DIR}/lib/lvgl/src/*.h ${BINDING_DIR}/lib/lv_conf.h)
 
 # this MUST be an execute_process because of the order in which cmake does things
 # if add_custom_command is used it errors becasue add_custom_command doesn't
@@ -27,7 +43,22 @@ file(GLOB_RECURSE LVGL_HEADERS ${BINDING_DIR}/lib/lvgl/src/*.h ${BINDING_DIR}/li
 if(${SECOND_BUILD_ENV} EQUAL "0")
     execute_process(
         COMMAND
-            ${Python3_EXECUTABLE} ${BINDING_DIR}/gen/$ENV{GEN_SCRIPT}_api_gen_mpy.py ${LV_CFLAGS} --output=${CMAKE_BINARY_DIR}/lv_mp.c --include=${BINDING_DIR}/lib --include=${BINDING_DIR}/lib/lvgl --board=$ENV{LV_PORT} --module_name=lvgl --module_prefix=lv --metadata=${CMAKE_BINARY_DIR}/lv_mp.c.json --header_file=${LVGL_HEADER}
+            ${CMAKE_C_COMPILER} ${LV_PP_CFLAGS} ${LVGL_HEADER}  >> ${CMAKE_BINARY_DIR}/lv_mp.pp
+        WORKING_DIRECTORY 
+            ${CMAKE_CURRENT_LIST_DIR}
+        RESULT_VARIABLE mpy_pp_result
+        OUTPUT_VARIABLE mpy_pp_output
+    )
+    
+    if(${mpy_pp_result} GREATER "0")
+        message("OUTPUT: ${mpy_pp_output}")
+        message("RESULT: ${mpy_pp_result}")
+        message(FATAL_ERROR "Failed to generate ${CMAKE_BINARY_DIR}/lv_mp.pp")
+    endif()
+
+    execute_process(
+        COMMAND
+            ${Python3_EXECUTABLE} ${BINDING_DIR}/gen/$ENV{GEN_SCRIPT}_api_gen_mpy.py --cflags="${LV_PP_CFLAGS}" --output=${CMAKE_BINARY_DIR}/lv_mp.c --pp_file=${CMAKE_BINARY_DIR}/lv_mp.pp --board=$ENV{LV_PORT} --module_name=lvgl --module_prefix=lv --metadata=${CMAKE_BINARY_DIR}/lv_mp.c.json --header_file=${LVGL_HEADER}
         WORKING_DIRECTORY
             ${CMAKE_CURRENT_LIST_DIR}
 
@@ -38,7 +69,7 @@ if(${SECOND_BUILD_ENV} EQUAL "0")
     if(${mpy_result} GREATER "0")
         message("OUTPUT: ${mpy_output}")
         message("RESULT: ${mpy_result}")
-        message( FATAL_ERROR "Failed to generate ${CMAKE_BINARY_DIR}/lv_mp.c" )
+       message(FATAL_ERROR "Failed to generate ${CMAKE_BINARY_DIR}/lv_mp.c")
     endif()
 endif()
 

ext_mod/lvgl/micropython.mk

@@ -10,13 +10,19 @@ LIB_DIR = $(LVGL_BINDING_DIR)/lib
 LVGL_DIR = $(LVGL_BINDING_DIR)/lib/lvgl
 LVGL_HEADER = $(LVGL_BINDING_DIR)/build/lvgl_header.h
 
+FAKE_LIBC_PATH = $(LVGL_BINDING_DIR)/gen/fake_libc
+
 CURRENT_DIR = $(LVGL_BINDING_DIR)/ext_mod/lvgl
 CFLAGS_USERMOD += -I$(LVGL_DIR)
 CFLAGS_USERMOD += -I$(LIB_DIR)
 
+LV_PP_CFLAGS = $(CFLAGS_USERMOD)
+LV_PP_CFLAGS += -std=c11 -E -I$(FAKE_LIBC_PATH) -DPYCPARSER
+
 
 ifdef $(LV_CFLAGS)
     CFLAGS_USERMOD += $(LV_CFLAGS)
+    LV_PP_CFLAGS += $(LV_CFLAGS)
 endif
 
 ifneq (,$(findstring -Wno-missing-field-initializers, $(CFLAGS_USERMOD)))
@@ -27,17 +33,21 @@ endif
 ALL_LVGL_SRC = $(shell find $(LVGL_DIR) -type f -name '*.h') $(LVGL_BINDING_DIR)/lib/lv_conf.h
 
 LVGL_MPY = $(BUILD)/lv_mpy.c
+LVGL_MPY_PP = $(BUILD)/lv_mpy.pp
 LVGL_MPY_METADATA = $(BUILD)/lv_mpy.json
 
-
 SRC_USERMOD_LIB_C += $(shell find $(LVGL_DIR)/src -type f -name "*.c")
 SRC_USERMOD_LIB_C += $(CURRENT_DIR)/mem_core.c
+
 SRC_USERMOD_C += $(LVGL_MPY)
 
 $(LVGL_MPY): $(ALL_LVGL_SRC) $(LVGL_BINDING_DIR)/gen/$(GEN_SCRIPT)_api_gen_mpy.py
 	$(ECHO) "LVGL-GEN $@"
 	$(Q)mkdir -p $(dir $@)
-	$(Q)$(PYTHON) $(LVGL_BINDING_DIR)/gen/$(GEN_SCRIPT)_api_gen_mpy.py $(LV_CFLAGS) --board=$(LV_PORT) --output=$(LVGL_MPY)  --include=$(LIB_DIR) --include=$(LVGL_DIR)  --module_name=lvgl --module_prefix=lv --metadata=$(LVGL_MPY_METADATA) --header_file=$(LVGL_HEADER)
+
+	$(Q)$(CC) $(LV_PP_CFLAGS) $(LVGL_HEADER) >> $(LVGL_MPY_PP)
+
+	$(Q)$(PYTHON) $(LVGL_BINDING_DIR)/gen/$(GEN_SCRIPT)_api_gen_mpy.py --cflags="$(LV_PP_CFLAGS)" --pp_file=$(LVGL_MPY_PP) --board=$(LV_PORT) --output=$(LVGL_MPY)  --module_name=lvgl --module_prefix=lv --metadata=$(LVGL_MPY_METADATA) --header_file=$(LVGL_HEADER)
 
 .PHONY: LVGL_MPY
 LVGL_MPY: $(LVGL_MPY)