From 20857cb8c51c5e82d8a7ebc0e1b18ba2fe62840d Mon Sep 17 00:00:00 2001 From: BodgeMaster <> Date: Sun, 18 Jun 2023 07:53:35 +0200 Subject: [PATCH] build system (setup_project): Comment out seemingly useless workarounds --- scripts/setup_project.sh | 18 ++++++++++-------- 1 file changed, 10 insertions(+), 8 deletions(-) diff --git a/scripts/setup_project.sh b/scripts/setup_project.sh index c0058ec..e9f3380 100755 --- a/scripts/setup_project.sh +++ b/scripts/setup_project.sh @@ -95,16 +95,18 @@ pushd dependencies/sockpp-0.8.1/ >/dev/null 2>&1 if uname -s | tr [:upper:] [:lower:] | grep cygwin >/dev/null; then echo "Adding Cygwin workaound for building sockpp." - for FILE in "$(find ./ -type f)"; do - sed -i -e 's/_WIN32/PLEASE_DO_NOT_DEFINE_THIS_MACRO/g' $FILE - done - mv ./include/sockpp/socket.h ./include/sockpp/socket.h_original - echo '#include - #include "socket.h_original"' > ./include/sockpp/socket.h + #for FILE in "$(find ./ -type f)"; do + # sed -i -e 's/_WIN32/PLEASE_DO_NOT_DEFINE_THIS_MACRO/g' $FILE + #done + #mv ./include/sockpp/socket.h ./include/sockpp/socket.h_original + #echo '#include + ##include "socket.h_original"' > ./include/sockpp/socket.h sed -i -e 's/SO_REUSEPORT/SO_REUSEADDR/g' ./src/acceptor.cpp - CFLAGS="-D_XOPEN_SOURCE=700" CXXFLAGS="-D_XOPEN_SOURCE=700" cmake -Bbuild - CFLAGS="-D_XOPEN_SOURCE=700" CXXFLAGS="-D_XOPEN_SOURCE=700" cmake --build build + #CFLAGS="-D_XOPEN_SOURCE=700" CXXFLAGS="-D_XOPEN_SOURCE=700" cmake -Bbuild + #CFLAGS="-D_XOPEN_SOURCE=700" CXXFLAGS="-D_XOPEN_SOURCE=700" cmake --build build + cmake -Bbuild . + cmake --build build else cmake -Bbuild . cmake --build build