.gitignore

@@ -14,7 +14,6 @@
 # ignore endianness check
 /.endianness
 /resources/check_endianness
-/resources/check_endianness.exe
 
 # Java bytecode
 *.class

scripts/clean.sh

@@ -28,14 +28,9 @@ create_directory ./bin/lib
 create_directory ./bin/lib/net
 create_directory ./include
 
-if uname -s | tr [:upper:] [:lower:] | grep cygwin >/dev/null; then
+ln -vs ../../dependencies/sockpp-0.7.1/build/libsockpp.so bin/lib/
-    ln -vs ../../dependencies/sockpp-0.7.1/build/cygsockpp-0.dll bin/lib/libsockpp.so
+ln -vs ../../dependencies/sockpp-0.7.1/build/libsockpp.so.0 bin/lib/
-    ln -vs ../../dependencies/sockpp-0.7.1/build/cygsockpp-0.dll bin/lib/
+ln -vs ../../dependencies/sockpp-0.7.1/build/libsockpp.so.0.7.1 bin/lib/
-else
-    ln -vs ../../dependencies/sockpp-0.7.1/build/libsockpp.so bin/lib/
-    ln -vs ../../dependencies/sockpp-0.7.1/build/libsockpp.so.0 bin/lib/
-    ln -vs ../../dependencies/sockpp-0.7.1/build/libsockpp.so.0.7.1 bin/lib/
-fi
 
 ln -vs ../dependencies/sockpp-0.7.1/include/sockpp/ ./include/
 ln -vs ../dependencies/tiny-utf8-4.4.3/include/tinyutf8/ ./include/

scripts/setup_project.sh

@@ -92,23 +92,8 @@ 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
+cmake -Bbuild .
-    echo "Adding Cygwin workaound for building sockpp."
+cmake --build build
-
-    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 <sys/time.h>
-    #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
 popd >/dev/null 2>&1
 
 echo ">>> Cleaning up..."

setupenv.bashrc

@@ -15,7 +15,7 @@
 
 echo ">>> Loading shell environment for FOSS-VG development..."
 
-export PROJECT_BASE_DIR="$( cd -- "$(dirname "${BASH_SOURCE[0]}")" >/dev/null 2>&1 ; pwd -P )"
+PROJECT_BASE_DIR="$( cd -- "$(dirname "${BASH_SOURCE[0]}")" >/dev/null 2>&1 ; pwd -P )"
 echo "Project base directory is $PROJECT_BASE_DIR"
 
 if [ -f "$PROJECT_BASE_DIR/.localenv.bashrc" ]; then
@@ -43,7 +43,7 @@ echo "Added aliases and functions."
 
 export PATH="$PROJECT_BASE_DIR/bin:$PROJECT_BASE_DIR/bin/tools:$PROJECT_BASE_DIR/scripts/tools:$PATH"
 if uname -s | tr [:upper:] [:lower:] | grep cygwin >/dev/null; then
-    echo "Adding Cygwin workaound for library path."
+    echo "Adding cygwin workaound for library path."
     export PATH="$PROJECT_BASE_DIR/bin/lib:$PATH"
 fi
 echo "PATH is $PATH"