Merge pull request #386 from PCSX2/remove-tls

spu2x:zzogl: disable TLS

common/include/Utilities/Threading.h

@@ -63,7 +63,7 @@ extern ConsoleLogSource_Threading pxConLog_Thread;
 // For complimentary support for TLS, include Utilities/TlsVariable.inl, and use the
 // DeclareTls macro in the place of __threadlocal.
 //
-//#define PCSX2_THREAD_LOCAL 0		// uncomment this line to force-disable native TLS (useful for testing TlsVariabel on windows/linux)
+//#define PCSX2_THREAD_LOCAL 0		// uncomment this line to force-disable native TLS (useful for testing TlsVariable on windows/linux)
 
 #ifndef PCSX2_THREAD_LOCAL
 #	ifdef __WXMAC__

common/src/Utilities/CMakeLists.txt

@@ -176,3 +176,4 @@ set(UtilitiesFinalLibs
 )
 
 add_pcsx2_lib(${Output} "${UtilitiesFinalSources}" "${UtilitiesFinalLibs}" "${UtilitiesFinalFlags}")
+add_pcsx2_lib(${Output}_NO_TLS "${UtilitiesFinalSources}" "${UtilitiesFinalLibs}" "${UtilitiesFinalFlags} -DPCSX2_THREAD_LOCAL=0")

plugins/spu2-x/src/CMakeLists.txt

@@ -120,7 +120,7 @@ set(spu2xFinalSources
 )
 
 set(spu2xFinalLibs
-    Utilities
+    Utilities_NO_TLS
     ${ALSA_LIBRARIES}
     ${PORTAUDIO_LIBRARIES}
     ${GTK2_LIBRARIES}

plugins/zzogl-pg/opengl/CMakeLists.txt

@@ -190,7 +190,7 @@ set(zzoglFinalSources
 )
 
 set(zzoglFinalLibs
-    Utilities
+    Utilities_NO_TLS
     ${OPENGL_LIBRARIES}
 )