diff options
| author | IngHK <[email protected]> | 2023-12-08 16:44:58 +0100 |
|---|---|---|
| committer | IngHK <[email protected]> | 2023-12-08 16:44:58 +0100 |
| commit | 4d88f146e3a79ca4e7c7bbba2cdd6b8f3b07537a (patch) | |
| tree | d3e7eed808967619fd880e4425256f8e1cc6de6e /examples/device/video_capture | |
| parent | b8881a3a141530a1d383d8869881e773b8a07d80 (diff) | |
| parent | 338ff2daba63fc60835934efc374c818f7c5980c (diff) | |
Merge remote-tracking branch 'remotes/hathach/master' into HostLogsFixes
Diffstat (limited to 'examples/device/video_capture')
| -rw-r--r-- | examples/device/video_capture/Makefile | 4 | ||||
| -rw-r--r-- | examples/device/video_capture/skip.txt | 1 |
2 files changed, 3 insertions, 2 deletions
diff --git a/examples/device/video_capture/Makefile b/examples/device/video_capture/Makefile index 90d174c32..d698a848d 100644 --- a/examples/device/video_capture/Makefile +++ b/examples/device/video_capture/Makefile @@ -1,4 +1,4 @@ -include ../../make.mk +include ../../build_system/make/make.mk ifeq ($(DISABLE_MJPEG),1) CFLAGS += -DCFG_EXAMPLE_VIDEO_DISABLE_MJPEG @@ -15,4 +15,4 @@ INC += \ EXAMPLE_SOURCE += $(wildcard src/*.c) SRC_C += $(addprefix $(CURRENT_PATH)/, $(EXAMPLE_SOURCE)) -include ../../rules.mk +include ../../build_system/make/rules.mk diff --git a/examples/device/video_capture/skip.txt b/examples/device/video_capture/skip.txt index 5898664a2..db64cc639 100644 --- a/examples/device/video_capture/skip.txt +++ b/examples/device/video_capture/skip.txt @@ -1,3 +1,4 @@ mcu:MSP430x5xx mcu:NUC121 mcu:SAMD11 +family:espressif |