Adapted example ports to moved IPv4/IPv6 header files
This commit is contained in:
goldsimon
parent
878b4dbc52
commit
cf40c6315f
|
|
@ -34,8 +34,7 @@ LWIPDIR=$(CODEDIR)/src
|
|||
|
||||
LDFLAGS:=$(LDFLAGS) -lcheck
|
||||
CFLAGS:=$(CFLAGS) -DLWIP_UNIX_EMPTY_ASSERT -I/usr/include/check -I$(LWIPDIR)/../test/unit \
|
||||
-I$(LWIPDIR)/include -I$(LWIPDIR)/include/ipv4 \
|
||||
-I$(LWIPDIR)/include/ipv6 -Iunix/include -I. -I../include
|
||||
-I$(LWIPDIR)/include -Iunix/include -I. -I../include
|
||||
|
||||
COREFILES=$(LWIPDIR)/core/mem.c $(LWIPDIR)/core/memp.c $(LWIPDIR)/core/netif.c \
|
||||
$(LWIPDIR)/core/pbuf.c $(LWIPDIR)/core/raw.c \
|
||||
|
|
|
|||
|
|
@ -46,8 +46,7 @@ CFLAGS=-g -Wall -DIPv4 -DLWIP_DEBUG -fPIC -pedantic -Werror \
|
|||
-Wredundant-decls -Wnested-externs -Wno-address
|
||||
|
||||
CFLAGS:=$(CFLAGS) \
|
||||
-I$(LWIPDIR)/include -I$(LWIPARCH)/include -I$(LWIPDIR)/include/ipv4 \
|
||||
-I$(LWIPDIR)/include/ipv6 -I$(LWIPDIR) -I.
|
||||
-I$(LWIPDIR)/include -I$(LWIPARCH)/include -I$(LWIPDIR) -I.
|
||||
|
||||
# COREFILES, CORE4FILES: The minimum set of files needed for lwIP.
|
||||
COREFILES=$(LWIPDIR)/core/def.c $(LWIPDIR)/core/dhcp.c $(LWIPDIR)/core/dns.c \
|
||||
|
|
|
|||
|
|
@ -50,8 +50,8 @@ LWIPARCH=$(CONTRIBDIR)/ports/unix
|
|||
LWIPDIR=$(CONTRIBDIR)/../lwip/src
|
||||
|
||||
CFLAGS:=$(CFLAGS) \
|
||||
-I$(LWIPDIR)/include -I$(LWIPARCH)/include -I$(LWIPDIR)/include/ipv4 \
|
||||
-I$(LWIPDIR)/include/ipv6 -I. -I$(CONTRIBDIR)/apps/snmp_private_mib \
|
||||
-I$(LWIPDIR)/include -I$(LWIPARCH)/include \
|
||||
-I. -I$(CONTRIBDIR)/apps/snmp_private_mib \
|
||||
-I$(CONTRIBDIR)/apps/tcpecho_raw
|
||||
|
||||
# COREFILES, CORE4FILES: The minimum set of files needed for lwIP.
|
||||
|
|
|
|||
|
|
@ -57,8 +57,7 @@ LWIPDIR=$(CONTRIBDIR)/../lwip/src
|
|||
CFLAGS:=$(CFLAGS) \
|
||||
-I. -I$(CONTRIBDIR)/apps/httpserver_raw -I$(CONTRIBDIR)/apps/shell \
|
||||
-I$(CONTRIBDIR)/apps/tcpecho -I$(CONTRIBDIR)/apps/udpecho \
|
||||
-I$(LWIPDIR)/include -I$(LWIPARCH)/include -I$(LWIPDIR)/include/ipv4 \
|
||||
-I$(LWIPDIR)/include/ipv6 -I$(LWIPDIR)
|
||||
-I$(LWIPDIR)/include -I$(LWIPARCH)/include -I$(LWIPDIR)
|
||||
|
||||
# COREFILES, CORE4FILES: The minimum set of files needed for lwIP.
|
||||
COREFILES=$(LWIPDIR)/core/def.c $(LWIPDIR)/core/dhcp.c $(LWIPDIR)/core/dns.c \
|
||||
|
|
|
|||
|
|
@ -774,86 +774,6 @@
|
|||
<Filter
|
||||
Name="include"
|
||||
>
|
||||
<Filter
|
||||
Name="ipv4"
|
||||
>
|
||||
<Filter
|
||||
Name="lwip"
|
||||
>
|
||||
<File
|
||||
RelativePath="$(LWIP_DIR)\src\include\ipv4\lwip\autoip.h"
|
||||
>
|
||||
</File>
|
||||
<File
|
||||
RelativePath="$(LWIP_DIR)\src\include\ipv4\lwip\icmp.h"
|
||||
>
|
||||
</File>
|
||||
<File
|
||||
RelativePath="$(LWIP_DIR)\src\include\ipv4\lwip\igmp.h"
|
||||
>
|
||||
</File>
|
||||
<File
|
||||
RelativePath="$(LWIP_DIR)\src\include\ipv4\lwip\inet.h"
|
||||
>
|
||||
</File>
|
||||
<File
|
||||
RelativePath="$(LWIP_DIR)\src\include\ipv4\lwip\ip4.h"
|
||||
>
|
||||
</File>
|
||||
<File
|
||||
RelativePath="$(LWIP_DIR)\src\include\ipv4\lwip\ip4_addr.h"
|
||||
>
|
||||
</File>
|
||||
<File
|
||||
RelativePath="$(LWIP_DIR)\src\include\ipv4\lwip\ip_frag.h"
|
||||
>
|
||||
</File>
|
||||
</Filter>
|
||||
</Filter>
|
||||
<Filter
|
||||
Name="ipv6"
|
||||
>
|
||||
<Filter
|
||||
Name="lwip"
|
||||
>
|
||||
<File
|
||||
RelativePath="$(LWIP_DIR)\src\include\ipv6\lwip\dhcp6.h"
|
||||
>
|
||||
</File>
|
||||
<File
|
||||
RelativePath="$(LWIP_DIR)\src\include\ipv6\lwip\ethip6.h"
|
||||
>
|
||||
</File>
|
||||
<File
|
||||
RelativePath="$(LWIP_DIR)\src\include\ipv6\lwip\icmp6.h"
|
||||
>
|
||||
</File>
|
||||
<File
|
||||
RelativePath="$(LWIP_DIR)\src\include\ipv6\lwip\inet6.h"
|
||||
>
|
||||
</File>
|
||||
<File
|
||||
RelativePath="$(LWIP_DIR)\src\include\ipv6\lwip\ip6.h"
|
||||
>
|
||||
</File>
|
||||
<File
|
||||
RelativePath="$(LWIP_DIR)\src\include\ipv6\lwip\ip6_addr.h"
|
||||
>
|
||||
</File>
|
||||
<File
|
||||
RelativePath="$(LWIP_DIR)\src\include\ipv6\lwip\ip6_frag.h"
|
||||
>
|
||||
</File>
|
||||
<File
|
||||
RelativePath="$(LWIP_DIR)\src\include\ipv6\lwip\mld6.h"
|
||||
>
|
||||
</File>
|
||||
<File
|
||||
RelativePath="$(LWIP_DIR)\src\include\ipv6\lwip\nd6.h"
|
||||
>
|
||||
</File>
|
||||
</Filter>
|
||||
</Filter>
|
||||
<Filter
|
||||
Name="lwip"
|
||||
>
|
||||
|
|
@ -869,6 +789,10 @@
|
|||
RelativePath="$(LWIP_DIR)\src\include\lwip\arch.h"
|
||||
>
|
||||
</File>
|
||||
<File
|
||||
RelativePath="$(LWIP_DIR)\src\include\lwip\autoip.h"
|
||||
>
|
||||
</File>
|
||||
<File
|
||||
RelativePath="$(LWIP_DIR)\src\include\lwip\debug.h"
|
||||
>
|
||||
|
|
@ -881,6 +805,10 @@
|
|||
RelativePath="$(LWIP_DIR)\src\include\lwip\dhcp.h"
|
||||
>
|
||||
</File>
|
||||
<File
|
||||
RelativePath="$(LWIP_DIR)\src\include\lwip\dhcp6.h"
|
||||
>
|
||||
</File>
|
||||
<File
|
||||
RelativePath="$(LWIP_DIR)\src\include\lwip\dns.h"
|
||||
>
|
||||
|
|
@ -889,6 +817,30 @@
|
|||
RelativePath="$(LWIP_DIR)\src\include\lwip\err.h"
|
||||
>
|
||||
</File>
|
||||
<File
|
||||
RelativePath="$(LWIP_DIR)\src\include\lwip\ethip6.h"
|
||||
>
|
||||
</File>
|
||||
<File
|
||||
RelativePath="$(LWIP_DIR)\src\include\lwip\icmp.h"
|
||||
>
|
||||
</File>
|
||||
<File
|
||||
RelativePath="$(LWIP_DIR)\src\include\lwip\icmp6.h"
|
||||
>
|
||||
</File>
|
||||
<File
|
||||
RelativePath="$(LWIP_DIR)\src\include\lwip\igmp.h"
|
||||
>
|
||||
</File>
|
||||
<File
|
||||
RelativePath="$(LWIP_DIR)\src\include\lwip\inet.h"
|
||||
>
|
||||
</File>
|
||||
<File
|
||||
RelativePath="$(LWIP_DIR)\src\include\lwip\inet6.h"
|
||||
>
|
||||
</File>
|
||||
<File
|
||||
RelativePath="$(LWIP_DIR)\src\include\lwip\inet_chksum.h"
|
||||
>
|
||||
|
|
@ -901,10 +853,30 @@
|
|||
RelativePath="$(LWIP_DIR)\src\include\lwip\ip.h"
|
||||
>
|
||||
</File>
|
||||
<File
|
||||
RelativePath="$(LWIP_DIR)\src\include\lwip\ip4.h"
|
||||
>
|
||||
</File>
|
||||
<File
|
||||
RelativePath="$(LWIP_DIR)\src\include\lwip\ip4_addr.h"
|
||||
>
|
||||
</File>
|
||||
<File
|
||||
RelativePath="$(LWIP_DIR)\src\include\lwip\ip6.h"
|
||||
>
|
||||
</File>
|
||||
<File
|
||||
RelativePath="$(LWIP_DIR)\src\include\lwip\ip6_addr.h"
|
||||
>
|
||||
</File>
|
||||
<File
|
||||
RelativePath="$(LWIP_DIR)\src\include\lwip\ip_addr.h"
|
||||
>
|
||||
</File>
|
||||
<File
|
||||
RelativePath="$(LWIP_DIR)\src\include\lwip\ip_frag.h"
|
||||
>
|
||||
</File>
|
||||
<File
|
||||
RelativePath="$(LWIP_DIR)\src\include\lwip\mem.h"
|
||||
>
|
||||
|
|
@ -917,6 +889,14 @@
|
|||
RelativePath="$(LWIP_DIR)\src\include\lwip\memp_std.h"
|
||||
>
|
||||
</File>
|
||||
<File
|
||||
RelativePath="$(LWIP_DIR)\src\include\lwip\mld6.h"
|
||||
>
|
||||
</File>
|
||||
<File
|
||||
RelativePath="$(LWIP_DIR)\src\include\lwip\nd6.h"
|
||||
>
|
||||
</File>
|
||||
<File
|
||||
RelativePath="$(LWIP_DIR)\src\include\lwip\netbuf.h"
|
||||
>
|
||||
|
|
@ -1005,37 +985,21 @@
|
|||
<Filter
|
||||
Name="netif"
|
||||
>
|
||||
<File
|
||||
RelativePath="$(LWIP_DIR)\src\include\netif\etharp.h"
|
||||
>
|
||||
</File>
|
||||
<File
|
||||
RelativePath="$(LWIP_DIR)\src\include\netif\slipif.h"
|
||||
>
|
||||
</File>
|
||||
<Filter
|
||||
Name="ppp"
|
||||
>
|
||||
<Filter
|
||||
Name="polarssl"
|
||||
>
|
||||
<File
|
||||
RelativePath="$(LWIP_DIR)\src\include\netif\ppp\polarssl\des.h"
|
||||
>
|
||||
</File>
|
||||
<File
|
||||
RelativePath="$(LWIP_DIR)\src\include\netif\ppp\polarssl\md4.h"
|
||||
>
|
||||
</File>
|
||||
<File
|
||||
RelativePath="$(LWIP_DIR)\src\include\netif\ppp\polarssl\md5.h"
|
||||
>
|
||||
</File>
|
||||
<File
|
||||
RelativePath="$(LWIP_DIR)\src\include\netif\ppp\polarssl\sha1.h"
|
||||
>
|
||||
</File>
|
||||
</Filter>
|
||||
<File
|
||||
RelativePath="$(LWIP_DIR)\src\include\netif\ppp\ccp.h"
|
||||
>
|
||||
</File>
|
||||
<File
|
||||
RelativePath="$(LWIP_DIR)\src\include\netif\ppp\chap_ms.h"
|
||||
>
|
||||
</File>
|
||||
<File
|
||||
RelativePath="$(LWIP_DIR)\src\include\netif\ppp\chap-md5.h"
|
||||
>
|
||||
|
|
@ -1044,6 +1008,10 @@
|
|||
RelativePath="$(LWIP_DIR)\src\include\netif\ppp\chap-new.h"
|
||||
>
|
||||
</File>
|
||||
<File
|
||||
RelativePath="$(LWIP_DIR)\src\include\netif\ppp\chap_ms.h"
|
||||
>
|
||||
</File>
|
||||
<File
|
||||
RelativePath="$(LWIP_DIR)\src\include\netif\ppp\eap.h"
|
||||
>
|
||||
|
|
@ -1108,19 +1076,35 @@
|
|||
RelativePath="$(LWIP_DIR)\src\include\netif\ppp\vj.h"
|
||||
>
|
||||
</File>
|
||||
<Filter
|
||||
Name="polarssl"
|
||||
>
|
||||
<File
|
||||
RelativePath="$(LWIP_DIR)\src\include\netif\ppp\polarssl\des.h"
|
||||
>
|
||||
</File>
|
||||
<File
|
||||
RelativePath="$(LWIP_DIR)\src\include\netif\ppp\polarssl\md4.h"
|
||||
>
|
||||
</File>
|
||||
<File
|
||||
RelativePath="$(LWIP_DIR)\src\include\netif\ppp\polarssl\md5.h"
|
||||
>
|
||||
</File>
|
||||
<File
|
||||
RelativePath="$(LWIP_DIR)\src\include\netif\ppp\polarssl\sha1.h"
|
||||
>
|
||||
</File>
|
||||
</Filter>
|
||||
</Filter>
|
||||
<File
|
||||
RelativePath="$(LWIP_DIR)\src\include\netif\etharp.h"
|
||||
>
|
||||
</File>
|
||||
<File
|
||||
RelativePath="$(LWIP_DIR)\src\include\netif\slipif.h"
|
||||
>
|
||||
</File>
|
||||
</Filter>
|
||||
<Filter
|
||||
Name="posix"
|
||||
>
|
||||
<File
|
||||
RelativePath="$(LWIP_DIR)\src\include\posix\netdb.h"
|
||||
>
|
||||
</File>
|
||||
<Filter
|
||||
Name="sys"
|
||||
>
|
||||
|
|
@ -1129,10 +1113,6 @@
|
|||
>
|
||||
</File>
|
||||
</Filter>
|
||||
<File
|
||||
RelativePath="$(LWIP_DIR)\src\include\posix\netdb.h"
|
||||
>
|
||||
</File>
|
||||
</Filter>
|
||||
</Filter>
|
||||
<Filter
|
||||
|
|
@ -1185,26 +1165,6 @@
|
|||
<Filter
|
||||
Name="ppp"
|
||||
>
|
||||
<Filter
|
||||
Name="polarssl"
|
||||
>
|
||||
<File
|
||||
RelativePath="$(LWIP_DIR)\src\netif\ppp\polarssl\des.c"
|
||||
>
|
||||
</File>
|
||||
<File
|
||||
RelativePath="$(LWIP_DIR)\src\netif\ppp\polarssl\md4.c"
|
||||
>
|
||||
</File>
|
||||
<File
|
||||
RelativePath="$(LWIP_DIR)\src\netif\ppp\polarssl\md5.c"
|
||||
>
|
||||
</File>
|
||||
<File
|
||||
RelativePath="$(LWIP_DIR)\src\netif\ppp\polarssl\sha1.c"
|
||||
>
|
||||
</File>
|
||||
</Filter>
|
||||
<File
|
||||
RelativePath="$(LWIP_DIR)\src\netif\ppp\auth.c"
|
||||
>
|
||||
|
|
@ -1213,10 +1173,6 @@
|
|||
RelativePath="$(LWIP_DIR)\src\netif\ppp\ccp.c"
|
||||
>
|
||||
</File>
|
||||
<File
|
||||
RelativePath="$(LWIP_DIR)\src\netif\ppp\chap_ms.c"
|
||||
>
|
||||
</File>
|
||||
<File
|
||||
RelativePath="$(LWIP_DIR)\src\netif\ppp\chap-md5.c"
|
||||
>
|
||||
|
|
@ -1225,6 +1181,10 @@
|
|||
RelativePath="$(LWIP_DIR)\src\netif\ppp\chap-new.c"
|
||||
>
|
||||
</File>
|
||||
<File
|
||||
RelativePath="$(LWIP_DIR)\src\netif\ppp\chap_ms.c"
|
||||
>
|
||||
</File>
|
||||
<File
|
||||
RelativePath="$(LWIP_DIR)\src\netif\ppp\demand.c"
|
||||
>
|
||||
|
|
@ -1293,6 +1253,26 @@
|
|||
RelativePath="$(LWIP_DIR)\src\netif\ppp\vj.c"
|
||||
>
|
||||
</File>
|
||||
<Filter
|
||||
Name="polarssl"
|
||||
>
|
||||
<File
|
||||
RelativePath="$(LWIP_DIR)\src\netif\ppp\polarssl\des.c"
|
||||
>
|
||||
</File>
|
||||
<File
|
||||
RelativePath="$(LWIP_DIR)\src\netif\ppp\polarssl\md4.c"
|
||||
>
|
||||
</File>
|
||||
<File
|
||||
RelativePath="$(LWIP_DIR)\src\netif\ppp\polarssl\md5.c"
|
||||
>
|
||||
</File>
|
||||
<File
|
||||
RelativePath="$(LWIP_DIR)\src\netif\ppp\polarssl\sha1.c"
|
||||
>
|
||||
</File>
|
||||
</Filter>
|
||||
</Filter>
|
||||
</Filter>
|
||||
</Filter>
|
||||
|
|
|
|||
Loading…
Reference in New Issue