From 312eb2d73bed816dab63a8419d8ebc35d7f72913 Mon Sep 17 00:00:00 2001 From: CryptoManiac Date: Sat, 27 Nov 2021 12:22:23 +0300 Subject: [PATCH] Push IXWebSocket reference --- .gitmodules | 3 +++ src/additional/IXWebSocket | 1 + src/additional/build.sh | 12 ++++++++++++ src/makefile.osx | 8 ++++++-- 4 files changed, 22 insertions(+), 2 deletions(-) create mode 100644 .gitmodules create mode 160000 src/additional/IXWebSocket create mode 100755 src/additional/build.sh diff --git a/.gitmodules b/.gitmodules new file mode 100644 index 0000000..60d8a04 --- /dev/null +++ b/.gitmodules @@ -0,0 +1,3 @@ +[submodule "src/additional/IXWebSocket"] + path = src/additional/IXWebSocket + url = https://github.com/machinezone/IXWebSocket diff --git a/src/additional/IXWebSocket b/src/additional/IXWebSocket new file mode 160000 index 0000000..42db05a --- /dev/null +++ b/src/additional/IXWebSocket @@ -0,0 +1 @@ +Subproject commit 42db05a38b9c01f9cec16f39f2ce675a3522c68d diff --git a/src/additional/build.sh b/src/additional/build.sh new file mode 100755 index 0000000..67fbf41 --- /dev/null +++ b/src/additional/build.sh @@ -0,0 +1,12 @@ +#!/bin/bash + +ROOT=$(pwd) + +git submodule update --init --recursive +mkdir $ROOT/IXWebSocket/build +cd $ROOT/IXWebSocket/build +cmake -DCMAKE_INSTALL_PREFIX:PATH=/ .. +make -j 4 +make DESTDIR=$ROOT/stage install +cd $ROOT + diff --git a/src/makefile.osx b/src/makefile.osx index e0a00c8..fd6f226 100644 --- a/src/makefile.osx +++ b/src/makefile.osx @@ -14,11 +14,13 @@ INCLUDEPATHS= \ -I"$(CURDIR)" \ -I"$(CURDIR)"/obj \ -I"$(DEPSDIR)/include" \ - -I"$(DEPSDIR)/include/db48" + -I"$(DEPSDIR)/include/db48" \ + -I"$(CURDIR)/additional/stage/usr/include" LIBPATHS= \ -L"$(DEPSDIR)/lib" \ - -L"$(DEPSDIR)/lib/db48" + -L"$(DEPSDIR)/lib/db48" \ + -L"$(CURDIR)/additional/stage/usr/lib" USE_LEVELDB:=0 USE_IPV6:=1 @@ -35,6 +37,7 @@ LIBS += \ $(DEPSDIR)/lib/libboost_thread-mt.a \ $(DEPSDIR)/lib/libssl.a \ $(DEPSDIR)/lib/libcrypto.a \ + $(CURDIR)/additional/stage/usr/lib/libixwebsocket.a \ -lz else LIBS += \ @@ -45,6 +48,7 @@ LIBS += \ -lboost_thread-mt \ -lssl \ -lcrypto \ + -lixwebsocket \ -lz endif -- 1.7.1