Skip to content

Commit 778c8c5

Browse files
committed
feat: update to compile better with latest idf
1 parent 0ec07b9 commit 778c8c5

File tree

11 files changed

+16
-7
lines changed

11 files changed

+16
-7
lines changed

README.md

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -220,7 +220,12 @@ I2C Pinout (shared with touchscreen chip above):
220220
* https://github.com/daniel5151/ANESE
221221
* https://github.com/Grandduchy/YaNES
222222

223+
### Other Genesis Emulators
224+
* https://github.com/h1romas4/m5stack-genplus
225+
* https://github.com/libretro/blastem
226+
223227
### Useful Background / Information
228+
* https://github.com/alnacle/awesome-emulators
224229
* https://www.zophar.net/nes.html
225230
* https://yizhang82.dev/nes-emu-overview
226231
* https://www.gridbugs.org/zelda-screen-transitions-are-undefined-behaviour/

components/box-emu-hal/include/mmap.hpp

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,5 @@
11
#pragma once
22

3-
#include <fstream>
43
#include <string>
54

65
#include <esp_err.h>

components/box-emu-hal/src/mmap.cpp

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
11
#include "mmap.hpp"
2+
#include <fstream>
23
#include "esp_heap_caps.h"
34

45
static uint8_t* romdata = nullptr;

components/codec/es8388/es8388.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -417,7 +417,7 @@ esp_err_t es8388_get_voice_mute(void)
417417
* - (-1) Parameter error
418418
* - (0) Success
419419
*/
420-
esp_err_t es8388_config_dac_output(int output)
420+
esp_err_t es8388_config_dac_output(es_dac_output_t output)
421421
{
422422
esp_err_t res;
423423
uint8_t reg = 0;

components/codec/es8388/es8388.h

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -26,6 +26,7 @@
2626
#define __ES8388_H__
2727

2828
#include "esp_types.h"
29+
#include "esp_err.h"
2930
#include "audio_hal.h"
3031
#include "driver/i2c.h"
3132
#include "esxxx_common.h"

components/espp

Submodule espp updated 102 files

components/gbc/CMakeLists.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,5 +5,5 @@ idf_component_register(
55
REQUIRES box-emu-hal
66
)
77

8-
target_compile_options(${COMPONENT_LIB} PRIVATE -Wno-misleading-indentation)
8+
target_compile_options(${COMPONENT_LIB} PRIVATE -Wno-misleading-indentation -Wno-implicit-fallthrough -Wno-unused-function -Wno-unused-variable -Wno-discarded-qualifiers)
99
target_compile_definitions(${COMPONENT_LIB} PRIVATE GNUBOY_NO_MINIZIP GNUBOY_NO_SCREENSHOT IS_LITTLE_ENDIAN)

components/gbc/gnuboy/src/lcd.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -485,7 +485,7 @@ static void IRAM_ATTR spr_count()
485485
}
486486

487487

488-
static struct vissprite ts[10];
488+
static struct vissprite ts[16];
489489

490490
static void IRAM_ATTR spr_enum()
491491
{

components/gbc/gnuboy/src/mem.c

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -75,11 +75,14 @@ void IRAM_ATTR mem_updatemap()
7575
//}
7676

7777
#if 1
78+
#pragma GCC diagnostic push
79+
#pragma GCC diagnostic ignored "-Warray-bounds"
7880
map[0xC] = ram.ibank[0] - 0xC000;
7981
n = R_SVBK & 0x07;
8082
map[0xD] = ram.ibank[n?n:1] - 0xD000;
8183
map[0xE] = ram.ibank[0] - 0xE000;
8284
map[0xF] = NULL;
85+
#pragma GCC diagnostic pop
8386
#else
8487
map[0xC] = NULL;
8588
map[0xD] = NULL;

components/nes/CMakeLists.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,4 +4,4 @@ idf_component_register(
44
PRIV_INCLUDE_DIRS "nofrendo/cpu" "nofrendo/libsnss" "nofrendo/nes" "nofrendo/sndhrdw" "nofrendo"
55
REQUIRES box-emu-hal
66
)
7-
target_compile_options(${COMPONENT_LIB} PRIVATE -Wno-char-subscripts -Wno-attributes)
7+
target_compile_options(${COMPONENT_LIB} PRIVATE -Wno-char-subscripts -Wno-attributes -Wno-implicit-fallthrough -Wno-unused-function -Wno-unused-variable -Wno-discarded-qualifiers)

0 commit comments

Comments
 (0)