Skip to content
Open
Show file tree
Hide file tree
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
7 changes: 6 additions & 1 deletion components/libwally-core/config.h
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,9 @@
/* #undef HAVE_DLFCN_H */

/* Define to 1 if you have the `explicit_bzero' function. */
#ifndef __APPLE__
#define HAVE_EXPLICIT_BZERO 1
#endif

/* Define to 1 if you have the `explicit_memset' function. */
/* #undef HAVE_EXPLICIT_MEMSET */
Expand All @@ -35,7 +37,10 @@
#define HAVE_MEMORY_H 1

/* Define to 1 if you have the `memset_s' function. */
/* #undef HAVE_MEMSET_S */
/* macOS has no explicit_bzero; memset_s is its non-elidable wipe. */
#ifdef __APPLE__
#define HAVE_MEMSET_S 1
#endif

/* Define if we have mmap */
/* #undef HAVE_MMAP */
Expand Down
9 changes: 7 additions & 2 deletions simulator/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -365,6 +365,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 @@ -376,7 +380,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 @@ -418,6 +422,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 @@ -472,7 +477,7 @@ endif()

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