diff --git a/pio-tools/add_c_flags.py b/pio-tools/add_c_flags.py index 0c39e777f..1ce5d5936 100644 --- a/pio-tools/add_c_flags.py +++ b/pio-tools/add_c_flags.py @@ -1,4 +1,7 @@ Import("env") +# General options that are passed to the C++ compiler +env.Append(CXXFLAGS=["-Wno-volatile"]) + # General options that are passed to the C compiler (C only; not C++). -env.Append(CFLAGS=["-Wno-discarded-qualifiers", "-Wno-implicit-function-declaration"]) +env.Append(CFLAGS=["-Wno-discarded-qualifiers", "-Wno-implicit-function-declaration", "-Wno-incompatible-pointer-types"]) diff --git a/pio-tools/add_c_flags_ard3.py b/pio-tools/add_c_flags_ard3.py deleted file mode 100644 index 3c9acc66a..000000000 --- a/pio-tools/add_c_flags_ard3.py +++ /dev/null @@ -1,7 +0,0 @@ -Import("env") - -# General options that are passed to the C++ compiler -env.Append(CXXFLAGS=["-Wno-volatile"]) - -# General options that are passed to the C compiler (C only; not C++). -env.Append(CFLAGS=["-Wno-incompatible-pointer-types"]) diff --git a/platformio_tasmota32.ini b/platformio_tasmota32.ini index 2729b35dc..ff7b3fca6 100644 --- a/platformio_tasmota32.ini +++ b/platformio_tasmota32.ini @@ -81,8 +81,7 @@ lib_ignore = ${esp32_defaults.lib_ignore} [core32_30_flags] build_unflags = ${core32_30.build_unflags} build_flags = ${core32_30.build_flags} -extra_scripts = pre:pio-tools/add_c_flags_ard3.py - ${esp32_defaults.extra_scripts} +extra_scripts = ${esp32_defaults.extra_scripts} lib_extra_dirs = lib/lib_ssl, lib/lib_basic, lib/lib_i2c, lib/lib_div, lib/lib_audio, lib/lib_display, lib/lib_rf, lib/libesp32, lib/libesp32_div, lib/libesp32_lvgl lib_ignore = HTTPUpdateServer