--- a/Makefile +++ b/Makefile @@ -1,13 +1,13 @@ FLAGS = -DLOW_VERSION="\"$(LOW_VERSION)\"" C = gcc -CFLAGS = $(FLAGS) -Isrc -Iapp -Ideps/duktape/src-low -Ideps/mbedtls/include -Ideps/mbedtls/crypto/include +CFLAGS = $(FLAGS) -Isrc -Iapp -Ideps/duktape/src-low CXX = g++ -CXXFLAGS = $(FLAGS) -Isrc -Iapp -Ideps/duktape/src-low -Ideps/mbedtls/include -Ideps/mbedtls/crypto/include -Ideps/open62541/build/src_generated -Ideps/open62541/include -Ideps/open62541/arch -Ideps/open62541/plugins/include -Ideps/open62541/src/client -Ideps/open62541/deps -Ideps/open62541/src --std=c++11 +CXXFLAGS = $(FLAGS) -Isrc -Iapp -Ideps/duktape/src-low -Ideps/open62541/build/src_generated -Ideps/open62541/include -Ideps/open62541/arch -Ideps/open62541/plugins/include -Ideps/open62541/src/client -Ideps/open62541/deps -Ideps/open62541/src --std=c++11 LD = g++ -LDFLAGS = $(FLAGS) -lm -ldl -lpthread -lcares deps/open62541/build/bin/libopen62541.a +LDFLAGS = $(FLAGS) -lm -ldl -lpthread -lcares -lmbedcrypto -lmbedtls -lmbedx509 deps/open62541/build/bin/libopen62541.a OBJECTS_LOW = \ app/main.o \ @@ -50,12 +50,11 @@ clean: rm -rf */*.o */*.d bin/* deps/duktape/src-low lib lib_js/build node_modules util/dukc test/duk_crash - cd deps/mbedtls && make clean cd deps/open62541 && rm -rf build -bin/low: $(OBJECTS) $(OBJECTS_LOW) deps/mbedtls/programs/test/benchmark +bin/low: $(OBJECTS) $(OBJECTS_LOW) mkdir -p bin - $(LD) -o bin/low deps/mbedtls/library/*.o deps/mbedtls/crypto/library/*.o $(OBJECTS) $(OBJECTS_LOW) $(LDFLAGS) + $(LD) -o bin/low $(OBJECTS) $(OBJECTS_LOW) $(LDFLAGS) util/dukc: deps/duktape/src-low/duktape.o util/dukc.o $(LD) -o util/dukc deps/duktape/src-low/duktape.o util/dukc.o $(LDFLAGS) @@ -109,9 +108,6 @@ -DDUK_USE_SYMBOL_BUILTIN \ -DDUK_USE_SECTION_B \ -DDUK_USE_CPP_EXCEPTIONS - -deps/mbedtls/programs/test/benchmark: - cd deps/mbedtls && make deps/open62541/build/bin/libopen62541.a: cd deps/open62541 && rm -rf build && mkdir build