Skip to content

Commit c4f37b2

Browse files
Lwip build fixes (earlephilhower#1011)
Only build lwip acd.c if it exists (after 2.1.3) Some mdns files only exist in 2.2.x Fixes earlephilhower#1009
1 parent 6f1fc56 commit c4f37b2

File tree

1 file changed

+15
-3
lines changed

1 file changed

+15
-3
lines changed

src/rp2_common/pico_lwip/CMakeLists.txt

Lines changed: 15 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -53,7 +53,6 @@ if (EXISTS ${PICO_LWIP_PATH}/${LWIP_TEST_PATH})
5353

5454
add_library(pico_lwip_core4 INTERFACE)
5555
target_sources(pico_lwip_core4 INTERFACE
56-
${PICO_LWIP_PATH}/src/core/ipv4/acd.c
5756
${PICO_LWIP_PATH}/src/core/ipv4/autoip.c
5857
${PICO_LWIP_PATH}/src/core/ipv4/dhcp.c
5958
${PICO_LWIP_PATH}/src/core/ipv4/etharp.c
@@ -64,6 +63,13 @@ if (EXISTS ${PICO_LWIP_PATH}/${LWIP_TEST_PATH})
6463
${PICO_LWIP_PATH}/src/core/ipv4/ip4_addr.c
6564
)
6665

66+
# Doesn't exists in version earlier than 2.1.3
67+
if (EXISTS ${PICO_LWIP_PATH}/src/core/ipv4/acd.c)
68+
target_sources(pico_lwip_core4 INTERFACE
69+
${PICO_LWIP_PATH}/src/core/ipv4/acd.c
70+
)
71+
endif()
72+
6773
add_library(pico_lwip_core6 INTERFACE)
6874
target_sources(pico_lwip_core6 INTERFACE
6975
${PICO_LWIP_PATH}/src/core/ipv6/dhcp6.c
@@ -207,10 +213,16 @@ if (EXISTS ${PICO_LWIP_PATH}/${LWIP_TEST_PATH})
207213
add_library(pico_lwip_mdns INTERFACE)
208214
target_sources(pico_lwip_mdns INTERFACE
209215
${PICO_LWIP_PATH}/src/apps/mdns/mdns.c
210-
${PICO_LWIP_PATH}/src/apps/mdns/mdns_out.c
211-
${PICO_LWIP_PATH}/src/apps/mdns/mdns_domain.c
212216
)
213217

218+
# Old versions of lwip had everything in mdns.c
219+
if (EXISTS ${PICO_LWIP_PATH}/src/apps/mdns/mdns_out.c)
220+
target_sources(pico_lwip_mdns INTERFACE
221+
${PICO_LWIP_PATH}/src/apps/mdns/mdns_out.c
222+
${PICO_LWIP_PATH}/src/apps/mdns/mdns_domain.c
223+
)
224+
endif()
225+
214226
# NetBIOS name server
215227
add_library(pico_lwip_netbios INTERFACE)
216228
target_sources(pico_lwip_netbios INTERFACE

0 commit comments

Comments
 (0)