Compare commits
No commits in common. "861351192801fd09997e46085b72101941f2d312" and "41d0fc02c307b86d33e7d6d587c6a396ac90c739" have entirely different histories.
8613511928
...
41d0fc02c3
74
.github/workflows/ci.yml
vendored
74
.github/workflows/ci.yml
vendored
@ -1,74 +0,0 @@
|
|||||||
name: ContinuousIntegration
|
|
||||||
|
|
||||||
on:
|
|
||||||
push:
|
|
||||||
branches: [ master ]
|
|
||||||
pull_request:
|
|
||||||
branches: [ master ]
|
|
||||||
|
|
||||||
env:
|
|
||||||
BUILD_TYPE: Debug
|
|
||||||
|
|
||||||
jobs:
|
|
||||||
linux:
|
|
||||||
timeout-minutes: 10
|
|
||||||
|
|
||||||
runs-on: ubuntu-latest
|
|
||||||
|
|
||||||
steps:
|
|
||||||
- uses: actions/checkout@v3
|
|
||||||
with:
|
|
||||||
submodules: recursive
|
|
||||||
|
|
||||||
- name: Install Dependencies
|
|
||||||
run: sudo apt update && sudo apt -y install libsodium-dev
|
|
||||||
|
|
||||||
- name: Configure CMake
|
|
||||||
run: cmake -B ${{github.workspace}}/build -DCMAKE_BUILD_TYPE=${{env.BUILD_TYPE}}
|
|
||||||
|
|
||||||
- name: Build
|
|
||||||
run: cmake --build ${{github.workspace}}/build --config ${{env.BUILD_TYPE}} -j 4
|
|
||||||
|
|
||||||
macos:
|
|
||||||
timeout-minutes: 10
|
|
||||||
|
|
||||||
runs-on: macos-latest
|
|
||||||
|
|
||||||
steps:
|
|
||||||
- uses: actions/checkout@v3
|
|
||||||
with:
|
|
||||||
submodules: recursive
|
|
||||||
|
|
||||||
- name: Install Dependencies
|
|
||||||
run: brew install libsodium
|
|
||||||
|
|
||||||
- name: Configure CMake
|
|
||||||
run: cmake -B ${{github.workspace}}/build -DCMAKE_BUILD_TYPE=${{env.BUILD_TYPE}}
|
|
||||||
|
|
||||||
- name: Build
|
|
||||||
run: cmake --build ${{github.workspace}}/build --config ${{env.BUILD_TYPE}} -j 4
|
|
||||||
|
|
||||||
windows:
|
|
||||||
timeout-minutes: 10
|
|
||||||
|
|
||||||
runs-on: windows-latest
|
|
||||||
|
|
||||||
steps:
|
|
||||||
- uses: actions/checkout@v3
|
|
||||||
with:
|
|
||||||
submodules: recursive
|
|
||||||
|
|
||||||
- name: Install Dependencies
|
|
||||||
run: vcpkg install libsodium:x64-windows-static pthreads:x64-windows-static
|
|
||||||
|
|
||||||
# setup vs env
|
|
||||||
- uses: ilammy/msvc-dev-cmd@v1
|
|
||||||
with:
|
|
||||||
arch: amd64
|
|
||||||
|
|
||||||
- name: Configure CMake
|
|
||||||
run: cmake -G Ninja -B ${{github.workspace}}/build -DCMAKE_BUILD_TYPE=${{env.BUILD_TYPE}} -DCMAKE_TOOLCHAIN_FILE=C:/vcpkg/scripts/buildsystems/vcpkg.cmake -DVCPKG_TARGET_TRIPLET=x64-windows-static
|
|
||||||
|
|
||||||
- name: Build
|
|
||||||
run: cmake --build ${{github.workspace}}/build --config ${{env.BUILD_TYPE}} -j 4
|
|
||||||
|
|
2
external/solanaceae_plugin
vendored
2
external/solanaceae_plugin
vendored
@ -1 +1 @@
|
|||||||
Subproject commit e4be699c66a172bbd68ded25d81fcb65fabfad99
|
Subproject commit 614f14eb0a5af0324cc7940a8550f7572c54033d
|
2
external/solanaceae_toxcore
vendored
2
external/solanaceae_toxcore
vendored
@ -1 +1 @@
|
|||||||
Subproject commit d57ac74f5a0660983ed9752d333b2ca603f8de2a
|
Subproject commit cd48e27028479d1ce589257ad80660dbdf53200a
|
2
external/solanaceae_util
vendored
2
external/solanaceae_util
vendored
@ -1 +1 @@
|
|||||||
Subproject commit dc6d86c0c3aca120327b3515ada71aff710a7ee5
|
Subproject commit 6f2bc75bfa5e24ccedc9f94581dc9edccb6448f3
|
13
external/toxcore/CMakeLists.txt
vendored
13
external/toxcore/CMakeLists.txt
vendored
@ -160,12 +160,7 @@ target_compile_definitions(toxcore PUBLIC MIN_LOGGER_LEVEL=LOGGER_LEVEL_INFO)
|
|||||||
find_package(unofficial-sodium CONFIG QUIET)
|
find_package(unofficial-sodium CONFIG QUIET)
|
||||||
find_package(sodium QUIET)
|
find_package(sodium QUIET)
|
||||||
if(unofficial-sodium_FOUND) # vcpkg
|
if(unofficial-sodium_FOUND) # vcpkg
|
||||||
if(TARGET unofficial-sodium::sodium)
|
target_link_libraries(toxcore unofficial-sodium::sodium unofficial-sodium::sodium_config_public)
|
||||||
target_link_libraries(toxcore unofficial-sodium::sodium)
|
|
||||||
endif()
|
|
||||||
if(TARGET unofficial-sodium::sodium_config_public)
|
|
||||||
target_link_libraries(toxcore unofficial-sodium::sodium_config_public)
|
|
||||||
endif()
|
|
||||||
elseif(sodium_FOUND)
|
elseif(sodium_FOUND)
|
||||||
target_link_libraries(toxcore sodium)
|
target_link_libraries(toxcore sodium)
|
||||||
else()
|
else()
|
||||||
@ -176,14 +171,8 @@ if(WIN32)
|
|||||||
target_link_libraries(toxcore ws2_32 iphlpapi)
|
target_link_libraries(toxcore ws2_32 iphlpapi)
|
||||||
endif()
|
endif()
|
||||||
|
|
||||||
find_package(pthreads QUIET)
|
|
||||||
if(TARGET PThreads4W::PThreads4W)
|
|
||||||
target_link_libraries(toxcore PThreads4W::PThreads4W)
|
|
||||||
else()
|
|
||||||
set(THREADS_PREFER_PTHREAD_FLAG ON)
|
|
||||||
find_package(Threads REQUIRED)
|
find_package(Threads REQUIRED)
|
||||||
target_link_libraries(toxcore Threads::Threads)
|
target_link_libraries(toxcore Threads::Threads)
|
||||||
endif()
|
|
||||||
|
|
||||||
add_executable(DHT_Bootstrap EXCLUDE_FROM_ALL
|
add_executable(DHT_Bootstrap EXCLUDE_FROM_ALL
|
||||||
${TOX_DIR}other/DHT_bootstrap.c
|
${TOX_DIR}other/DHT_bootstrap.c
|
||||||
|
@ -1,22 +1,2 @@
|
|||||||
cmake_minimum_required(VERSION 3.9 FATAL_ERROR)
|
cmake_minimum_required(VERSION 3.9 FATAL_ERROR)
|
||||||
|
|
||||||
add_executable(tomato
|
|
||||||
main.cpp
|
|
||||||
)
|
|
||||||
|
|
||||||
target_compile_features(tomato PUBLIC cxx_std_17)
|
|
||||||
target_link_libraries(tomato PUBLIC
|
|
||||||
solanaceae_util
|
|
||||||
solanaceae_contact
|
|
||||||
solanaceae_message3
|
|
||||||
|
|
||||||
#solanaceae_plugin
|
|
||||||
|
|
||||||
solanaceae_toxcore
|
|
||||||
solanaceae_tox_contacts
|
|
||||||
solanaceae_tox_messages
|
|
||||||
|
|
||||||
#imgui
|
|
||||||
#imgui_backend_opengl3
|
|
||||||
)
|
|
||||||
|
|
||||||
|
@ -1,6 +0,0 @@
|
|||||||
|
|
||||||
int main(int argc, char** argv) {
|
|
||||||
|
|
||||||
return 0;
|
|
||||||
}
|
|
||||||
|
|
Loading…
Reference in New Issue
Block a user