yuzu-emu/mbedtls
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

3rdparty: Add additional build facilities for 3rd-party code

Browse source
This commit is contained in:
Christoph M. Wintersteiger 2019-01-21 17:26:19 +00:00 committed by Janos Follath
parent 181f284e39
commit 655ddababa
5 changed files with 12 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
CMakeLists.txt
View file

@ -181,7 +181,7 @@ else()
set(LIB_INSTALL_DIR lib) set(LIB_INSTALL_DIR lib)
endif() endif()
include_directories(include/ 3rdparty/everest/include/ 3rdparty/everest/include/everest/ 3rdparty/everest/include/everest/kremlin/ 3rdparty/everest/include/everest/kremlib/) include_directories(include/)
if(ENABLE_ZLIB_SUPPORT) if(ENABLE_ZLIB_SUPPORT)
find_package(ZLIB) find_package(ZLIB)
@ -192,6 +192,10 @@ if(ENABLE_ZLIB_SUPPORT)
endif(ENABLE_ZLIB_SUPPORT) endif(ENABLE_ZLIB_SUPPORT)
add_subdirectory(3rdparty) add_subdirectory(3rdparty)
include_directories(${thirdparty_inc})
list(APPEND libs ${thirdparty_lib})
add_definitions(${thirdparty_def})
add_subdirectory(library) add_subdirectory(library)
add_subdirectory(include) add_subdirectory(include)
add_subdirectory(crypto/library) add_subdirectory(crypto/library)

3
include/CMakeLists.txt
View file

@ -3,9 +3,8 @@ option(INSTALL_MBEDTLS_HEADERS "Install mbed TLS headers." ON)
if(INSTALL_MBEDTLS_HEADERS) if(INSTALL_MBEDTLS_HEADERS)
file(GLOB headers "mbedtls/*.h") file(GLOB headers "mbedtls/*.h")
file(GLOB headers_everest "../3rdparty/everest/include/*.h")
install(FILES ${headers} ${headers_everest} install(FILES ${headers}
DESTINATION include/mbedtls DESTINATION include/mbedtls
PERMISSIONS OWNER_READ OWNER_WRITE GROUP_READ WORLD_READ) PERMISSIONS OWNER_READ OWNER_WRITE GROUP_READ WORLD_READ)

3
library/CMakeLists.txt
View file

@ -64,9 +64,10 @@ set(src_crypto
version.c version.c
version_features.c version_features.c
xtea.c xtea.c
${src_thirdparty}
) )
list(APPEND src_crypto ${thirdparty_src})
set(src_x509 set(src_x509
certs.c certs.c
pkcs11.c pkcs11.c

3
programs/Makefile
View file

@ -18,7 +18,8 @@ LOCAL_LDFLAGS += -L../crypto/library
LOCAL_CFLAGS += -I../crypto/include LOCAL_CFLAGS += -I../crypto/include
LOCAL_CXXFLAGS += -I../crypto/include LOCAL_CXXFLAGS += -I../crypto/include
LOCAL_CFLAGS+=-I../3rdparty/everest/include include ../3rdparty/Makefile.inc
LOCAL_CFLAGS+=$(THIRDPARTY_INCLUDES)
ifndef SHARED ifndef SHARED
DEP=../crypto/library/libmbedcrypto.a ../library/libmbedx509.a ../library/libmbedtls.a DEP=../crypto/library/libmbedcrypto.a ../library/libmbedx509.a ../library/libmbedtls.a

3
tests/Makefile
View file

@ -16,7 +16,8 @@ LOCAL_LDFLAGS += -L../crypto/library
LOCAL_CFLAGS += -I../crypto/include LOCAL_CFLAGS += -I../crypto/include
CRYPTO := ../crypto/library/ CRYPTO := ../crypto/library/
LOCAL_CFLAGS+=-I../3rdparty/everest/include include ../3rdparty/Makefile.inc
LOCAL_CFLAGS+=$(THIRDPARTY_INCLUDES)
# Enable definition of various functions used throughout the testsuite # Enable definition of various functions used throughout the testsuite
# (gethostname, strdup, fileno...) even when compiling with -std=c99. Harmless # (gethostname, strdup, fileno...) even when compiling with -std=c99. Harmless