yuzu-emu/mbedtls
1
0
Fork 0
mirror of https://github.com/yuzu-emu/mbedtls.git synced 2024-11-22 23:05:41 +01:00
Code Issues Packages Projects Releases Wiki Activity

Use 3rdparty headers from the submodule

Browse Source
This commit is contained in:
Janos Follath 2019-08-20 15:12:54 +01:00
parent c3c04b7407
commit b70ace4a5e
5 changed files with 15 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
CMakeLists.txt
View File

@ -189,7 +189,7 @@ if(ENABLE_ZLIB_SUPPORT)
endif(ZLIB_FOUND) endif(ZLIB_FOUND)
endif(ENABLE_ZLIB_SUPPORT) endif(ENABLE_ZLIB_SUPPORT)
add_subdirectory(3rdparty) add_subdirectory(crypto/3rdparty)
include_directories(${thirdparty_inc}) include_directories(${thirdparty_inc})
list(APPEND libs ${thirdparty_lib}) list(APPEND libs ${thirdparty_lib})
add_definitions(${thirdparty_def}) add_definitions(${thirdparty_def})

8
library/Makefile
View File

@ -80,9 +80,11 @@ OBJS_TLS= debug.o net_sockets.o \
ssl_srv.o ssl_ticket.o \ ssl_srv.o ssl_ticket.o \
ssl_tls.o ssl_tls.o
include ../3rdparty/Makefile.inc INCLUDING_FROM_MBEDTLS:=1
LOCAL_CFLAGS+=$(THIRDPARTY_INCLUDES) include ../crypto/3rdparty/Makefile.inc
OBJS_CRYPTO+=$(THIRDPARTY_CRYPTO_OBJECTS) LOCAL_CFLAGS += $(patsubst -I../3rdparty/%, -I../crypto/3rdparty/%, $(THIRDPARTY_INCLUDES))
OBJS_CRYPTO += $(patsubst ../3rdparty/%, ../crypto/3rdparty/%, $(THIRDPARTY_CRYPTO_OBJECTS))
.SILENT: .SILENT:

8
programs/Makefile
View File

@ -18,8 +18,10 @@ 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
include ../3rdparty/Makefile.inc INCLUDING_FROM_MBEDTLS:=1
LOCAL_CFLAGS+=$(THIRDPARTY_INCLUDES) include ../crypto/3rdparty/Makefile.inc
LOCAL_CFLAGS += $(patsubst -I../3rdparty/%, -I../crypto/3rdparty/%, $(THIRDPARTY_INCLUDES))
LOCAL_CFLAGS += $(patsubst -I../3rdparty/%, -I../crypto/3rdparty/%, $(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
@ -104,7 +106,7 @@ all: fuzz
endif endif
fuzz: fuzz:
$(MAKE) -C fuzz $(MAKE) -C fuzz THIRDPARTY_INCLUDES=$(THIRDPARTY_INCLUDES)
$(DEP): $(DEP):
$(MAKE) -C ../library $(MAKE) -C ../library

1
programs/fuzz/Makefile
View File

@ -8,6 +8,7 @@ LOCAL_LDFLAGS = -L../../library \
LOCAL_LDFLAGS += -L../../crypto/library LOCAL_LDFLAGS += -L../../crypto/library
LOCAL_CFLAGS += -I../../crypto/include LOCAL_CFLAGS += -I../../crypto/include
CRYPTO := ../../crypto/library/ CRYPTO := ../../crypto/library/
LOCAL_CFLAGS += $(patsubst -I../3rdparty/%, -I../../crypto/3rdparty/%, $(THIRDPARTY_INCLUDES))
ifndef SHARED ifndef SHARED
DEP=$(CRYPTO)libmbedcrypto.a ../../library/libmbedx509.a ../../library/libmbedtls.a DEP=$(CRYPTO)libmbedcrypto.a ../../library/libmbedx509.a ../../library/libmbedtls.a

5
tests/Makefile
View File

@ -16,8 +16,9 @@ LOCAL_LDFLAGS += -L../crypto/library
LOCAL_CFLAGS += -I../crypto/include LOCAL_CFLAGS += -I../crypto/include
CRYPTO := ../crypto/library/ CRYPTO := ../crypto/library/
include ../3rdparty/Makefile.inc INCLUDING_FROM_MBEDTLS:=1
LOCAL_CFLAGS+=$(THIRDPARTY_INCLUDES) include ../crypto/3rdparty/Makefile.inc
LOCAL_CFLAGS += $(patsubst -I../3rdparty/%, -I../crypto/3rdparty/%, $(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