diff options
Diffstat (limited to 'plugins/gme')
| -rw-r--r-- | plugins/gme/Makefile.am | 4 | ||||
| -rw-r--r-- | plugins/gme/cgme.c | 16 | ||||
| -rw-r--r-- | plugins/gme/game-music-emu-0.5.5/gme/Sap_Apu.cpp | 2 |
3 files changed, 17 insertions, 5 deletions
diff --git a/plugins/gme/Makefile.am b/plugins/gme/Makefile.am index 61351f9c..ed815899 100644 --- a/plugins/gme/Makefile.am +++ b/plugins/gme/Makefile.am @@ -112,8 +112,8 @@ game-music-emu-0.5.5/gme/Ym2413_Emu.h\ game-music-emu-0.5.5/gme/Ym2612_Emu.h\ game-music-emu-0.5.5/gme/gme_types.h -gme_la_LDFLAGS = -module +gme_la_LDFLAGS = -module -nostdlib -lsupc++ -gme_la_LIBADD = $(LDADD) -lstdc++ AM_CFLAGS = $(CFLAGS) -I$(gmepath) -std=c99 -DGME_VERSION_055 +AM_CPPFLAGS = $(CXXFLAGS) -fno-exceptions -fno-rtti -nostdlib -fno-unwind-tables endif diff --git a/plugins/gme/cgme.c b/plugins/gme/cgme.c index 5d2920f0..1d4bdaed 100644 --- a/plugins/gme/cgme.c +++ b/plugins/gme/cgme.c @@ -21,6 +21,18 @@ #include "gme/gme.h" #include "../../deadbeef.h" +int _Unwind_Resume_or_Rethrow; +int _Unwind_RaiseException; +int _Unwind_GetLanguageSpecificData; +int _Unwind_Resume; +int _Unwind_DeleteException; +int _Unwind_GetTextRelBase; +int _Unwind_SetIP; +int _Unwind_GetDataRelBase; +int _Unwind_GetRegionStart; +int _Unwind_SetGR; +int _Unwind_GetIPInfo; + //#define trace(...) { fprintf(stderr, __VA_ARGS__); } #define trace(fmt,...) @@ -241,8 +253,8 @@ static const char settings_dlg[] = // define plugin interface static DB_decoder_t plugin = { DB_PLUGIN_SET_API_VERSION - .plugin.version_major = 0, - .plugin.version_minor = 1, + .plugin.version_major = 1, + .plugin.version_minor = 0, .plugin.type = DB_PLUGIN_DECODER, .plugin.id = "stdgme", .plugin.name = "Game_Music_Emu decoder", diff --git a/plugins/gme/game-music-emu-0.5.5/gme/Sap_Apu.cpp b/plugins/gme/game-music-emu-0.5.5/gme/Sap_Apu.cpp index fa9bc4b1..fb56f5dc 100644 --- a/plugins/gme/game-music-emu-0.5.5/gme/Sap_Apu.cpp +++ b/plugins/gme/game-music-emu-0.5.5/gme/Sap_Apu.cpp @@ -90,7 +90,7 @@ void Sap_Apu::reset( Sap_Apu_Impl* new_impl ) memset( &oscs [i], 0, offsetof (osc_t,output) ); } -inline void Sap_Apu::calc_periods() +void Sap_Apu::calc_periods() { // 15/64 kHz clock int divider = 28; |