From 60897722c45dafe06e5187e1e13eb99be9c50eb5 Mon Sep 17 00:00:00 2001
From: Matthew Flatt <mflatt@racket-lang.org>
Date: Fri, 22 Oct 2010 19:26:24 -0600
Subject: [PATCH] win32: fixes for create executable

---
 collects/racket/draw/cairo.rkt | 12 ++++++------
 collects/racket/draw/pango.rkt | 33 ++++++++++++++++++++-------------
 2 files changed, 26 insertions(+), 19 deletions(-)

diff --git a/collects/racket/draw/cairo.rkt b/collects/racket/draw/cairo.rkt
index 3a8f4116ce..19c9b39503 100644
--- a/collects/racket/draw/cairo.rkt
+++ b/collects/racket/draw/cairo.rkt
@@ -13,12 +13,12 @@
    (ffi-lib "libpng14.14.dylib")
    (ffi-lib "libcairo.2.dylib")]
   [(windows) 
-   (ffi-lib "zlib1")
-   (ffi-lib "libpng14-14")
-   (ffi-lib "libexpat-1")
-   (ffi-lib "freetype6")
-   (ffi-lib "libfontconfig-1")
-   (ffi-lib "libcairo-2")])
+   (ffi-lib "zlib1.dll")
+   (ffi-lib "libpng14-14.dll")
+   (ffi-lib "libexpat-1.dll")
+   (ffi-lib "freetype6.dll")
+   (ffi-lib "libfontconfig-1.dll")
+   (ffi-lib "libcairo-2.dll")])
 
 (define-ffi-definer define-cairo cairo-lib
   #:provide provide-protected)
diff --git a/collects/racket/draw/pango.rkt b/collects/racket/draw/pango.rkt
index 454ca867b0..dd406f2e9e 100644
--- a/collects/racket/draw/pango.rkt
+++ b/collects/racket/draw/pango.rkt
@@ -17,33 +17,38 @@
    (ffi-lib "libintl.8.dylib")
    (ffi-lib "libpango-1.0.0.dylib")]
   [(windows) 
-   (ffi-lib "libglib-2.0-0")
-   (ffi-lib "libgmodule-2.0-0")
-   (ffi-lib "libgobject-2.0-0")
-   (ffi-lib "libpango-1.0-0")])
+   (ffi-lib "libglib-2.0-0.dll")
+   (ffi-lib "libgmodule-2.0-0.dll")
+   (ffi-lib "libgobject-2.0-0.dll")
+   (ffi-lib "libpango-1.0-0.dll")])
 
 (define-runtime-lib pangowin32-lib 
   [(unix) #f]
   [(macosx)]
   [(windows) 
-   (ffi-lib "libpangowin32-1.0-0")])
+   (ffi-lib "libpangowin32-1.0-0.dll")])
 
 (define-runtime-lib pangocairo-lib 
   [(unix) (ffi-lib "libpangocairo-1.0" '("0"))]
   [(macosx)
    (ffi-lib "libpangocairo-1.0.0.dylib")]
   [(windows) 
-   (ffi-lib "libpangowin32-1.0-0")
-   (ffi-lib "libexpat-1")
-   (ffi-lib "freetype6")
-   (ffi-lib "libfontconfig-1")
-   (ffi-lib "libpangoft2-1.0-0")
-   (ffi-lib "libpangocairo-1.0-0")])
+   (ffi-lib "libpangowin32-1.0-0.dll")
+   (ffi-lib "libexpat-1.dll")
+   (ffi-lib "freetype6.dll")
+   (ffi-lib "libfontconfig-1.dll")
+   (ffi-lib "libpangoft2-1.0-0.dll")
+   (ffi-lib "libpangocairo-1.0-0.dll")])
 
 (define-runtime-lib glib-lib 
+  [(unix) (ffi-lib "libglib-2.0" '("0"))]
+  [(macosx) (ffi-lib "libglib-2.0.0")]
+  [(windows) (ffi-lib "libglib-2.0-0.dll")])
+
+(define-runtime-lib gobj-lib 
   [(unix) (ffi-lib "libgobject-2.0" '("0"))]
   [(macosx) (ffi-lib "libgobject-2.0.0")]
-  [(windows) (ffi-lib "libgobject-2.0-0")])
+  [(windows) (ffi-lib "libgobject-2.0-0.dll")])
 
 (define-ffi-definer define-pango pango-lib
   #:provide provide)
@@ -53,6 +58,8 @@
   #:provide provide)
 (define-ffi-definer define-glib glib-lib
   #:provide provide)
+(define-ffi-definer define-gobj gobj-lib
+  #:provide provide)
 
 (define PangoContext (_cpointer 'PangoContext))
 (define PangoLayout (_cpointer 'PangoLayout))
@@ -117,7 +124,7 @@
 (provide (struct-out PangoGlyphItem))
 
 
-(define-glib g_object_unref (_fun _pointer -> _void)
+(define-gobj g_object_unref (_fun _pointer -> _void)
   #:wrap (deallocator))
 (define-glib g_free (_fun _pointer -> _void)
   #:wrap (deallocator))