Merge pull request #81 from qurious-pixel/patch-1
Header conflict fix (network.h)
This commit is contained in:
commit
117076fd71
2
.github/workflows/docker.sh
vendored
2
.github/workflows/docker.sh
vendored
@ -14,6 +14,8 @@ find . -name "CMakeLists.txt" ! -path "*/externals/*" -exec sed -i 's/^.*-Werror
|
|||||||
find . -name "CMakeLists.txt" ! -path "*/externals/*" -exec sed -i 's/^.*-Werror=.*$/ /g' {} +
|
find . -name "CMakeLists.txt" ! -path "*/externals/*" -exec sed -i 's/^.*-Werror=.*$/ /g' {} +
|
||||||
find . -name "CMakeLists.txt" ! -path "*/externals/*" -exec sed -i 's/-Werror/-W/g' {} +
|
find . -name "CMakeLists.txt" ! -path "*/externals/*" -exec sed -i 's/-Werror/-W/g' {} +
|
||||||
|
|
||||||
|
if [ -e src/core/network/network.h ]; then mv src/core/network/network.h src/core/network/network.h_ ; fi
|
||||||
|
|
||||||
# Add cache if does not exist
|
# Add cache if does not exist
|
||||||
if [[ ! -e ~/.ccache ]]; then
|
if [[ ! -e ~/.ccache ]]; then
|
||||||
mkdir ~/.ccache
|
mkdir ~/.ccache
|
||||||
|
Loading…
Reference in New Issue
Block a user