From 17cfd137c996b2adb05d4ef75a999e44a49232b8 Mon Sep 17 00:00:00 2001 From: norrbotten Date: Sat, 26 Sep 2020 23:03:21 +0200 Subject: [PATCH] apparently the build was bork --- premake5.lua | 1 + setup_linux.sh | 7 ++++--- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/premake5.lua b/premake5.lua index 7268b0f..0cb3f50 100644 --- a/premake5.lua +++ b/premake5.lua @@ -29,6 +29,7 @@ end function includeIXWebSockets() links { "ixwebsocket:static", "z:static", "ssl:static", "crypto:static", "pthread", "dl" } + includedirs { "ext/ixwebsocket" } libdirs { "ext/zlib", "ext/ixwebsocket/build", "ext/openssl" } end diff --git a/setup_linux.sh b/setup_linux.sh index 6b98051..6401422 100755 --- a/setup_linux.sh +++ b/setup_linux.sh @@ -38,9 +38,10 @@ fi mkdir build && cd build -cmake .. -DUSE_TLS=1 -DCMAKE_CXX_FLAGS=-m32 +cmake .. -DOPENSSL_ROOT_DIR=../openssl/ -DZLIB_LIBRARY=../zlib/ -DZLIB_INCLUDE_DIR=../zlib/ -DUSE_TLS=1 -DCMAKE_CXX_FLAGS=-m32 -export LD_LIBRARY_PATH=$DIR/dependencies/zlib${LD_LIBRARY_PATH:+:$LD_LIBRARY_PATH} -make -j +export LD_LIBRARY_PATH=$DIR/ext/zlib:${LD_LIBRARY_PATH:+:$LD_LIBRARY_PATH} +export CPLUS_INCLUDE_PATH=$DIR/ext/zlib:$DIR/ext/openssl:${CPLUS_INCLUDE_PATH:+:$CPLUS_INCLUDE_PATH} +CPPFLAGS="-I../../zlib/ -I../../openssl/" make -j cd ../../..