diff options
author | 2010-11-08 21:31:10 +0100 | |
---|---|---|
committer | 2010-11-08 21:31:10 +0100 | |
commit | 2dd8ffd24db2b5416eba2637f9dfdb202589f695 (patch) | |
tree | 5bc6daf1dbb27a62384172e1f2868ab42e5f11d7 /plugins/sid | |
parent | c15a02c92efa6a6e58b6c48290c168aee2691a21 (diff) | |
parent | 21e46269269b82e756fef0051e0953c52d6be3ca (diff) |
Merge branch 'static' into devel
Conflicts:
configure.ac
Diffstat (limited to 'plugins/sid')
-rw-r--r-- | plugins/sid/Makefile.am | 6 | ||||
-rw-r--r-- | plugins/sid/csid.cpp | 12 | ||||
-rw-r--r-- | plugins/sid/plugin.c | 4 |
3 files changed, 17 insertions, 5 deletions
diff --git a/plugins/sid/Makefile.am b/plugins/sid/Makefile.am index 38caa014..f5408088 100644 --- a/plugins/sid/Makefile.am +++ b/plugins/sid/Makefile.am @@ -103,9 +103,9 @@ sidplay-libs/libsidplay/src/kernal.bin\ sidplay-libs/libsidplay/src/psiddrv.bin\ sidplay-libs/libsidplay/src/poweron.bin -sid_la_LIBADD = -lstdc++ -sid_la_LDFLAGS = -module +sid_la_LDFLAGS = -module -nostdlib -lsupc++ AM_CFLAGS = $(CFLAGS) -std=c99 -I$(sidpath)/libsidplay/include -I$(sidpath)/builders/resid-builder/include -fPIC -AM_CPPFLAGS = $(CXXFLAGS) -DHAVE_UNIX -I$(sidpath) -I$(sidpath)/unix -I$(sidpath)/libsidplay -I$(sidpath)/libsidplay/include -I$(sidpath)/libsidplay/include/sidplay -I$(sidpath)/libsidutils/include/sidplay/utils -I$(sidpath)/builders/resid-builder/include/sidplay/builders -I$(sidpath)/builders/resid-builder/include -DHAVE_STRCASECMP -DHAVE_STRNCASECMP +AM_CPPFLAGS = $(CXXFLAGS) -DHAVE_UNIX -I$(sidpath) -I$(sidpath)/unix -I$(sidpath)/libsidplay -I$(sidpath)/libsidplay/include -I$(sidpath)/libsidplay/include/sidplay -I$(sidpath)/libsidutils/include/sidplay/utils -I$(sidpath)/builders/resid-builder/include/sidplay/builders -I$(sidpath)/builders/resid-builder/include -DHAVE_STRCASECMP -DHAVE_STRNCASECMP -fno-exceptions -fno-rtti -fno-unwind-tables + endif diff --git a/plugins/sid/csid.cpp b/plugins/sid/csid.cpp index ccb2ecb3..57035291 100644 --- a/plugins/sid/csid.cpp +++ b/plugins/sid/csid.cpp @@ -34,6 +34,18 @@ #include "../../deadbeef.h" #include "csid.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; + extern DB_decoder_t sid_plugin; //#define trace(...) { fprintf(stderr, __VA_ARGS__); } diff --git a/plugins/sid/plugin.c b/plugins/sid/plugin.c index 9a2e9a27..f2df0c62 100644 --- a/plugins/sid/plugin.c +++ b/plugins/sid/plugin.c @@ -31,8 +31,8 @@ static const char settings_dlg[] = DB_decoder_t sid_plugin = { DB_PLUGIN_SET_API_VERSION .plugin.type = DB_PLUGIN_DECODER, - .plugin.version_major = 0, - .plugin.version_minor = 1, + .plugin.version_major = 1, + .plugin.version_minor = 0, .plugin.name = "SID decoder", .plugin.descr = "SID player based on libsidplay2", .plugin.author = "Alexey Yakovenko", |