abc/lwip
1
0
Fork 0
mirror of https://git.savannah.nongnu.org/git/lwip.git synced 2025-08-09 07:54:38 +08:00
Code Issues Packages Projects Releases Wiki Activity

Work on fixing the build (integration of contrib)

Browse Source
This commit is contained in:
Dirk Ziegelmeier 2018-10-02 12:34:26 +02:00
parent ac46e42aa2
commit 0244dc714b
7 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
contrib/ports/CMakeCommon.cmake
View File

@ -1,5 +1,5 @@
# ARM mbedtls support https://tls.mbed.org/ # ARM mbedtls support https://tls.mbed.org/
set(MBEDTLSDIR ${LWIP_CONTRIB_DIR}/../mbedtls) set(MBEDTLSDIR ${LWIP_DIR}/../mbedtls)
if(EXISTS ${MBEDTLSDIR}/CMakeLists.txt) if(EXISTS ${MBEDTLSDIR}/CMakeLists.txt)
set(LWIP_HAVE_MBEDTLS ON BOOL) set(LWIP_HAVE_MBEDTLS ON BOOL)

4
contrib/ports/Common.allports.mk
View File

@ -56,7 +56,7 @@ ARFLAGS?=rs
#Set this to where you have the lwip core module checked out from git #Set this to where you have the lwip core module checked out from git
#default assumes it's a dir named lwip at the same level as the contrib module #default assumes it's a dir named lwip at the same level as the contrib module
LWIPDIR?=$(CONTRIBDIR)/../lwip/src LWIPDIR?=$(CONTRIBDIR)/..
CFLAGS+=-I. \ CFLAGS+=-I. \
-I$(CONTRIBDIR) \ -I$(CONTRIBDIR) \
@ -64,7 +64,7 @@ CFLAGS+=-I. \
-I$(LWIPARCH)/include -I$(LWIPARCH)/include
# Add include path and link to mbedTLS lib if available # Add include path and link to mbedTLS lib if available
MBEDTLSDIR?=$(CONTRIBDIR)/../mbedtls MBEDTLSDIR?=$(LWIPDIR)/../mbedtls
ifneq (,$(wildcard $(MBEDTLSDIR)/include/mbedtls/*.h)) ifneq (,$(wildcard $(MBEDTLSDIR)/include/mbedtls/*.h))
LDFLAGS+=-L$(MBEDTLSDIR)/library -lmbedtls -lmbedcrypto -lmbedx509 LDFLAGS+=-L$(MBEDTLSDIR)/library -lmbedtls -lmbedcrypto -lmbedx509
CFLAGS+=-I$(MBEDTLSDIR)/include -Wno-redundant-decls -DLWIP_HAVE_MBEDTLS=1 -Wno-c90-c99-compat CFLAGS+=-I$(MBEDTLSDIR)/include -Wno-redundant-decls -DLWIP_HAVE_MBEDTLS=1 -Wno-c90-c99-compat

2
contrib/ports/unix/check/CMakeLists.txt
View File

@ -7,7 +7,7 @@ if (NOT CMAKE_SYSTEM_NAME STREQUAL Linux AND NOT CMAKE_SYSTEM_NAME STREQUAL Darw
endif() endif()
set(LWIP_CONTRIB_DIR ${CMAKE_CURRENT_SOURCE_DIR}/../../..) set(LWIP_CONTRIB_DIR ${CMAKE_CURRENT_SOURCE_DIR}/../../..)
set(LWIP_DIR ${CMAKE_CURRENT_SOURCE_DIR}/../../../../lwip) set(LWIP_DIR ${LWIP_CONTRIB_DIR}/..)
set(LWIP_USE_SANITIZERS true) set(LWIP_USE_SANITIZERS true)
include(${LWIP_CONTRIB_DIR}/ports/CMakeCommon.cmake) include(${LWIP_CONTRIB_DIR}/ports/CMakeCommon.cmake)

2
contrib/ports/unix/example_app/CMakeLists.txt
View File

@ -5,7 +5,7 @@ project(example_app C)
set (CMAKE_EXPORT_COMPILE_COMMANDS ON) set (CMAKE_EXPORT_COMPILE_COMMANDS ON)
set(LWIP_CONTRIB_DIR ${CMAKE_CURRENT_SOURCE_DIR}/../../..) set(LWIP_CONTRIB_DIR ${CMAKE_CURRENT_SOURCE_DIR}/../../..)
set(LWIP_DIR ${CMAKE_CURRENT_SOURCE_DIR}/../../../../lwip) set(LWIP_DIR ${LWIP_DIR}/..)
include(${LWIP_CONTRIB_DIR}/ports/CMakeCommon.cmake) include(${LWIP_CONTRIB_DIR}/ports/CMakeCommon.cmake)

2
contrib/ports/unix/lib/CMakeLists.txt
View File

@ -9,7 +9,7 @@ if (NOT CMAKE_SYSTEM_NAME STREQUAL Linux AND NOT CMAKE_SYSTEM_NAME STREQUAL GNU)
endif() endif()
set(LWIP_CONTRIB_DIR ${CMAKE_CURRENT_SOURCE_DIR}/../../..) set(LWIP_CONTRIB_DIR ${CMAKE_CURRENT_SOURCE_DIR}/../../..)
set(LWIP_DIR ${CMAKE_CURRENT_SOURCE_DIR}/../../../../lwip) set(LWIP_DIR ${LWIP_CONTRIB_DIR}/..)
include(${LWIP_CONTRIB_DIR}/ports/CMakeCommon.cmake) include(${LWIP_CONTRIB_DIR}/ports/CMakeCommon.cmake)

2
contrib/ports/win32/Filelists.cmake
View File

@ -16,7 +16,7 @@ set(lwipcontribportwindows_SRCS
) )
# pcapif needs WinPcap developer package: https://www.winpcap.org/devel.htm # pcapif needs WinPcap developer package: https://www.winpcap.org/devel.htm
set(WPDPACK_DIR ${LWIP_CONTRIB_DIR}/../WpdPack) set(WPDPACK_DIR ${LWIP_DIR}/../WpdPack)
find_library(WPCAP wpcap HINTS ${WPDPACK_DIR}/lib) find_library(WPCAP wpcap HINTS ${WPDPACK_DIR}/lib)
find_library(PACKET packet HINTS ${WPDPACK_DIR}/lib) find_library(PACKET packet HINTS ${WPDPACK_DIR}/lib)

2
contrib/ports/win32/example_app/CMakeLists.txt
View File

@ -5,7 +5,7 @@ project(example_app C)
set (CMAKE_EXPORT_COMPILE_COMMANDS ON) set (CMAKE_EXPORT_COMPILE_COMMANDS ON)
set(LWIP_CONTRIB_DIR ${CMAKE_CURRENT_SOURCE_DIR}/../../..) set(LWIP_CONTRIB_DIR ${CMAKE_CURRENT_SOURCE_DIR}/../../..)
set(LWIP_DIR ${CMAKE_CURRENT_SOURCE_DIR}/../../../../lwip) set(LWIP_DIR ${LWIP_CONTRIB_DIR}/..)
include(${LWIP_CONTRIB_DIR}/ports/CMakeCommon.cmake) include(${LWIP_CONTRIB_DIR}/ports/CMakeCommon.cmake)