From 2c6b8c94ad14d9ebc64be5fa6ea63daa9936e2c1 Mon Sep 17 00:00:00 2001
From: heck <heck@pep.foundation>
Date: Mon, 20 Jun 2022 20:48:29 +0200
Subject: [PATCH] Build: add new dependencies

---
 Makefile.conf | 56 ++++++++++++++++++++++++++++++++++++++++++---------
 src/Makefile  |  3 +--
 2 files changed, 48 insertions(+), 11 deletions(-)

diff --git a/Makefile.conf b/Makefile.conf
index adf9ca8..a287d9d 100644
--- a/Makefile.conf
+++ b/Makefile.conf
@@ -16,11 +16,25 @@ PREFIX=$(HOME)
 YML2_PATH=$(PREFIX)/src/yml2
 YML2_PROC=$(YML2_PATH)/yml2proc $(YML2_OPTS)
 YML2_OPTS=--encoding=utf8
+
 ENGINE_LIB_PATH=$(PREFIX)/lib
 ENGINE_INC_PATH=$(PREFIX)/include
+
 AD_LIB_PATH=$(PREFIX)/lib
 AD_INC_PATH=$(PREFIX)/include
 
+BOOST_INCLUDE?=$(PREFIX)/include
+BOOST_LIB?=$(PREFIX)/lib
+
+CRYPTOPP_INCLUDE?=$(PREFIX)/include
+CRYPTOPP_LIB?=$(PREFIX)/lib
+
+OPENSSL_INCLUDE?=$(HOME)/include
+OPENSSL_LIB?=$(HOME)/lib
+
+LIBZ_INCLUDE?=$(HOME)/include
+LIBZ_LIB?=$(HOME)/lib
+
 
 ### Guessing JAVA_HOME
 ifeq ($(PLATFORM),linux)
@@ -37,12 +51,6 @@ else
     $(info Optional build config not found: $(HERE)local.conf)
 endif
 
-### Apply config
-ENGINE_LIB=-L$(ENGINE_LIB_PATH)
-ENGINE_INC=-I$(ENGINE_INC_PATH)
-AD_LIB=-L$(AD_LIB_PATH)
-AD_INC=-I$(AD_INC_PATH)
-
 ifndef JAVA_HOME
     $(error JAVA_HOME is not set!)
 endif
@@ -61,9 +69,39 @@ endif
 JAVA_BIN_DIR=$(JAVA_HOME)/bin
 
 ######### C and C++ #########
-CXXFLAGS+=-O0 -std=c++11 -fpermissive -fPIC -I$(JAVA_HOME)/include -I$(JAVA_HOME)/include/$(PLATFORM) $(AD_INC) $(ENGINE_INC)
-LDFLAGS+=-shared $(ENGINE_LIB) $(AD_LIB)
-LDLIBS=-lstdc++ -lpEpEngine -lpEpAdapter
+CXXFLAGS+=-O0 -std=c++17 -fpermissive -fPIC
+INCLUDES+=-I$(JAVA_HOME)/include
+INCLUDES+=-I$(JAVA_HOME)/include/$(PLATFORM)
+INCLUDES+=-I$(AD_INC_PATH)
+INCLUDES+=-I$(ENGINE_INC_PATH)
+INCLUDES+=-I$(BOOST_INCLUDE)
+INCLUDES+=-I$(CRYPTOPP_INCLUDE)
+INCLUDES+=-I$(OPENSSL_INCLUDE)
+INCLUDES+=-I$(LIBZ_INCLUDE)
+CXXFLAGS+=$(INCLUDES)
+
+LDFLAGS+=-shared
+LIBS+=-L$(ENGINE_LIB_PATH)
+LIBS+=-L$(AD_LIB_PATH)
+LIBS+=-L$(BOOST_LIB)
+LIBS+=-L$(CRYPTOPP_LIB)
+LIBS+=-L$(OPENSSL_LIB)
+LIBS+=-L$(LIBZ_LIB)
+LIBS+=-lstdc++
+LIBS+=-lpEpEngine
+LIBS+=-lpEpAdapter
+LIBS+=-lsignedpkg
+LIBS+=-ldownloadclient
+LIBS+=-larchive
+LIBS+=-lboost_regex
+LIBS+=-lboost_iostreams
+LIBS+=-lboost_system
+LIBS+=-lz
+LIBS+=-lcryptopp
+LIBS+=-lcrypto
+LIBS+=-lssl
+LDFLAGS+=$(LIBS)
+
 ifneq (,$(findstring g++,$(CXX)))
     CXXFLAGS+=-fdiagnostics-color=always
 else ifneq (,$(findstring clang,$(CXX)))
diff --git a/src/Makefile b/src/Makefile
index e651e5f..2311fde 100644
--- a/src/Makefile
+++ b/src/Makefile
@@ -41,7 +41,6 @@ $(info AD_INC_PATH:     $(AD_INC_PATH))
 $(info YML2_PATH:       $(YML2_PATH))
 $(info CXXFLAGS:        $(CXXFLAGS))
 $(info LDFLAGS:         $(LDFLAGS))
-$(info LDLIBS:          $(LDLIBS))
 $(info ---------------------------------------------------)
 
 # Dirs
@@ -122,7 +121,7 @@ $(LIB_JAVA): compile-java
 	$(JAVA_BIN_DIR)/jar cf $@ -C $(JAVA_BUILD_ROOT) foundation
 
 $(LIB_CXX_DYN): compile-cxx
-	$(CXX) $(OBJ_DIR)*.o $(LDFLAGS) $(LDLIBS) -o $@
+	$(CXX) $(OBJ_DIR)*.o $(LDFLAGS) -o $@
 
 $(LIB_CXX_STATIC): compile-cxx
 	$(AR) -r $@ $(OBJ_DIR)*.o