diff --git a/lib/micropython/gen-qstr.sh b/lib/micropython/gen-qstr.sh index 78ecf851363be7946005203330b18402bfd3aed5..a22683352e11ceb1d0199712f3a6e2847b88f60f 100755 --- a/lib/micropython/gen-qstr.sh +++ b/lib/micropython/gen-qstr.sh @@ -11,9 +11,8 @@ shift 5 OUTPUT_DIR="$(dirname "$OUTPUT")" - # call gcc -E to generate qstr.i.last -gcc -E -DNO_QSTR -I"$SOURCE_DIR/micropython" -I"$PROJECT_SRC" -I"$OUTPUT_DIR" "$@" >"$OUTPUT_DIR/qstr.i.last" +gcc -E -DNO_QSTR -I"$SOURCE_DIR/micropython" -I"$PROJECT_SRC" -I"$PROJECT_SRC/../epicardium" -I"$OUTPUT_DIR" "$@" >"$OUTPUT_DIR/qstr.i.last" # Remove previous artifacts rm -rf "$OUTPUT_DIR/qstr" @@ -30,7 +29,7 @@ rm -rf "$OUTPUT_DIR/qstr" # the official make file. Seriously. cat "$SOURCE_DIR/micropython/py/qstrdefs.h" "$CUSTOM_QSTR" "$OUTPUT_DIR/qstrdefs.collected.h" \ | sed 's/^Q(.*)/"&"/' \ - | gcc -E -DNO_QSTR -I"$SOURCE_DIR/micropython" -I"$PROJECT_SRC" -I"$OUTPUT_DIR" - \ + | gcc -E -DNO_QSTR -I"$SOURCE_DIR/micropython" -I"$PROJECT_SRC" -I"$PROJECT_SRC/../epicardium" -I"$OUTPUT_DIR" - \ | sed 's/^\"\(Q(.*)\)\"/\1/' \ >"$OUTPUT_DIR/qstrdefs.preprocessed.h" diff --git a/pycardium/meson.build b/pycardium/meson.build index aa637280ad625f1b482f654f5c4f293fcfe33668..3007f7b0d2855813c15fc327e1eca1d329bc28d3 100644 --- a/pycardium/meson.build +++ b/pycardium/meson.build @@ -79,7 +79,7 @@ upy = static_library( micropython_additional_sources, micropython_extmod_sources, mp_headers, - include_directories: micropython_includes, + include_directories: [micropython_includes, include_directories('../epicardium')], c_args: '-w', ) diff --git a/pycardium/mpconfigport.h b/pycardium/mpconfigport.h index 359bf799e937e2d738019db898c3c33f0bd178f2..831b8360fdd25ed9a22fd6618d6aa55ec28a701c 100644 --- a/pycardium/mpconfigport.h +++ b/pycardium/mpconfigport.h @@ -1,6 +1,4 @@ -// TODO: we need this define, but the header is not found... -//#include "epicardium/epicardium.h" -#define EPIC_INT_NUM 9 +#include "epicardium.h" /* Hardware Name */ #define MICROPY_HW_BOARD_NAME "card10"