diff options
| author | tobigun <tobigun@b956fd51-792f-4845-bead-9b4dfca2ff2c> | 2010-12-23 13:04:59 +0000 |
|---|---|---|
| committer | tobigun <tobigun@b956fd51-792f-4845-bead-9b4dfca2ff2c> | 2010-12-23 13:04:59 +0000 |
| commit | d66a7ca1dd64bd96487a088aaaa2dd28c477da1d (patch) | |
| tree | 9e57d080e457d37147571fa22a728d783fbdae63 | |
| parent | a35ea9616410d7c7dc8320aadca215442d51554a (diff) | |
| download | usdx-d66a7ca1dd64bd96487a088aaaa2dd28c477da1d.tar.gz usdx-d66a7ca1dd64bd96487a088aaaa2dd28c477da1d.tar.xz usdx-d66a7ca1dd64bd96487a088aaaa2dd28c477da1d.zip | |
apply projectM dso_handle patch from trunk
git-svn-id: svn://svn.code.sf.net/p/ultrastardx/svn/branches/experimental@2771 b956fd51-792f-4845-bead-9b4dfca2ff2c
| -rw-r--r-- | mediaplugin/src/lib/projectM/cwrapper/projectM-cwrapper.cpp | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/mediaplugin/src/lib/projectM/cwrapper/projectM-cwrapper.cpp b/mediaplugin/src/lib/projectM/cwrapper/projectM-cwrapper.cpp index ebf43554..0266c755 100644 --- a/mediaplugin/src/lib/projectM/cwrapper/projectM-cwrapper.cpp +++ b/mediaplugin/src/lib/projectM/cwrapper/projectM-cwrapper.cpp @@ -8,6 +8,11 @@ #define PM_PCM(pm) (PM_CLASS(pm)->pcm) #endif +// this is needed if ld is used instead of gcc to link this static +// library (which is the case if the fpc pascal compiler is used). +// Otherwise compilation fails with "undefined reference to __dso_handle" +void *__dso_handle = 0; + projectM_ptr projectM_create1(char* config_file) { return projectM_ptr(new projectM(config_file)); |