diff options
| author | k-m_schindler <k-m_schindler@b956fd51-792f-4845-bead-9b4dfca2ff2c> | 2012-06-12 20:53:34 +0000 |
|---|---|---|
| committer | k-m_schindler <k-m_schindler@b956fd51-792f-4845-bead-9b4dfca2ff2c> | 2012-06-12 20:53:34 +0000 |
| commit | c67d523cbb0f5322b6f092d51c0f874022aaa144 (patch) | |
| tree | 76cbccc977d20d3edfe9216377daf7e2867aa90c /src | |
| parent | e05032920501813dabc1b1cd65603c81753dd0ce (diff) | |
| download | usdx-c67d523cbb0f5322b6f092d51c0f874022aaa144.tar.gz usdx-c67d523cbb0f5322b6f092d51c0f874022aaa144.tar.xz usdx-c67d523cbb0f5322b6f092d51c0f874022aaa144.zip | |
hack of __dso_handle is not needed with gcc >4.6
git-svn-id: svn://svn.code.sf.net/p/ultrastardx/svn/trunk@2903 b956fd51-792f-4845-bead-9b4dfca2ff2c
Diffstat (limited to 'src')
| -rw-r--r-- | src/lib/projectM/cwrapper/projectM-cwrapper.cpp | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/src/lib/projectM/cwrapper/projectM-cwrapper.cpp b/src/lib/projectM/cwrapper/projectM-cwrapper.cpp index 0266c755..1c1c9175 100644 --- a/src/lib/projectM/cwrapper/projectM-cwrapper.cpp +++ b/src/lib/projectM/cwrapper/projectM-cwrapper.cpp @@ -8,10 +8,12 @@ #define PM_PCM(pm) (PM_CLASS(pm)->pcm) #endif -// this is needed if ld is used instead of gcc to link this static +#if (__GNUC__ == 4 && __GNUC_MINOR__ < 6 ) // library (which is the case if the fpc pascal compiler is used). // Otherwise compilation fails with "undefined reference to __dso_handle" +// resolved with gcc 4.6.* void *__dso_handle = 0; +#endif projectM_ptr projectM_create1(char* config_file) { |