Merge branch 'master' of https://github.com/lvgl/lv_port_esp32

C47D · C47D · commit f3a0cc354b99 · 2021-02-21T19:36:18.000-06:00
diff --git a/Makefile b/Makefile
@@ -6,7 +6,8 @@
 PROJECT_NAME := lvgl-demo
 
 # Add new components (source folders)
-EXTRA_COMPONENT_DIRS := components/lvgl_esp32_drivers/lvgl_tft components/lvgl_esp32_drivers/lvgl_touch
+EXTRA_COMPONENT_DIRS := components/lvgl_esp32_drivers/lvgl_tft
+EXTRA_COMPONENT_DIRS += components/lvgl_esp32_drivers/lvgl_touch
 # Must be before include $(IDF_PATH)/make/project.mk
 # $(PROJECT_PATH)/xxx didn't work -> use $(abspath xxx) instead
 
diff --git a/main/component.mk b/main/component.mk
@@ -3,5 +3,5 @@
 #
 # (Uses default behaviour of compiling all source files in directory, adding 'include' to include path.)
 
-CFLAGS+= -DLV_CONF_INCLUDE_SIMPLE
-CFLAGS+= -DLV_LVGL_H_INCLUDE_SIMPLE
+CFLAGS += -DLV_CONF_INCLUDE_SIMPLE
+CFLAGS += -DLV_LVGL_H_INCLUDE_SIMPLE

Original file line number	Diff line number	Diff line change
`@@ -3,5 +3,5 @@`
`3`	`3`	`#`
`4`	`4`	`# (Uses default behaviour of compiling all source files in directory, adding 'include' to include path.)`
`5`	`5`
`6`		`-CFLAGS+= -DLV_CONF_INCLUDE_SIMPLE`
`7`		`-CFLAGS+= -DLV_LVGL_H_INCLUDE_SIMPLE`
	`6`	`+CFLAGS += -DLV_CONF_INCLUDE_SIMPLE`
	`7`	`+CFLAGS += -DLV_LVGL_H_INCLUDE_SIMPLE`