Look in include dir too for config files like funconfig.h etc.

Community-PIO-CH32V · Feb 9, 2025 · 349fa5a · 349fa5a
1 parent 8af7925
commit 349fa5a
Show file tree

Hide file tree

Showing 5 changed files with 11 additions and 6 deletions.
diff --git a/builder/frameworks/ch32v003fun.py b/builder/frameworks/ch32v003fun.py
@@ -23,8 +23,9 @@
     CPPPATH=[
         join(FRAMEWORK_DIR, "ch32v003fun"),
         join(FRAMEWORK_DIR, "extralibs"),
-        # user will likely have the funconfig.h located in the main source directory, so include it for the build too
-        "$PROJECT_SRC_DIR"
+        # user will likely have the funconfig.h located in the src/ or include/ directory, so include it for the build too
+        "$PROJECT_SRC_DIR",
+        "$PROJECT_INCLUDE_DIR"
     ],
     CPPDEFINES=[
         # not yet used for anything, just identification

diff --git a/builder/frameworks/freertos.py b/builder/frameworks/freertos.py
@@ -32,7 +32,8 @@
         join(FRAMEWORK_DIR, freertos_subseries, "portable", "MemMang"),
         join(FRAMEWORK_DIR, freertos_subseries),
         # user will likely have the FreeRTOSConfig.h located in the main source directory, so include it for the build too
-        "$PROJECT_SRC_DIR"
+        "$PROJECT_SRC_DIR",
+        "$PROJECT_INCLUDE_DIR"
     ],
     CPPDEFINES=[
         # the startup.S file needs very nifty different code if FreeRTOS is running

diff --git a/builder/frameworks/harmony_liteos.py b/builder/frameworks/harmony_liteos.py
@@ -35,7 +35,8 @@
         join(FRAMEWORK_DIR, liteos_subseries, "third_party", "bounds_checking_function", "include"),
         join(FRAMEWORK_DIR, liteos_subseries, "third_party", "bounds_checking_function", "src"),
         # user will likely have the target_config.h located in the main source directory, so include it for the build too
-        "$PROJECT_SRC_DIR"
+        "$PROJECT_SRC_DIR",
+        "$PROJECT_INCLUDE_DIR"
     ],
     CPPDEFINES=[
         # the startup.S file needs very nifty different code if Harmony LiteOS is running

diff --git a/builder/frameworks/rt_thread.py b/builder/frameworks/rt_thread.py
@@ -34,7 +34,8 @@
         join(FRAMEWORK_DIR, rtthread_subseries, "components", "finsh"),
         # ch32v_it.h is mandatory for RT-Thread to build, this will likely be included
         # in the user's directory.
-        "$PROJECT_SRC_DIR"
+        "$PROJECT_SRC_DIR",
+        "$PROJECT_INCLUDE_DIR"
     ],
     CPPDEFINES=[
         # the startup.S file needs very nifty different code if Harmony LiteOS is running

diff --git a/builder/frameworks/tencent_os.py b/builder/frameworks/tencent_os.py
@@ -34,7 +34,8 @@
         join(FRAMEWORK_DIR, tencent_subseries, "TOS_CONFIG"),
         # ch32v_it.h is mandatory for TencentOS to build, this will likely be included
         # in the user's directory.
-        "$PROJECT_SRC_DIR"
+        "$PROJECT_SRC_DIR",
+        "$PROJECT_INCLUDE_DIR"
     ],
     CPPDEFINES=[
         # the startup.S file needs very nifty different code if Harmony LiteOS is running