forked from Green-Sky/tomato
Squashed 'external/toxcore/c-toxcore/' changes from 640e6cace..e58eb27a8
e58eb27a8 fix(toxav): remove extra copy of video frame on encode Tested and works, but there might be alignment issues and other stuff. 206ea3530 refactor: Explicitly pass dependencies to constructors. 7cefa93cf fix(toxencryptsave): Wipe salt and passkey after usage. 7c3be2342 refactor: Add file/line to tox-bootstrapd logging. f84e8cdce refactor: Move loglogdata out of network.c. 390f7db06 refactor: Move random and memory OS-specifics to `os_*` files. REVERT: 640e6cace fix(toxav): remove extra copy of video frame on encode Tested and works, but there might be alignment issues and other stuff. git-subtree-dir: external/toxcore/c-toxcore git-subtree-split: e58eb27a84f9fa0cd996868e079f39e90a5c04b6
This commit is contained in:
12
.github/scripts/cmake-osx
vendored
12
.github/scripts/cmake-osx
vendored
@@ -10,6 +10,7 @@ brew update
|
||||
brew install \
|
||||
libconfig \
|
||||
libvpx \
|
||||
ninja \
|
||||
opus
|
||||
|
||||
. ".github/scripts/flags-clang.sh"
|
||||
@@ -25,7 +26,7 @@ add_flag -Werror
|
||||
add_c_flag -Wno-c11-extensions
|
||||
add_c_flag -Wno-pre-c11-compat
|
||||
|
||||
cmake -B_build -H. \
|
||||
cmake -GNinja -B_build -H. \
|
||||
-DCMAKE_C_FLAGS="$C_FLAGS" \
|
||||
-DCMAKE_CXX_FLAGS="$CXX_FLAGS" \
|
||||
-DCMAKE_EXE_LINKER_FLAGS="$LD_FLAGS" \
|
||||
@@ -38,11 +39,10 @@ cmake -B_build -H. \
|
||||
-DUSE_IPV6=OFF \
|
||||
-DAUTOTEST=ON
|
||||
|
||||
cd _build # pushd
|
||||
make "-j$NPROC" -k install
|
||||
cmake --build _build
|
||||
cmake --install _build
|
||||
|
||||
# TODO(iphydf): Investigate if we can get lan discovery to work on macos CI.
|
||||
# It works, but CI doesn't let us press the "allow broadcast" button.
|
||||
ctest -j50 --output-on-failure --rerun-failed --repeat until-pass:6 -E lan_discovery ||
|
||||
ctest -j50 --output-on-failure --rerun-failed --repeat until-pass:6 -E lan_discovery
|
||||
cd - # popd
|
||||
ctest --test-dir _build -j50 --output-on-failure --rerun-failed --repeat until-pass:6 -E lan_discovery ||
|
||||
ctest --test-dir _build -j50 --output-on-failure --rerun-failed --repeat until-pass:6 -E lan_discovery
|
||||
|
||||
Reference in New Issue
Block a user