Skip to content

Commit

Permalink
Move FreeRTOSConfig.h to app-sim
Browse files Browse the repository at this point in the history
  • Loading branch information
KenVanHoeylandt committed Jan 21, 2024
1 parent d6baf40 commit dc7fb1c
Show file tree
Hide file tree
Showing 2 changed files with 13 additions and 9 deletions.
22 changes: 13 additions & 9 deletions CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -37,12 +37,23 @@ add_subdirectory(tactility-core)

if (NOT ESP_PLATFORM)
add_subdirectory(libs/freertos-kernel)
target_include_directories(freertos-kernel
PUBLIC app-sim/src # for FreeRTOSConfig.h
)

add_subdirectory(libs/mbedtls)
add_subdirectory(app-sim)

# region LVGL
# region SDL & LVGL

find_package(SDL2 REQUIRED CONFIG)

add_subdirectory(libs/lvgl) # Added as idf component for ESP and as library for other targets
target_include_directories(lvgl
PUBLIC ${SDL2_INCLUDE_DIRS}
PUBLIC app-sim/src # for lv_conf.h and lv_drv_conf.h
)

add_subdirectory(libs/lv_drivers)

option(LV_USE_DRAW_SDL "Use SDL draw unit" OFF)
Expand All @@ -57,18 +68,11 @@ if (NOT ESP_PLATFORM)

set(EXECUTABLE_OUTPUT_PATH ${PROJECT_SOURCE_DIR}/bin)

find_package(SDL2 REQUIRED CONFIG)

add_compile_definitions($<$<BOOL:${LV_USE_DRAW_SDL}>:LV_USE_DRAW_SDL=1>)
add_compile_definitions($<$<BOOL:${LV_USE_LIBPNG}>:LV_USE_LIBPNG=1>)
add_compile_definitions($<$<BOOL:${LV_USE_LIBJPEG_TURBO}>:LV_USE_LIBJPEG_TURBO=1>)
add_compile_definitions($<$<BOOL:${LV_USE_FFMPEG}>:LV_USE_FFMPEG=1>)

target_include_directories(lvgl
PUBLIC ${SDL2_INCLUDE_DIRS}
PUBLIC app-sim/src # for lv_conf.h and lv_drv_conf.h
)

if (LV_USE_DRAW_SDL)
set(CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} "${CMAKE_SOURCE_DIR}/cmake")
# Need to install libsdl2-image-dev
Expand Down Expand Up @@ -104,5 +108,5 @@ if (NOT ESP_PLATFORM)
target_include_directories(lvgl PUBLIC ${FREETYPE_INCLUDE_DIRS})
endif(LV_USE_FREETYPE)

#endregion
# endregion SDL & LVGL
endif()
File renamed without changes.

0 comments on commit dc7fb1c

Please sign in to comment.