Compare commits
2 Commits
a9b27fe9b7
...
master
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
df759bc426 | ||
|
|
d0dc242b13 |
2
external/solanaceae_ngc_ft1
vendored
2
external/solanaceae_ngc_ft1
vendored
Submodule external/solanaceae_ngc_ft1 updated: 254fe9c6d5...866d64c7d8
2
external/solanaceae_util
vendored
2
external/solanaceae_util
vendored
Submodule external/solanaceae_util updated: ba3b83af24...905605ef47
15
external/toxcore/CMakeLists.txt
vendored
15
external/toxcore/CMakeLists.txt
vendored
@@ -53,16 +53,21 @@ configure_file(
|
|||||||
${CMAKE_CURRENT_BINARY_DIR}/include/tox/tox_private.h
|
${CMAKE_CURRENT_BINARY_DIR}/include/tox/tox_private.h
|
||||||
@ONLY
|
@ONLY
|
||||||
)
|
)
|
||||||
|
configure_file(
|
||||||
|
./c-toxcore/toxcore/attributes.h # for tox_private.h
|
||||||
|
${CMAKE_CURRENT_BINARY_DIR}/include/tox/attributes.h
|
||||||
|
@ONLY
|
||||||
|
)
|
||||||
configure_file(
|
configure_file(
|
||||||
./c-toxcore/toxencryptsave/toxencryptsave.h
|
./c-toxcore/toxencryptsave/toxencryptsave.h
|
||||||
${CMAKE_CURRENT_BINARY_DIR}/include/tox/toxencryptsave.h
|
${CMAKE_CURRENT_BINARY_DIR}/include/tox/toxencryptsave.h
|
||||||
@ONLY
|
@ONLY
|
||||||
)
|
)
|
||||||
#configure_file(
|
configure_file(
|
||||||
# ./c-toxcore/toxav/toxav.h
|
./c-toxcore/toxav/toxav.h
|
||||||
# ${CMAKE_CURRENT_BINARY_DIR}/include/tox/toxav.h
|
${CMAKE_CURRENT_BINARY_DIR}/include/tox/toxav.h
|
||||||
# @ONLY
|
@ONLY
|
||||||
#)
|
)
|
||||||
|
|
||||||
target_include_directories(toxcore INTERFACE ${CMAKE_CURRENT_BINARY_DIR}/include/)
|
target_include_directories(toxcore INTERFACE ${CMAKE_CURRENT_BINARY_DIR}/include/)
|
||||||
|
|
||||||
|
|||||||
2
external/toxcore/c-toxcore
vendored
2
external/toxcore/c-toxcore
vendored
Submodule external/toxcore/c-toxcore updated: e58eb27a84...4f6d4546b2
@@ -78,7 +78,7 @@ void TransferAutoAccept::checkObj(ObjectHandle o) {
|
|||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
|
||||||
const auto save_dir_path = _conf.get_string("TransferAutoAccept", "save_path").value_or("tmp_save_dir");
|
const std::string save_dir_path = _conf.get_string("TransferAutoAccept", "save_path").value_or("tmp_save_dir");
|
||||||
uint64_t total_size {0u};
|
uint64_t total_size {0u};
|
||||||
if (const auto* si = o.try_get<ObjComp::F::SingleInfo>(); si != nullptr) {
|
if (const auto* si = o.try_get<ObjComp::F::SingleInfo>(); si != nullptr) {
|
||||||
if (si->file_name.empty()) {
|
if (si->file_name.empty()) {
|
||||||
|
|||||||
Reference in New Issue
Block a user