aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authork-m_schindler <k-m_schindler@b956fd51-792f-4845-bead-9b4dfca2ff2c>2012-06-13 14:14:22 +0000
committerk-m_schindler <k-m_schindler@b956fd51-792f-4845-bead-9b4dfca2ff2c>2012-06-13 14:14:22 +0000
commit8e7eda21f2f6a61b5b9648d337302cd753b8150e (patch)
treeac4a526a31d9cde3f6d11d770aa53ab1c998cd74
parentc67d523cbb0f5322b6f092d51c0f874022aaa144 (diff)
downloadusdx-8e7eda21f2f6a61b5b9648d337302cd753b8150e.tar.gz
usdx-8e7eda21f2f6a61b5b9648d337302cd753b8150e.tar.xz
usdx-8e7eda21f2f6a61b5b9648d337302cd753b8150e.zip
do not apply the __dso_handle patch on Mac OS X
git-svn-id: svn://svn.code.sf.net/p/ultrastardx/svn/trunk@2904 b956fd51-792f-4845-bead-9b4dfca2ff2c
-rw-r--r--src/lib/projectM/cwrapper/projectM-cwrapper.cpp12
1 files changed, 7 insertions, 5 deletions
diff --git a/src/lib/projectM/cwrapper/projectM-cwrapper.cpp b/src/lib/projectM/cwrapper/projectM-cwrapper.cpp
index 1c1c9175..8e0c4c84 100644
--- a/src/lib/projectM/cwrapper/projectM-cwrapper.cpp
+++ b/src/lib/projectM/cwrapper/projectM-cwrapper.cpp
@@ -8,11 +8,13 @@
#define PM_PCM(pm) (PM_CLASS(pm)->pcm)
#endif
-#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;
+#ifndef __APPLE__
+ #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
#endif
projectM_ptr projectM_create1(char* config_file)