Add new 3rdparty build scripts

This commit is contained in:
Christoph M. Wintersteiger 2018-12-14 13:07:50 +00:00 committed by Janos Follath
parent 2e724a18a1
commit 62dddd08fd
7 changed files with 28 additions and 18 deletions

6
3rdparty/CMakeLists.txt vendored Executable file
View File

@ -0,0 +1,6 @@
add_subdirectory(everest)
set(src_thirdparty
${src_everest}
PARENT_SCOPE
)

1
3rdparty/Makefile.inc vendored Executable file
View File

@ -0,0 +1 @@
include ../3rdparty/everest/Makefile.inc

9
3rdparty/everest/CMakeLists.txt vendored Executable file
View File

@ -0,0 +1,9 @@
include_directories(include include/everest include/everest/kremlib)
set(src_everest
${CMAKE_CURRENT_SOURCE_DIR}/library/everest.c
${CMAKE_CURRENT_SOURCE_DIR}/library/Hacl_Curve25519.c
${CMAKE_CURRENT_SOURCE_DIR}/library/x25519.c
${CMAKE_CURRENT_SOURCE_DIR}/library/kremlib/FStar_UInt64_FStar_UInt32_FStar_UInt16_FStar_UInt8.c
PARENT_SCOPE
)

7
3rdparty/everest/Makefile.inc vendored Executable file
View File

@ -0,0 +1,7 @@
THIRDPARTY_INCLUDES+=-I../3rdparty/everest/include -I../3rdparty/everest/include/everest -I../3rdparty/everest/include/everest/kremlib
THIRDPARTY_OBJECTS+= \
../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

View File

@ -179,6 +179,7 @@ endif()
include_directories(include/ 3rdparty/everest/include/ 3rdparty/everest/include/everest/ 3rdparty/everest/include/everest/kremlin/ 3rdparty/everest/include/everest/kremlib/)
include_directories(library/)
add_subdirectory(3rdparty)
add_subdirectory(library)
add_subdirectory(include)

View File

@ -74,6 +74,7 @@ set(src_crypto
threading.c
timing.c
xtea.c
${src_thirdparty}
)
# For files generated by the parent project (Mbed TLS) when building Mbed
@ -94,15 +95,6 @@ set(src_crypto
)
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)

View File

@ -19,9 +19,6 @@ endif
# 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.o
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 @@ else
if exist libmbed* del /Q /F libmbed*
if exist $(OBJS_CRYPTO) del /Q /F $(OBJS_CRYPTO)
endif