Select build system by your own platformio_override.ini file. Check example file.

.gitignore

@@ -216,3 +216,4 @@ pip-log.txt
 #Mr Developer
 .mr.developer.cfg
 src/credentials.h
+platformio_override.ini

platformio.ini

@@ -8,61 +8,45 @@
 ; Please visit documentation for the other options and examples
 ; https://docs.platformio.org/page/projectconf.html
 
-[env:uno]
+[platformio]
+default_envs = uno_linux
+extra_configs = platformio_override.ini
+
+[env]
 platform = platformio/espressif32
 board = esp32dev
 framework = arduino
-extra_scripts = pre:scripts/patch_legacy_esp32_libs.py
-build_flags =
-	-include $PROJECT_INCLUDE_DIR/ArduinoEsp32Compat.h
 monitor_speed = 115200
+lib_deps =
+    arminjo/ServoEasing
+    madhephaestus/ESP32Servo@^3.0.6
+    bblanchon/ArduinoJson@^6.21.5
+    links2004/WebSockets@^2.6.1
+
+[env:uno_linux]
 upload_speed = 576000
 upload_port = /dev/ttyUSB*
-; FastAccelStepper 0.33+ requires newer ESP-IDF headers than the
-; espressif32 3.4.0 / Arduino 1.0.6 toolchain provides.
 lib_deps =
-	arminjo/ServoEasing
-	madhephaestus/ESP32Servo@^3.0.6
-	bblanchon/ArduinoJson@^6.21.5
-	gin66/FastAccelStepper@0.30.15
-	h2zero/NimBLE-Arduino@2.2.3
-	links2004/WebSockets@2.6.1
+    ${env.lib_deps}
+    gin66/FastAccelStepper@^0.33.13
+    h2zero/NimBLE-Arduino@^2.3.6
 
 [env:uno_windows]
-platform = platformio/espressif32
-board = esp32dev
-framework = arduino
 extra_scripts = pre:scripts/patch_legacy_esp32_libs.py
 build_flags =
-	-include $PROJECT_INCLUDE_DIR/ArduinoEsp32Compat.h
-monitor_speed = 115200
+    -DEGGDUINO_WINDOWS_BUILD_FIXES=1
+    -include $PROJECT_INCLUDE_DIR/ArduinoEsp32Compat.h
 monitor_port = COM*
-#upload_speed = 576000
 upload_port = COM8
-; Keep this aligned with [env:uno] for Arduino-ESP32 1.0.6 compatibility.
 lib_deps =
-	arminjo/ServoEasing
-	madhephaestus/ESP32Servo@^3.0.6
-	bblanchon/ArduinoJson@^6.21.5
-	gin66/FastAccelStepper@0.30.15
-	h2zero/NimBLE-Arduino@2.2.3
-	links2004/WebSockets@2.6.1
+    ${env.lib_deps}
+    gin66/FastAccelStepper@0.30.15
+    h2zero/NimBLE-Arduino@2.2.3
 
 [env:uno_macos]
-platform = platformio/espressif32
-board = esp32dev
-framework = arduino
-extra_scripts = pre:scripts/patch_legacy_esp32_libs.py
-build_flags =
-	-include $PROJECT_INCLUDE_DIR/ArduinoEsp32Compat.h
-monitor_speed = 115200
 monitor_port = /dev/cu.usb*
 upload_port = /dev/cu.usb*
-; Keep this aligned with [env:uno] for Arduino-ESP32 1.0.6 compatibility.
 lib_deps =
-	arminjo/ServoEasing
-	madhephaestus/ESP32Servo@^3.0.6
-	bblanchon/ArduinoJson@^6.21.5
-	gin66/FastAccelStepper@0.30.15
-	h2zero/NimBLE-Arduino@2.2.3
-	links2004/WebSockets@2.6.1
+    ${env.lib_deps}
+    gin66/FastAccelStepper@^0.33.13
+    h2zero/NimBLE-Arduino@^2.3.6

platformio_override_example.ini

@@ -0,0 +1,5 @@
+# Copy file to platformio_override.ini and change default_envs to your needs.
+# In this example file it uses the mac configuration.
+
+[platformio]
+default_envs = uno_mac

src/esp_timer_compat.c

@@ -1,3 +1,4 @@
+#if defined(EGGDUINO_WINDOWS_BUILD_FIXES)
 #include <ArduinoEsp32Compat.h>
 
 #if defined(ESP32) && EGGDUINO_LEGACY_ARDUINO_ESP32
@@ -9,3 +10,4 @@ int esp_timer_is_active(esp_timer_handle_t timer)
     return 0;
 }
 #endif
+#endif