github-code/lvgl
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

update makefile for backward compatibility

Browse Source
This commit is contained in:
Gabor Kiss-Vamosi
2020-01-12 14:34:43 +01:00
parent a9e3bbeddc
commit b08bf29aed
10 changed files with 31 additions and 31 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
lvgl.mk
View File

@@ -1,8 +1,8 @@
include $(LVGL_DIR)/src/lv_core/lv_core.mk
include $(LVGL_DIR)/src/lv_hal/lv_hal.mk
include $(LVGL_DIR)/src/lv_objx/lv_objx.mk
include $(LVGL_DIR)/src/lv_font/lv_font.mk
include $(LVGL_DIR)/src/lv_misc/lv_misc.mk
include $(LVGL_DIR)/src/lv_themes/lv_themes.mk
include $(LVGL_DIR)/src/lv_draw/lv_draw.mk
include $(LVGL_DIR)/lvgl/src/lv_core/lv_core.mk
include $(LVGL_DIR)/lvgl/src/lv_hal/lv_hal.mk
include $(LVGL_DIR)/lvgl/src/lv_objx/lv_objx.mk
include $(LVGL_DIR)/lvgl/src/lv_font/lv_font.mk
include $(LVGL_DIR)/lvgl/src/lv_misc/lv_misc.mk
include $(LVGL_DIR)/lvgl/src/lv_themes/lv_themes.mk
include $(LVGL_DIR)/lvgl/src/lv_draw/lv_draw.mk

6
src/lv_core/lv_core.mk
View File

@@ -6,7 +6,7 @@ CSRCS += lv_refr.c
CSRCS += lv_style.c
CSRCS += lv_debug.c
DEPPATH += --dep-path $(LVGL_DIR)/src/lv_core
VPATH += :$(LVGL_DIR)/src/lv_core
DEPPATH += --dep-path $(LVGL_DIR)/lvgl/src/lv_core
VPATH += :$(LVGL_DIR)/lvgl/src/lv_core
CFLAGS += "-I$(LVGL_DIR)/src/lv_core"
CFLAGS += "-I$(LVGL_DIR)/lvgl/src/lv_core"

6
src/lv_draw/lv_draw.mk
View File

@@ -10,7 +10,7 @@ CSRCS += lv_img_decoder.c
CSRCS += lv_img_cache.c
CSRCS += lv_img_buf.c
DEPPATH += --dep-path $(LVGL_DIR)/src/lv_draw
VPATH += :$(LVGL_DIR)/src/lv_draw
DEPPATH += --dep-path $(LVGL_DIR)/lvgl//src/lv_draw
VPATH += :$(LVGL_DIR)/lvgl/src/lv_draw
CFLAGS += "-I$(LVGL_DIR)/src/lv_draw"
CFLAGS += "-I$(LVGL_DIR)/lvgl/src/lv_draw"

6
src/lv_font/lv_font.mk
View File

@@ -6,7 +6,7 @@ CSRCS += lv_font_roboto_22.c
CSRCS += lv_font_roboto_28.c
CSRCS += lv_font_unscii_8.c
DEPPATH += --dep-path $(LVGL_DIR)/src/lv_font
VPATH += :$(LVGL_DIR)/src/lv_font
DEPPATH += --dep-path $(LVGL_DIR)/lvgl/src/lv_font
VPATH += :$(LVGL_DIR)/lvgl/src/lv_font
CFLAGS += "-I$(LVGL_DIR)/src/lv_font"
CFLAGS += "-I$(LVGL_DIR)/lvgl/src/lv_font"

6
src/lv_hal/lv_hal.mk
View File

@@ -2,7 +2,7 @@ CSRCS += lv_hal_disp.c
CSRCS += lv_hal_indev.c
CSRCS += lv_hal_tick.c
DEPPATH += --dep-path $(LVGL_DIR)/src/lv_hal
VPATH += :$(LVGL_DIR)/src/lv_hal
DEPPATH += --dep-path $(LVGL_DIR)/lvgl/src/lv_hal
VPATH += :$(LVGL_DIR)/lvgl/src/lv_hal
CFLAGS += "-I$(LVGL_DIR)/src/lv_hal"
CFLAGS += "-I$(LVGL_DIR)/lvgl/src/lv_hal"

6
src/lv_misc/lv_misc.mk
View File

@@ -15,7 +15,7 @@ CSRCS += lv_async.c
CSRCS += lv_printf.c
CSRCS += lv_bidi.c
DEPPATH += --dep-path $(LVGL_DIR)/src/lv_misc
VPATH += :$(LVGL_DIR)/src/lv_misc
DEPPATH += --dep-path $(LVGL_DIR)/lvgl/src/lv_misc
VPATH += :$(LVGL_DIR)/lvgl/src/lv_misc
CFLAGS += "-I$(LVGL_DIR)/src/lv_misc"
CFLAGS += "-I$(LVGL_DIR)/lvgl/src/lv_misc"

6
src/lv_objx/lv_objx.mk
View File

@@ -32,7 +32,7 @@ CSRCS += lv_sw.c
CSRCS += lv_win.c
CSRCS += lv_objmask.c
DEPPATH += --dep-path $(LVGL_DIR)/src/lv_objx
VPATH += :$(LVGL_DIR)/src/lv_objx
DEPPATH += --dep-path $(LVGL_DIR)/lvgl/src/lv_objx
VPATH += :$(LVGL_DIR)/lvgl/src/lv_objx
CFLAGS += "-I$(LVGL_DIR)/src/lv_objx"
CFLAGS += "-I$(LVGL_DIR)/lvgl/src/lv_objx"

6
src/lv_themes/lv_themes.mk
View File

@@ -8,7 +8,7 @@ CSRCS += lv_theme_material.c
CSRCS += lv_theme_nemo.c
CSRCS += lv_theme_mono.c
DEPPATH += --dep-path $(LVGL_DIR)/src/lv_themes
VPATH += :$(LVGL_DIR)/src/lv_themes
DEPPATH += --dep-path $(LVGL_DIR)/lvgl/src/lv_themes
VPATH += :$(LVGL_DIR)/lvgl/src/lv_themes
CFLAGS += "-I$(LVGL_DIR)/src/lv_themes"
CFLAGS += "-I$(LVGL_DIR)/lvgl/src/lv_themes"

4
tests/Makefile
View File

@@ -2,7 +2,7 @@
# Makefile
#
CC ?= gcc
LVGL_DIR ?= ${shell pwd}/..
LVGL_DIR ?= ${shell pwd}/../..
WARNINGS ?= -Wall -Wextra
OPTIMIZATION ?= -O3 -g0
@@ -17,7 +17,7 @@ BIN ?= demo
#Collect the files to compile
MAINSRC = ./test_main.c
include $(LVGL_DIR)/lvgl.mk
include $(LVGL_DIR)/lvgl/lvgl.mk
OBJEXT ?= .o

2
tests/build.py
View File

@@ -1,7 +1,7 @@
import os
warnings = '"-Wall -Werror"'
base_defines = '"-DLV_CONF_PATH=tests/lv_test_conf.h -DLV_BUILD_TEST"'
base_defines = '"-DLV_CONF_PATH=lvgl/tests/lv_test_conf.h -DLV_BUILD_TEST"'
optimization = '"-O3 -g0"'