RaySollium99/picodrive
1
0
Fork 0
mirror of https://github.com/RaySollium99/picodrive.git synced 2025-09-05 15:27:46 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions

fix clang build

Browse source 
yet another workaround for it...
This commit is contained in:
notaz 2017-10-14 02:13:40 +03:00
parent 24aab4da73
commit ba11a48115
4 changed files with 9 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

2
pico/cd/cdd.c
View file

@ -122,12 +122,14 @@ static const uint32 toc_ffightj[29] =
14553, 9834, 10542, 1699, 1792, 1781, 3783, 3052 14553, 9834, 10542, 1699, 1792, 1781, 3783, 3052
}; };
#if 0
/* supported WAVE file header (16-bit stereo samples @44.1kHz) */ /* supported WAVE file header (16-bit stereo samples @44.1kHz) */
static const unsigned char waveHeader[32] = static const unsigned char waveHeader[32] =
{ {
0x57,0x41,0x56,0x45,0x66,0x6d,0x74,0x20,0x10,0x00,0x00,0x00,0x01,0x00,0x02,0x00, 0x57,0x41,0x56,0x45,0x66,0x6d,0x74,0x20,0x10,0x00,0x00,0x00,0x01,0x00,0x02,0x00,
0x44,0xac,0x00,0x00,0x10,0xb1,0x02,0x00,0x04,0x00,0x10,0x00,0x64,0x61,0x74,0x61 0x44,0xac,0x00,0x00,0x10,0xb1,0x02,0x00,0x04,0x00,0x10,0x00,0x64,0x61,0x74,0x61
}; };
#endif
#ifdef USE_LIBTREMOR #ifdef USE_LIBTREMOR
#ifdef DISABLE_MANY_OGG_OPEN_FILES #ifdef DISABLE_MANY_OGG_OPEN_FILES

7
pico/cd/memory.c
View file

@ -1165,7 +1165,12 @@ PICO_INTERNAL void PicoMemSetupCD(void)
// setup FAME fetchmap // setup FAME fetchmap
{ {
#ifdef __clang__
volatile // prevent strange relocs from clang
#endif
unsigned long ptr_ram = (unsigned long)PicoMem.ram;
int i; int i;
// M68k // M68k
// by default, point everything to fitst 64k of ROM (BIOS) // by default, point everything to fitst 64k of ROM (BIOS)
for (i = 0; i < M68K_FETCHBANK1; i++) for (i = 0; i < M68K_FETCHBANK1; i++)
@ -1175,7 +1180,7 @@ PICO_INTERNAL void PicoMemSetupCD(void)
PicoCpuFM68k.Fetch[i] = (unsigned long)Pico.rom; PicoCpuFM68k.Fetch[i] = (unsigned long)Pico.rom;
// .. and RAM // .. and RAM
for (i = M68K_FETCHBANK1*14/16; i < M68K_FETCHBANK1; i++) for (i = M68K_FETCHBANK1*14/16; i < M68K_FETCHBANK1; i++)
PicoCpuFM68k.Fetch[i] = (unsigned long)PicoMem.ram - (i<<(24-FAMEC_FETCHBITS)); PicoCpuFM68k.Fetch[i] = ptr_ram - (i<<(24-FAMEC_FETCHBITS));
// S68k // S68k
// PRG RAM is default // PRG RAM is default
for (i = 0; i < M68K_FETCHBANK1; i++) for (i = 0; i < M68K_FETCHBANK1; i++)

2
platform/common/menu_pico.c
View file

@ -406,8 +406,6 @@ static const char h_srcart[] = "Emulate the save RAM cartridge accessory\n"
"most games don't need this"; "most games don't need this";
static const char h_scfx[] = "Emulate scale/rotate ASIC chip for graphics effects\n" static const char h_scfx[] = "Emulate scale/rotate ASIC chip for graphics effects\n"
"disable to improve performance"; "disable to improve performance";
static const char h_bsync[] = "More accurate mode for CPUs (needed for some games)\n"
"disable to improve performance";
static menu_entry e_menu_cd_options[] = static menu_entry e_menu_cd_options[] =
{ {

2
platform/libpicofe

@ -1 +1 @@
Subproject commit 448ec62f85a90e8a27368ddc05057a5a714944b8 Subproject commit f287890d65ad36ca75bb71d05745693ae78b1490