Add new 3rdparty build scripts
diff --git a/library/CMakeLists.txt b/library/CMakeLists.txt
index 009fb3e..a6eb1ed 100644
--- a/library/CMakeLists.txt
+++ b/library/CMakeLists.txt
@@ -74,6 +74,7 @@
threading.c
timing.c
xtea.c
+ ${src_thirdparty}
)
# For files generated by the parent project (Mbed TLS) when building Mbed
@@ -94,15 +95,6 @@
)
endif()
-set(src_everest
- ../3rdparty/everest/library/everest.c
- ../3rdparty/everest/library/Hacl_Curve25519.c
- ../3rdparty/everest/library/x25519.c
- ../3rdparty/everest/library/kremlib/fstar_uint128.c
- ../3rdparty/everest/library/kremlib/FStar_UInt64_FStar_UInt32_FStar_UInt16_FStar_UInt8.c
-)
-
-set(src_crypto ${src_crypto} ${src_everest})
if(CMAKE_COMPILER_IS_GNUCC)
set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -Wmissing-declarations -Wmissing-prototypes")
endif(CMAKE_COMPILER_IS_GNUCC)
diff --git a/library/Makefile b/library/Makefile
index ee9ca38..31c9208 100644
--- a/library/Makefile
+++ b/library/Makefile
@@ -19,9 +19,6 @@
# To compile on Plan9:
# CFLAGS += -D_BSD_EXTENSION
-# Include directories for Everest code
-LOCAL_CFLAGS+=-I../3rdparty/everest/include -I../3rdparty/everest/include/everest -I../3rdparty/everest/include/everest/kremlib
-
# if were running on Windows build for Windows
ifdef WINDOWS
WINDOWS_BUILD=1
@@ -104,11 +101,9 @@
OBJS_CRYPTO += version_features.o
endif
-OBJS_CRYPTO+= \
- ../3rdparty/everest/library/everest.o \
- ../3rdparty/everest/library/Hacl_Curve25519.o \
- ../3rdparty/everest/library/x25519.o \
- ../3rdparty/everest/library/kremlib/FStar_UInt64_FStar_UInt32_FStar_UInt16_FStar_UInt8.o
+include ../3rdparty/Makefile.inc
+LOCAL_CFLAGS+=$(THIRDPARTY_INCLUDES)
+OBJS_CRYPTO+=$(THIRDPARTY_OBJECTS)
.SILENT:
@@ -163,4 +158,3 @@
if exist libmbed* del /Q /F libmbed*
if exist $(OBJS_CRYPTO) del /Q /F $(OBJS_CRYPTO)
endif
-