chore: compile fixes (#7207)
Co-authored-by: philmoz <phil.a.mitchell@gmail.com>
This commit is contained in:
@@ -83,6 +83,7 @@ if(EdgeTX_SUPERBUILD)
|
|||||||
|
|
||||||
add_custom_target(simu
|
add_custom_target(simu
|
||||||
COMMAND ${CMAKE_COMMAND} --build native --target simu
|
COMMAND ${CMAKE_COMMAND} --build native --target simu
|
||||||
|
DEPENDS native-configure
|
||||||
)
|
)
|
||||||
|
|
||||||
add_custom_target(wasi-module
|
add_custom_target(wasi-module
|
||||||
|
|||||||
+12
-9
@@ -6,23 +6,26 @@ FetchContent_Declare(
|
|||||||
imgui
|
imgui
|
||||||
GIT_REPOSITORY https://github.com/ocornut/imgui
|
GIT_REPOSITORY https://github.com/ocornut/imgui
|
||||||
GIT_TAG dbb5eeaadffb6a3ba6a60de1290312e5802dba5a # v1.91.8
|
GIT_TAG dbb5eeaadffb6a3ba6a60de1290312e5802dba5a # v1.91.8
|
||||||
SOURCE_DIR imgui
|
GIT_SHALLOW TRUE
|
||||||
|
UPDATE_DISCONNECTED TRUE
|
||||||
)
|
)
|
||||||
|
|
||||||
FetchContent_MakeAvailable(imgui)
|
FetchContent_MakeAvailable(imgui)
|
||||||
|
|
||||||
|
message("Fetched imgui source code from Github: ${imgui_SOURCE_DIR}")
|
||||||
|
|
||||||
add_library(imgui STATIC
|
add_library(imgui STATIC
|
||||||
imgui/imgui.cpp
|
${imgui_SOURCE_DIR}/imgui.cpp
|
||||||
imgui/imgui_draw.cpp
|
${imgui_SOURCE_DIR}/imgui_draw.cpp
|
||||||
imgui/imgui_tables.cpp
|
${imgui_SOURCE_DIR}/imgui_tables.cpp
|
||||||
imgui/imgui_widgets.cpp
|
${imgui_SOURCE_DIR}/imgui_widgets.cpp
|
||||||
imgui/backends/imgui_impl_sdl2.cpp
|
${imgui_SOURCE_DIR}/backends/imgui_impl_sdl2.cpp
|
||||||
imgui/backends/imgui_impl_sdlrenderer2.cpp
|
${imgui_SOURCE_DIR}/backends/imgui_impl_sdlrenderer2.cpp
|
||||||
)
|
)
|
||||||
|
|
||||||
target_include_directories(imgui PUBLIC
|
target_include_directories(imgui PUBLIC
|
||||||
${CMAKE_CURRENT_BINARY_DIR}/imgui
|
${imgui_SOURCE_DIR}
|
||||||
${CMAKE_CURRENT_BINARY_DIR}/imgui/backends
|
${imgui_SOURCE_DIR}/backends
|
||||||
)
|
)
|
||||||
|
|
||||||
target_link_libraries(imgui PUBLIC SDL2::SDL2)
|
target_link_libraries(imgui PUBLIC SDL2::SDL2)
|
||||||
|
|||||||
@@ -35,6 +35,7 @@ ExternalProject_Add(wasm
|
|||||||
-DEdgeTX_SUPERBUILD:BOOL=0
|
-DEdgeTX_SUPERBUILD:BOOL=0
|
||||||
-DNATIVE_BUILD:BOOL=1
|
-DNATIVE_BUILD:BOOL=1
|
||||||
-DDISABLE_COMPANION:BOOL=1
|
-DDISABLE_COMPANION:BOOL=1
|
||||||
|
BUILD_ALWAYS TRUE
|
||||||
BUILD_COMMAND ${CMAKE_COMMAND} --build <BINARY_DIR> --target wasi-module
|
BUILD_COMMAND ${CMAKE_COMMAND} --build <BINARY_DIR> --target wasi-module
|
||||||
INSTALL_COMMAND ""
|
INSTALL_COMMAND ""
|
||||||
)
|
)
|
||||||
|
|||||||
Reference in New Issue
Block a user