From 93e62a375c91dc8fb6695fce1470f5cedd9330a2 Mon Sep 17 00:00:00 2001
From: Latif Khalifa <latifer@streamgrid.net>
Date: Sun, 20 Oct 2013 20:17:03 +0200
Subject: [PATCH] WIP[win64]: Rebuilt jpeglib, libpng, fixed loading of fmodex

---
 indra/llaudio/llaudioengine_fmodex.cpp | 5 +++++
 install.xml                            | 4 ++--
 2 files changed, 7 insertions(+), 2 deletions(-)

diff --git a/indra/llaudio/llaudioengine_fmodex.cpp b/indra/llaudio/llaudioengine_fmodex.cpp
index 300264d91..972725171 100644
--- 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 )
 	{
diff --git a/install.xml b/install.xml
index d96497d2f..b2aa1c991 100644
--- a/install.xml
+++ b/install.xml
@@ -844,7 +844,7 @@
           <key>windows64</key>
           <map>
             <key>md5sum</key>
-            <string>4c6600c70c1075fca2343fcd21b35cfe</string>
+            <string>79e328b10fae2090262c0bf02c9c5f71</string>
             <key>url</key>
             <uri>https://files.streamgrid.net/win64/singularity/jpeglib-8c-windows64-20131020.tar.bz2</uri>
           </map>
@@ -938,7 +938,7 @@
           <key>windows64</key>
           <map>
             <key>md5sum</key>
-            <string>9d2b32caa8b91ccb5c46be6a53eb071b</string>
+            <string>00fc7bcb4016ecc57def9e3b3223d977</string>
             <key>url</key>
             <uri>https://files.streamgrid.net/win64/singularity/libpng-1.5.10-windows64-20131020.tar.bz2</uri>
           </map>