Replaced the remaining CONFIG_IDF_TARGET with ESP_PLATFORM

It's the preferred way to detect building inside esp-idf.
ducalex · Jan 24, 2024 · 370532e · 370532e
1 parent b69dcd9
commit 370532e
Show file tree

Hide file tree

Showing 4 changed files with 7 additions and 7 deletions.
diff --git a/components/retro-go/rg_i2c.c b/components/retro-go/rg_i2c.c
@@ -4,7 +4,7 @@
 #include <stdlib.h>
 #include <unistd.h>
 
-#if defined(RG_GPIO_I2C_SDA) && defined(RG_GPIO_I2C_SCL)
+#if defined(ESP_PLATFORM) && (RG_GPIO_I2C_SDA) && defined(RG_GPIO_I2C_SCL)
 #include <driver/i2c.h>
 #include <esp_err.h>
 #define USE_I2C_DRIVER 1

diff --git a/components/retro-go/rg_input.c b/components/retro-go/rg_input.c
@@ -5,10 +5,10 @@
 #include <string.h>
 #include <unistd.h>
 
-#ifdef RG_TARGET_SDL2
-#include <SDL2/SDL.h>
-#else
+#ifdef ESP_PLATFORM
 #include <driver/gpio.h>
+#else
+#include <SDL2/SDL.h>
 #endif
 
 #if RG_GAMEPAD_DRIVER == 1 || defined(RG_BATTERY_ADC_CHANNEL)

diff --git a/components/retro-go/rg_utils.c b/components/retro-go/rg_utils.c
@@ -83,7 +83,7 @@ const char *rg_relpath(const char *path)
 
 uint32_t rg_crc32(uint32_t crc, const uint8_t *buf, uint32_t len)
 {
-#ifdef CONFIG_IDF_TARGET
+#ifdef ESP_PLATFORM
     // This is part of the ROM but finding the correct header is annoying as it differs per SOC...
     extern uint32_t crc32_le(uint32_t crc, const uint8_t *buf, uint32_t len);
     return crc32_le(crc, buf, len);

diff --git a/launcher/main/main.c b/launcher/main/main.c
@@ -6,7 +6,7 @@
 #include <string.h>
 #include <unistd.h>
 
-#ifdef CONFIG_IDF_TARGET
+#ifdef ESP_PLATFORM
 #include <esp_heap_caps.h>
 #endif
 
@@ -482,7 +482,7 @@ void app_main(void)
         try_migrate();
     }
 
-#ifdef CONFIG_IDF_TARGET
+#ifdef ESP_PLATFORM
     // The launcher makes a lot of small allocations and it sometimes fills internal RAM, causing the SD Card driver to
     // stop working. Lowering CONFIG_SPIRAM_MALLOC_ALWAYSINTERNAL and manually using rg_alloc to do internal allocs when
     // needed is a better solution, but that would have to be done for every app. This is a good workaround for now.