diff --git a/.mingw-cross.cmake b/.mingw-cross.cmake deleted file mode 100644 index 9e60626..0000000 --- a/.mingw-cross.cmake +++ /dev/null @@ -1,11 +0,0 @@ -set(CMAKE_SYSTEM_NAME Windows) -set(WIN32 true) -set(UNIX false) - -set(CMAKE_C_COMPILER x86_64-w64-mingw32-gcc) -set(CMAKE_CXX_COMPILER x86_64-w64-mingw32-g++) - -set(CMAKE_FIND_ROOT_PATH /usr/x86_64-w64-mingw32) -set(CMAKE_FIND_ROOT_PATH_MODE_PROGRAM NEVER) -set(CMAKE_FIND_ROOT_PATH_MODE_LIBRARY ONLY) -set(CMAKE_FIND_ROOT_PATH_MODE_INCLUDE ONLY) diff --git a/scripts/setup_project.sh b/scripts/setup_project.sh index 7bc5116..7e8645a 100755 --- a/scripts/setup_project.sh +++ b/scripts/setup_project.sh @@ -93,12 +93,22 @@ echo "done" echo ">>> Building sockpp... " pushd dependencies/sockpp-0.7.1/ >/dev/null 2>&1 if uname -s | tr [:upper:] [:lower:] | grep cygwin >/dev/null; then - echo "Adding cygwin workaound for building sockpp." - cmake -Bbuild -DCMAKE_TOOLCHAIN_FILE=$PROJECT_BASE_DIR/.mingw-cross.cmake -DSOCKPP_BUILD_SHARED=ON -DSOCKPP_BUILD_STATIC=OFF + 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 + 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 else cmake -Bbuild . + cmake --build build fi -cmake --build build popd >/dev/null 2>&1 echo ">>> Cleaning up..."