Skip to content

Commit

Permalink
Add support for SF 2 custom OSD
Browse files Browse the repository at this point in the history 
credits
grant2258, gpstar81 and KMFDManic
  • Loading branch information
@arcadez2003
arcadez2003 authored Jan 13, 2020
1 parent fcb7093 commit 60df6b3
Showing 1 changed file with 657 additions and 58 deletions.
Loading

3 comments on commit 60df6b3

@inactive123
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Hi there, this introduced a build failure for Emscripten -

wasm-ld: error: duplicate symbol: sf2_playing_street_fighter

defined in libretro_emscripten.bc(cps1_vidhrdw_8d290398.o)
defined in libretro_emscripten.bc(cps1_2bd24122.o)

wasm-ld: error: duplicate symbol: fadingMusic

defined in libretro_emscripten.bc(cps1_vidhrdw_8d290398.o)
defined in libretro_emscripten.bc(cps1_2bd24122.o)

wasm-ld: error: duplicate symbol: fadeMusicVolume

defined in libretro_emscripten.bc(cps1_vidhrdw_8d290398.o)
defined in libretro_emscripten.bc(cps1_2bd24122.o)

wasm-ld: error: duplicate symbol: sf2_playing_street_fighter

defined in libretro_emscripten.bc(cps1_2bd24122.o)
defined in libretro_emscripten.bc(cps2_b32b9f9e.o)

wasm-ld: error: duplicate symbol: fadingMusic

defined in libretro_emscripten.bc(cps1_2bd24122.o)
defined in libretro_emscripten.bc(cps2_b32b9f9e.o)

wasm-ld: error: duplicate symbol: fadeMusicVolume

defined in libretro_emscripten.bc(cps1_2bd24122.o)
defined in libretro_emscripten.bc(cps2_b32b9f9e.o)

@inactive123
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Based on this error, I think you will need to name these functions/variables differently in the two files.

@arcadez2003
Copy link
Collaborator Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Just decided to revert the changes as the code is obviously not error free as yet, i'll leave it upto
@KMFDManic to make a pull request should he want the SF samples supported in this core.

Please sign in to comment.