From 6a8d3c34f1391009a46d2d9925bc5e32fdbdc41f Mon Sep 17 00:00:00 2001
From: Matthew Flatt <mflatt@cs.utah.edu>
Date: Wed, 5 Oct 2011 06:22:05 -0600
Subject: [PATCH] win64: avoid msvcr90.dll

The libjpeg, libeay, and ssleay libraries for Win64 linked to
msvcr90.dll, because of the way that they were compiled with
MSVC 2008, but msvcr90.dll is not included with Win7, and
redistributing it is problematic. The new variants of the libraries
link instead of msvcrt.dll --- which you're not supposed to do
according to MS, but that's the way libraries like Gtk are
built, and it seems to be the right approach. See also

 http://kobyk.wordpress.com/2007/07/20/dynamically-linking-with-msvcrtdll-using-visual-c-2005/

I built libjpeg-8, while the other two are courtesey of
http://www.indyproject.org.

Closes PR 12246
---
 collects/racket/draw/unsafe/jpeg.rkt |  3 ++-
 src/get-libs.rkt                     | 10 +++++-----
 2 files changed, 7 insertions(+), 6 deletions(-)

diff --git a/collects/racket/draw/unsafe/jpeg.rkt b/collects/racket/draw/unsafe/jpeg.rkt
index 95ba285f23..2dd1327291 100644
--- a/collects/racket/draw/unsafe/jpeg.rkt
+++ b/collects/racket/draw/unsafe/jpeg.rkt
@@ -11,7 +11,8 @@
   [(macosx) 
    ;; for PPC, it's actually version 8!
    (ffi-lib "libjpeg.62.dylib")]
-  [(windows) (ffi-lib "libjpeg-7.dll")])
+  [(win32) (ffi-lib "libjpeg-7.dll")]
+  [(win64) (ffi-lib "libjpeg-8.dll")])
 
 (define-ffi-definer define-jpeg jpeg-lib
   #:provide provide)
diff --git a/src/get-libs.rkt b/src/get-libs.rkt
index 491326c388..2f387ae42b 100644
--- a/src/get-libs.rkt
+++ b/src/get-libs.rkt
@@ -6,7 +6,7 @@
 ;; without using bytecode.
 
 (define url-host "download.racket-lang.org")
-(define url-path "/libs/3/")
+(define url-path "/libs/4/")
 (define url-base (string-append "http://" url-host url-path))
 
 (provide all-files+sizes)
@@ -22,9 +22,9 @@
       ["libeay32.dll" 1089536]
       ["ssleay32.dll" 237568]]
      [win32/x86_64
-     ["libiconv-2.dll" 1378028]
-     ["libeay32.dll" 1293824]
-     ["ssleay32.dll" 260608]]]
+      ["libiconv-2.dll" 1378028]
+      ["libeay32.dll" 1410560]
+      ["ssleay32.dll" 247808]]]
     ;; GUI Libraries
     [gui
      [i386-macosx
@@ -94,7 +94,7 @@
             ["gtkrc" 1181])
           '())]
      [win32/x86_64
-      ["libjpeg-7.dll" 224768]
+      ["libjpeg-8.dll" 214016]
       ["libcairo-2.dll" 1266147]
       ["libpango-1.0-0.dll" 423199]
       ["libexpat-1.dll" 263006]