eh?

norrbotten · Sep 27, 2020 · 03958eb · 03958eb
2 parents e3d2fef + 17cfd13
commit 03958eb
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 3 deletions.
diff --git 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
@@ -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 ../../..