mirror of
https://github.com/sle118/squeezelite-esp32.git
synced 2025-12-08 04:27:12 +03:00
synchronizing with host versions
This commit is contained in:
@@ -118,13 +118,16 @@
|
|||||||
#
|
#
|
||||||
#=============================================================================
|
#=============================================================================
|
||||||
|
|
||||||
|
|
||||||
function(NANOPB_GENERATE_CPP SRCS HDRS)
|
function(NANOPB_GENERATE_CPP SRCS HDRS)
|
||||||
cmake_parse_arguments(NANOPB_GENERATE_CPP "" "RELPATH" "" ${ARGN})
|
cmake_parse_arguments(NANOPB_GENERATE_CPP "" "RELPATH" "" ${ARGN})
|
||||||
if(NOT NANOPB_GENERATE_CPP_UNPARSED_ARGUMENTS)
|
if(NOT NANOPB_GENERATE_CPP_UNPARSED_ARGUMENTS)
|
||||||
return()
|
return()
|
||||||
endif()
|
endif()
|
||||||
|
|
||||||
|
if(MSVC)
|
||||||
|
set(CALL_PREFIX call)
|
||||||
|
endif()
|
||||||
|
|
||||||
if(NANOPB_GENERATE_CPP_APPEND_PATH)
|
if(NANOPB_GENERATE_CPP_APPEND_PATH)
|
||||||
# Create an include path for each file specified
|
# Create an include path for each file specified
|
||||||
foreach(FIL ${NANOPB_GENERATE_CPP_UNPARSED_ARGUMENTS})
|
foreach(FIL ${NANOPB_GENERATE_CPP_UNPARSED_ARGUMENTS})
|
||||||
@@ -184,7 +187,7 @@ function(NANOPB_GENERATE_CPP SRCS HDRS)
|
|||||||
set(GENERATOR_CORE_PYTHON_SRC ${GENERATOR_CORE_PYTHON_SRC} ${output})
|
set(GENERATOR_CORE_PYTHON_SRC ${GENERATOR_CORE_PYTHON_SRC} ${output})
|
||||||
add_custom_command(
|
add_custom_command(
|
||||||
OUTPUT ${output}
|
OUTPUT ${output}
|
||||||
COMMAND ${PROTOBUF_PROTOC_EXECUTABLE}
|
COMMAND ${CALL_PREFIX} ${PROTOBUF_PROTOC_EXECUTABLE}
|
||||||
ARGS -I${GENERATOR_PATH}/proto
|
ARGS -I${GENERATOR_PATH}/proto
|
||||||
--python_out=${GENERATOR_CORE_DIR} ${ABS_FIL}
|
--python_out=${GENERATOR_CORE_DIR} ${ABS_FIL}
|
||||||
DEPENDS ${ABS_FIL}
|
DEPENDS ${ABS_FIL}
|
||||||
@@ -276,7 +279,7 @@ function(NANOPB_GENERATE_CPP SRCS HDRS)
|
|||||||
add_custom_command(
|
add_custom_command(
|
||||||
OUTPUT "${CMAKE_CURRENT_BINARY_DIR}/${FIL_PATH_REL}/${FIL_WE}.pb.c"
|
OUTPUT "${CMAKE_CURRENT_BINARY_DIR}/${FIL_PATH_REL}/${FIL_WE}.pb.c"
|
||||||
"${CMAKE_CURRENT_BINARY_DIR}/${FIL_PATH_REL}/${FIL_WE}.pb.h"
|
"${CMAKE_CURRENT_BINARY_DIR}/${FIL_PATH_REL}/${FIL_WE}.pb.h"
|
||||||
COMMAND ${PROTOBUF_PROTOC_EXECUTABLE}
|
COMMAND ${CALL_PREFIX} ${PROTOBUF_PROTOC_EXECUTABLE}
|
||||||
ARGS -I${GENERATOR_PATH} -I${GENERATOR_CORE_DIR}
|
ARGS -I${GENERATOR_PATH} -I${GENERATOR_CORE_DIR}
|
||||||
-I${CMAKE_CURRENT_BINARY_DIR} ${_nanopb_include_path}
|
-I${CMAKE_CURRENT_BINARY_DIR} ${_nanopb_include_path}
|
||||||
--plugin=protoc-gen-nanopb=${NANOPB_GENERATOR_PLUGIN}
|
--plugin=protoc-gen-nanopb=${NANOPB_GENERATOR_PLUGIN}
|
||||||
@@ -293,6 +296,10 @@ function(NANOPB_GENERATE_CPP SRCS HDRS)
|
|||||||
set(${SRCS} ${${SRCS}} ${NANOPB_SRCS} PARENT_SCOPE)
|
set(${SRCS} ${${SRCS}} ${NANOPB_SRCS} PARENT_SCOPE)
|
||||||
set(${HDRS} ${${HDRS}} ${NANOPB_HDRS} PARENT_SCOPE)
|
set(${HDRS} ${${HDRS}} ${NANOPB_HDRS} PARENT_SCOPE)
|
||||||
|
|
||||||
|
if(MSVC)
|
||||||
|
unset(CALL_PREFIX)
|
||||||
|
endif()
|
||||||
|
|
||||||
endfunction()
|
endfunction()
|
||||||
|
|
||||||
|
|
||||||
|
|||||||
@@ -1,3 +1,5 @@
|
|||||||
|
syntax = "proto2";
|
||||||
|
|
||||||
enum CpuFamily {
|
enum CpuFamily {
|
||||||
CPU_UNKNOWN = 0x0;
|
CPU_UNKNOWN = 0x0;
|
||||||
CPU_X86 = 0x1;
|
CPU_X86 = 0x1;
|
||||||
|
|||||||
@@ -1,3 +1,5 @@
|
|||||||
|
syntax = "proto2";
|
||||||
|
|
||||||
message LoginCryptoDiffieHellmanChallenge {
|
message LoginCryptoDiffieHellmanChallenge {
|
||||||
required bytes gs = 0xa;
|
required bytes gs = 0xa;
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -1,3 +1,5 @@
|
|||||||
|
syntax = "proto2";
|
||||||
|
|
||||||
message Header {
|
message Header {
|
||||||
optional string uri = 0x01;
|
optional string uri = 0x01;
|
||||||
optional string method = 0x03;
|
optional string method = 0x03;
|
||||||
|
|||||||
@@ -1,3 +1,5 @@
|
|||||||
|
syntax = "proto2";
|
||||||
|
|
||||||
enum MessageType {
|
enum MessageType {
|
||||||
kMessageTypeHello = 0x1;
|
kMessageTypeHello = 0x1;
|
||||||
kMessageTypeGoodbye = 0x2;
|
kMessageTypeGoodbye = 0x2;
|
||||||
|
|||||||
Reference in New Issue
Block a user