Skip to content
Merged
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
14 changes: 12 additions & 2 deletions simulator/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -73,6 +73,11 @@ target_compile_definitions(wally PRIVATE
ECMULT_WINDOW_SIZE=8
)

if(APPLE)
# macOS lacks explicit_bzero; wally_internal_bzero() tries memset_s first
target_compile_definitions(wally PRIVATE HAVE_MEMSET_S=1 __STDC_WANT_LIB_EXT1__=1)
endif()

# Changes the public struct layouts, so every user of the headers needs it.
target_compile_definitions(wally PUBLIC WALLY_ABI_NO_ELEMENTS)

Expand Down Expand Up @@ -350,6 +355,10 @@ set_target_properties(lvgl PROPERTIES POSITION_INDEPENDENT_CODE ON)
target_include_directories(lvgl PUBLIC
${LVGL_DIR}
${LVGL_DIR}/src
# Debian's libsdl2-dev drops headers straight under /usr/include (already
# a default search path), but Homebrew's puts them under a non-default
# prefix; SDL2_INCLUDE_DIRS covers both without changing the Linux path.
${SDL2_INCLUDE_DIRS}
)
target_include_directories(lvgl PRIVATE
${CMAKE_CURRENT_SOURCE_DIR}
Expand All @@ -361,7 +370,7 @@ target_compile_definitions(lvgl PRIVATE
lv_refr_now=kern_lv_refr_now_real
)
target_link_libraries(lvgl PUBLIC
SDL2
${SDL2_LIBRARIES}
)

add_executable(kern_simulator
Expand Down Expand Up @@ -403,6 +412,7 @@ target_include_directories(kern_simulator PRIVATE
# LVGL
${LVGL_DIR}
${LVGL_DIR}/src
${SDL2_INCLUDE_DIRS}
)

target_compile_definitions(kern_simulator PRIVATE
Expand Down Expand Up @@ -458,7 +468,7 @@ endif()

target_link_libraries(kern_simulator PRIVATE
lvgl
SDL2
${SDL2_LIBRARIES}
Threads::Threads
m
wally
Expand Down
Loading