Clean build and cmake files

cnadler86 · cnadler86 · commit df652a044dfe · 2024-09-19T21:45:04.000+02:00
diff --git a/README.md b/README.md
@@ -7,8 +7,7 @@ The API is stable, but it might change without previous anounce.
 To build the project, follow the following instructions:
 - [ESP-IDF](https://docs.espressif.com/projects/esp-idf/en/v5.2.2/esp32/get-started/index.html): I used version 5.2.2, but it might work with other versions.
 - Clone the micropython repo and this repo in a folder, e.g. "MyESPCam". I used the actual micropython master branch (between v1.23 and before 1.24).
-- You will have to add the ESP32-Camera driver (I used v2.0.11). Here are 3 posibilities:
-    Clone the https://github.com/espressif/esp32-camera repository inside the ~/esp-idf/components folder, or
+- You will have to add the ESP32-Camera driver (I used v2.0.11). Here are 2 posibilities:
     Add a dependency on espressif/esp32-camera component (idf.py add-dependency "espressif/esp32-camera"), or
     Manually add a dependency in idf_component.yml of your respective port in the local micropython port folder.
 
diff --git a/src/micropython.cmake b/src/micropython.cmake
@@ -1,23 +1,10 @@
-# Create an INTERFACE library for our C module.
-add_library(usermod_esp32camera INTERFACE)
-
-# Add our source files to the lib
-target_sources(usermod_esp32camera INTERFACE
+add_library(usermod_mp_camera INTERFACE)
+target_sources(usermod_mp_camera INTERFACE
     ${CMAKE_CURRENT_LIST_DIR}/modcamera.c
     ${CMAKE_CURRENT_LIST_DIR}/modcamera_api.c
 )
-
-# Add the current directory as an include directory.
-target_include_directories(usermod_esp32camera INTERFACE
+target_include_directories(usermod_mp_camera INTERFACE
     ${CMAKE_CURRENT_LIST_DIR}
-    ${IDF_PATH}/components/esp32-camera/driver/include
-    ${IDF_PATH}/components/esp32-camera/driver/private_include
-    ${IDF_PATH}/components/esp32-camera/conversions/include
-    ${IDF_PATH}/components/esp32-camera/conversions/private_include
-    ${IDF_PATH}/components/esp32-camera/sensors/private_include
 )
-
-target_compile_definitions(usermod_esp32camera INTERFACE)
-
-# Link our INTERFACE library to the usermod target.
-target_link_libraries(usermod INTERFACE usermod_esp32camera)
+target_compile_definitions(usermod_mp_camera INTERFACE)
+target_link_libraries(usermod INTERFACE usermod_mp_camera)
diff --git a/src/micropython.mk b/src/micropython.mk
@@ -1,5 +1,3 @@
 CAMERA_MOD_DIR := $(USERMOD_DIR)
 SRC_USERMOD_C += $(addprefix $(CAMERA_MOD_DIR)/, modcamera_api.c)
 SRC_USERMOD_LIB_C += $(addprefix $(CAMERA_MOD_DIR)/, modcamera.c)
-CFLAGS_USERMOD += -I$(CAMERA_MOD_DIR) -DMODULE_CAMERA_ENABLED=1
-
