Merge branch 'windows64' of github.com:lkalif/SingularityViewer

2013-10-24 01:37:45 +02:00
parent 6708019a40 938736b77f
commit bcfe5232fb
33 changed files with 404 additions and 197 deletions
--- a/indra/llaudio/llaudioengine_fmodex.cpp
+++ b/indra/llaudio/llaudioengine_fmodex.cpp
@@ -59,8 +59,13 @@ bool attemptDelayLoad()
 {
 	__try
 	{
+#if defined(_WIN64)
+		if( FAILED( __HrLoadAllImportsForDll( "fmodex64.dll" ) ) )
+			return false;
+#else
 		if( FAILED( __HrLoadAllImportsForDll( "fmodex.dll" ) ) )
 			return false;
+#endif
 	}
 	__except( EXCEPTION_EXECUTE_HANDLER )
 	{