From 675071341d474d6689bef4d8f368eea082ab68c1 Mon Sep 17 00:00:00 2001 From: gnublin Date: Tue, 15 Jan 2019 23:08:45 +0100 Subject: [PATCH] gnublin --- tools/make/c_configure.sh | 10 ++++++++++ tools/make/cpp.make | 2 +- 2 files changed, 11 insertions(+), 1 deletion(-) diff --git a/tools/make/c_configure.sh b/tools/make/c_configure.sh index 011d048..9f21ef1 100755 --- a/tools/make/c_configure.sh +++ b/tools/make/c_configure.sh @@ -66,9 +66,19 @@ function add_library { # parameter: # $1: main directory # $2: library name (without l or lib ) +# $3: library path (optional) src=$(pwd) echo "EXTLIB += -l$2" >> $1/make.pre + if [ -n "$3" ] + then + lib_path=$3 + if [ ${lib_path:0:1} != "/" ] + then + lib_path="$src/$lib_path" + fi + echo "LDFLAGS += -L$lib_path" >> $1/make.pre + fi } function append_library { diff --git a/tools/make/cpp.make b/tools/make/cpp.make index 183afe4..52f5409 100644 --- a/tools/make/cpp.make +++ b/tools/make/cpp.make @@ -19,5 +19,5 @@ clean: ar r $(TARGET) *.o %.so: $(SOURCE:%.cpp=%.o) $(LDLIBS) - $(CXX) -shared -o $(TARGET) *.o $(LDLIBS) $(EXTLIB) + $(CXX) -shared -o $(TARGET) *.o $(LDFLAGS) $(LDLIBS) $(EXTLIB) -include make.post -- 2.20.1