Simplify

ueforth/Makefile

@@ -312,8 +312,8 @@ $(ESP32_SIM):
 	mkdir -p $@
 
 $(GEN)/print-esp32-builtins: \
-    esp32/print-builtins.c esp32/builtins.h | $(GEN)
-	$(CC) $< -o $@
+    esp32/print-builtins.cpp esp32/builtins.h | $(GEN)
+	$(CXX) $(CFLAGS) $< -o $@
 
 $(GEN)/esp32_sim_opcodes.h: $(GEN)/print-esp32-builtins | $(GEN)
 	$< >$@

ueforth/esp32/options.h

@@ -38,7 +38,7 @@
 // RMT support designed around v2.0.1 toolchain.
 // While ESP32 also has RMT, for now only include for
 // ESP32-S2 and ESP32-C3.
-#if defined(CONFIG_IDF_TARGET_ESP32S2) || defined(CONFIG_IDF_TARGET_ESP32C3)
+#if defined(CONFIG_IDF_TARGET_ESP32S2) || defined(CONFIG_IDF_TARGET_ESP32C3) || defined(SIM_PRINT_ONLY)
 # define ENABLE_RMT_SUPPORT
 #endif
 
@@ -55,9 +55,9 @@
 // so this isn't an ideal indicator.
 // Some boards (e.g. ESP32-S2-WROVER) don't seem to have
 // built the serial library, so check if its enabled as well.
-#ifdef BOARD_HAS_PSRAM
+#if defined(BOARD_HAS_PSRAM) || defined(SIM_PRINT_ONLY)
 # define ENABLE_CAMERA_SUPPORT
-# if defined(CONFIG_BT_ENABLED) && defined(CONFIG_BLUEDROID_ENABLED)
+# if (defined(CONFIG_BT_ENABLED) && defined(CONFIG_BLUEDROID_ENABLED)) || defined(SIM_PRINT_ONLY)
 #  define ENABLE_SERIAL_BLUETOOTH_SUPPORT
 # endif
 #endif

ueforth/esp32/print-builtins.cpp

@@ -17,25 +17,7 @@
 #include <stdio.h>
 
 #define SIM_PRINT_ONLY
-
-#define ENABLE_SPIFFS_SUPPORT
-#define ENABLE_WIFI_SUPPORT
-#define ENABLE_MDNS_SUPPORT
-#define ENABLE_WEBSERVER_SUPPORT
-#define ENABLE_I2C_SUPPORT
-#define ENABLE_SOCKETS_SUPPORT
-#define ENABLE_FREERTOS_SUPPORT
-#define ENABLE_INTERRUPTS_SUPPORT
-#define ENABLE_LEDC_SUPPORT
-#define ENABLE_SD_SUPPORT
-#define ENABLE_SPI_FLASH_SUPPORT
-
-#define ENABLE_SD_MMC_SUPPORT
-#define ENABLE_DAC_SUPPORT
-#define ENABLE_RMT_SUPPORT
-#define ENABLE_OLED_SUPPORT
-#define ENABLE_SERIAL_BLUETOOTH_SUPPORT
-
+#include "esp32/options.h"
 #define FLOATING_POINT_LIST
 #define USER_WORDS
 #include "builtins.h"