From c67d523cbb0f5322b6f092d51c0f874022aaa144 Mon Sep 17 00:00:00 2001
From: k-m_schindler <k-m_schindler@b956fd51-792f-4845-bead-9b4dfca2ff2c>
Date: Tue, 12 Jun 2012 20:53:34 +0000
Subject: 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
---
src/lib/projectM/cwrapper/projectM-cwrapper.cpp | 4 +++-
1 file changed, 3 insertions(+), 1 deletion(-)
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)
{
--
cgit v1.2.3