scawful/yaze
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

backend-infra-engineer: Fix Homebrew LLVM build plumbing

Browse Source
This commit is contained in:
scawful
2025-12-21 19:41:41 -05:00
parent e674fc3214
commit ca71140a88
6 changed files with 52 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
src/app/net/net_library.cmake
View File

@@ -84,7 +84,7 @@ if(EMSCRIPTEN)
endif()
# Add JSON and httplib support if enabled
if(YAZE_WITH_JSON)
if(YAZE_ENABLE_JSON)
# Link nlohmann_json which provides the include directories automatically
target_link_libraries(yaze_net PUBLIC nlohmann_json::nlohmann_json)
target_include_directories(yaze_net PUBLIC ${CMAKE_SOURCE_DIR}/ext/httplib)
@@ -102,8 +102,17 @@ if(YAZE_WITH_JSON)
# WebSocket will work with plain HTTP (no SSL/TLS) on Windows
if(NOT WIN32)
find_package(OpenSSL QUIET)
if(OpenSSL_FOUND)
target_link_libraries(yaze_net PUBLIC OpenSSL::SSL OpenSSL::Crypto)
if(OPENSSL_INCLUDE_DIR)
target_include_directories(yaze_net PUBLIC ${OPENSSL_INCLUDE_DIR})
elseif(OPENSSL_ROOT_DIR)
target_include_directories(yaze_net PUBLIC ${OPENSSL_ROOT_DIR}/include)
endif()
if(OPENSSL_FOUND)
if(TARGET OpenSSL::SSL)
target_link_libraries(yaze_net PUBLIC OpenSSL::SSL OpenSSL::Crypto)
else()
target_link_libraries(yaze_net PUBLIC ${OPENSSL_SSL_LIBRARY} ${OPENSSL_CRYPTO_LIBRARY})
endif()
target_compile_definitions(yaze_net PUBLIC CPPHTTPLIB_OPENSSL_SUPPORT)
message(STATUS " - WebSocket with SSL/TLS support enabled")
else()

2
src/app/service/grpc_support.cmake
View File

@@ -57,7 +57,7 @@ target_link_libraries(yaze_grpc_support PUBLIC
)
# Add JSON support
if(YAZE_WITH_JSON)
if(YAZE_ENABLE_JSON)
target_include_directories(yaze_grpc_support PUBLIC
${CMAKE_SOURCE_DIR}/ext/json/include)
target_compile_definitions(yaze_grpc_support PUBLIC YAZE_WITH_JSON)

22
src/cli/agent.cmake
View File

@@ -180,13 +180,13 @@ set(YAZE_AGENT_CORE_SOURCES
cli/service/agent/tools/validation_tool.cc
cli/service/agent/tools/visual_analysis_tool.cc
cli/service/agent/disassembler_65816.cc
cli/service/agent/rom_debug_agent.cc
cli/service/agent/vim_mode.cc
cli/service/command_registry.cc
cli/service/gui/gui_action_generator.cc
cli/service/net/z3ed_network_client.cc
cli/service/planning/policy_evaluator.cc
cli/service/planning/proposal_registry.cc
cli/service/planning/tile16_proposal_generator.cc
cli/service/resources/command_context.cc
cli/service/resources/command_handler.cc
cli/service/resources/resource_catalog.cc
@@ -207,6 +207,12 @@ set(YAZE_AGENT_CORE_SOURCES
app/editor/agent/panels/agent_editor_panels.cc
)
if(YAZE_ENABLE_REMOTE_AUTOMATION)
list(APPEND YAZE_AGENT_CORE_SOURCES
cli/service/agent/rom_debug_agent.cc
)
endif()
# AI runtime sources
if(YAZE_ENABLE_AI_RUNTIME)
list(APPEND YAZE_AGENT_CORE_SOURCES
@@ -236,7 +242,6 @@ if(YAZE_ENABLE_REMOTE_AUTOMATION)
cli/handlers/tools/emulator_commands.cc
cli/service/gui/gui_automation_client.cc
cli/service/gui/canvas_automation_client.cc
cli/service/planning/tile16_proposal_generator.cc
)
endif()
@@ -327,9 +332,18 @@ if(YAZE_ENABLE_AI_RUNTIME AND YAZE_ENABLE_JSON)
# HTTP API works fine without HTTPS for local development
if(NOT WIN32)
find_package(OpenSSL)
if(OpenSSL_FOUND)
if(OPENSSL_INCLUDE_DIR)
target_include_directories(yaze_agent PUBLIC ${OPENSSL_INCLUDE_DIR})
elseif(OPENSSL_ROOT_DIR)
target_include_directories(yaze_agent PUBLIC ${OPENSSL_ROOT_DIR}/include)
endif()
if(OPENSSL_FOUND)
if(TARGET OpenSSL::SSL)
target_link_libraries(yaze_agent PUBLIC OpenSSL::SSL OpenSSL::Crypto)
else()
target_link_libraries(yaze_agent PUBLIC ${OPENSSL_SSL_LIBRARY} ${OPENSSL_CRYPTO_LIBRARY})
endif()
target_compile_definitions(yaze_agent PUBLIC CPPHTTPLIB_OPENSSL_SUPPORT)
target_link_libraries(yaze_agent PUBLIC OpenSSL::SSL OpenSSL::Crypto)
if(APPLE)
target_compile_definitions(yaze_agent PUBLIC CPPHTTPLIB_USE_CERTS_FROM_MACOSX_KEYCHAIN)