fixes for toxcore update and other stuff
Some checks are pending
ContinuousDelivery / linux-ubuntu (push) Waiting to run
ContinuousDelivery / android (map[ndk_abi:arm64-v8a vcpkg_toolkit:arm64-android]) (push) Waiting to run
ContinuousDelivery / android (map[ndk_abi:armeabi-v7a vcpkg_toolkit:arm-neon-android]) (push) Waiting to run
ContinuousDelivery / android (map[ndk_abi:x86_64 vcpkg_toolkit:x64-android]) (push) Waiting to run
ContinuousDelivery / windows (push) Waiting to run
ContinuousDelivery / windows-asan (push) Waiting to run
ContinuousDelivery / dumpsyms (push) Blocked by required conditions
ContinuousDelivery / release (push) Blocked by required conditions
ContinuousIntegration / linux (push) Waiting to run
ContinuousIntegration / android (map[ndk_abi:arm64-v8a vcpkg_toolkit:arm64-android]) (push) Waiting to run
ContinuousIntegration / android (map[ndk_abi:armeabi-v7a vcpkg_toolkit:arm-neon-android]) (push) Waiting to run
ContinuousIntegration / android (map[ndk_abi:x86_64 vcpkg_toolkit:x64-android]) (push) Waiting to run
ContinuousIntegration / macos (push) Waiting to run
ContinuousIntegration / windows (push) Waiting to run
Some checks are pending
ContinuousDelivery / linux-ubuntu (push) Waiting to run
ContinuousDelivery / android (map[ndk_abi:arm64-v8a vcpkg_toolkit:arm64-android]) (push) Waiting to run
ContinuousDelivery / android (map[ndk_abi:armeabi-v7a vcpkg_toolkit:arm-neon-android]) (push) Waiting to run
ContinuousDelivery / android (map[ndk_abi:x86_64 vcpkg_toolkit:x64-android]) (push) Waiting to run
ContinuousDelivery / windows (push) Waiting to run
ContinuousDelivery / windows-asan (push) Waiting to run
ContinuousDelivery / dumpsyms (push) Blocked by required conditions
ContinuousDelivery / release (push) Blocked by required conditions
ContinuousIntegration / linux (push) Waiting to run
ContinuousIntegration / android (map[ndk_abi:arm64-v8a vcpkg_toolkit:arm64-android]) (push) Waiting to run
ContinuousIntegration / android (map[ndk_abi:armeabi-v7a vcpkg_toolkit:arm-neon-android]) (push) Waiting to run
ContinuousIntegration / android (map[ndk_abi:x86_64 vcpkg_toolkit:x64-android]) (push) Waiting to run
ContinuousIntegration / macos (push) Waiting to run
ContinuousIntegration / windows (push) Waiting to run
This commit is contained in:
parent
a677637be6
commit
a34165d2c2
2
external/solanaceae_object_store
vendored
2
external/solanaceae_object_store
vendored
@ -1 +1 @@
|
|||||||
Subproject commit 241a0c0906f75555218a04b99259b51b0c0c25a4
|
Subproject commit 2d5478c19ec16d6bf51b0d23993ef4aa9b26dfb5
|
2
external/solanaceae_tox
vendored
2
external/solanaceae_tox
vendored
@ -1 +1 @@
|
|||||||
Subproject commit c327d9d4dda8f9f10cdcc5a78d00acbdeb12c377
|
Subproject commit 4e75bd64aedf6c252456da0ca7c30a414f0fcaaf
|
2
external/solanaceae_toxcore
vendored
2
external/solanaceae_toxcore
vendored
@ -1 +1 @@
|
|||||||
Subproject commit ebd6bcc48375e35fb02c6ec793dffd00c7731786
|
Subproject commit 9b735e3a2e2e8073241a2c0b19666c4ddcbde7e0
|
10
external/toxcore/CMakeLists.txt
vendored
10
external/toxcore/CMakeLists.txt
vendored
@ -28,6 +28,16 @@ else()
|
|||||||
endif()
|
endif()
|
||||||
|
|
||||||
# HACK: "install" api headers into binary dir
|
# HACK: "install" api headers into binary dir
|
||||||
|
configure_file(
|
||||||
|
./c-toxcore/toxcore/tox_log_level.h
|
||||||
|
${CMAKE_CURRENT_BINARY_DIR}/include/tox/tox_log_level.h
|
||||||
|
@ONLY
|
||||||
|
)
|
||||||
|
configure_file(
|
||||||
|
./c-toxcore/toxcore/tox_options.h
|
||||||
|
${CMAKE_CURRENT_BINARY_DIR}/include/tox/tox_options.h
|
||||||
|
@ONLY
|
||||||
|
)
|
||||||
configure_file(
|
configure_file(
|
||||||
./c-toxcore/toxcore/tox.h
|
./c-toxcore/toxcore/tox.h
|
||||||
${CMAKE_CURRENT_BINARY_DIR}/include/tox/tox.h
|
${CMAKE_CURRENT_BINARY_DIR}/include/tox/tox.h
|
||||||
|
@ -85,7 +85,7 @@ class ChatGui4 : public ObjectStoreEventI {
|
|||||||
|
|
||||||
void renderContactList(void);
|
void renderContactList(void);
|
||||||
bool renderContactListContactSmall(const Contact4 c, const bool selected) const;
|
bool renderContactListContactSmall(const Contact4 c, const bool selected) const;
|
||||||
//bool renderSubContactListContact(const Contact3 c, const bool selected) const;
|
//bool renderSubContactListContact(const Contact4 c, const bool selected) const;
|
||||||
|
|
||||||
void pasteFile(const char* mime_type);
|
void pasteFile(const char* mime_type);
|
||||||
|
|
||||||
|
Loading…
x
Reference in New Issue
Block a user