Skip to content

Commit 3469e82

Browse files
Merge pull request #446 from MitchBradley/FixFS
For examples/arduino_emulator, removed dependency on arduino-esp32
2 parents 88d5412 + 6c42da6 commit 3469e82

6 files changed

Lines changed: 1024 additions & 4 deletions

File tree

.github/workflows/build-arduino-emulator.yml

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,6 @@ jobs:
4242
- name: Clone AsyncTCP, Arduino FS headers, lwIP and lwIP contrib
4343
run: |
4444
git clone --depth 1 https://github.com/MitchBradley/PosixAsyncTCP .ci/asynctcp
45-
git clone --depth 1 --branch "3.3.8" https://github.com/espressif/arduino-esp32.git .ci/arduino-esp32
4645
4746
- name: Build with Arduino-Emulator
4847
run: |

examples/arduino_emulator/CMakeLists.txt

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -3,25 +3,24 @@ project(espasyncwebserver_host_compile LANGUAGES C CXX)
33

44
add_subdirectory(${CMAKE_SOURCE_DIR}/../../.ci/arduino-emulator ${CMAKE_BINARY_DIR}/arduino-emulator)
55
file(GLOB WEB_SRC "${CMAKE_SOURCE_DIR}/../../src/*.cpp")
6+
list(APPEND WEB_SRC "${CMAKE_SOURCE_DIR}/FS.cpp")
67
add_library(espasyncwebserver STATIC ${WEB_SRC})
78
add_library(test STATIC
89
${CMAKE_SOURCE_DIR}/../../.ci/asynctcp/src/AsyncTCP.cpp
9-
${CMAKE_SOURCE_DIR}/../../.ci/arduino-esp32/libraries/FS/src/FS.cpp
1010
${CMAKE_SOURCE_DIR}/../../.ci/arduino-emulator/ArduinoCore-Linux/cores/arduino/libb64/cencode.c
1111
)
1212

1313
target_compile_definitions(espasyncwebserver PUBLIC HOST ARDUINO=10813)
1414
target_include_directories(espasyncwebserver PUBLIC
1515
${CMAKE_SOURCE_DIR}/../../src
1616
${CMAKE_SOURCE_DIR}/../../.ci/asynctcp/src
17-
${CMAKE_SOURCE_DIR}/../../.ci/arduino-esp32/libraries/FS/src
17+
${CMAKE_SOURCE_DIR}/.
1818
)
1919
target_link_libraries(espasyncwebserver PUBLIC arduino_emulator)
2020

2121
target_compile_definitions(test PUBLIC HOST ARDUINO=10813)
2222
target_include_directories(test PUBLIC
2323
${CMAKE_SOURCE_DIR}/../../.ci/asynctcp/src
24-
${CMAKE_SOURCE_DIR}/../../.ci/arduino-esp32/libraries/FS/src
2524
)
2625
target_link_libraries(test PUBLIC arduino_emulator)
2726

0 commit comments

Comments
 (0)