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:
2
external/solanaceae_object_store
vendored
2
external/solanaceae_object_store
vendored
Submodule external/solanaceae_object_store updated: 241a0c0906...2d5478c19e
2
external/solanaceae_tox
vendored
2
external/solanaceae_tox
vendored
Submodule external/solanaceae_tox updated: c327d9d4dd...4e75bd64ae
2
external/solanaceae_toxcore
vendored
2
external/solanaceae_toxcore
vendored
Submodule external/solanaceae_toxcore updated: ebd6bcc483...9b735e3a2e
10
external/toxcore/CMakeLists.txt
vendored
10
external/toxcore/CMakeLists.txt
vendored
@ -28,6 +28,16 @@ else()
|
||||
endif()
|
||||
|
||||
# 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(
|
||||
./c-toxcore/toxcore/tox.h
|
||||
${CMAKE_CURRENT_BINARY_DIR}/include/tox/tox.h
|
||||
|
@ -85,7 +85,7 @@ class ChatGui4 : public ObjectStoreEventI {
|
||||
|
||||
void renderContactList(void);
|
||||
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);
|
||||
|
||||
|
Reference in New Issue
Block a user