10 files changed, 35 insertions, 9 deletions
diff --git a/lib/wrappers/gtk/atk.nim b/lib/wrappers/gtk/atk.nim
index 14847fdb6..3ae687aed 100755
--- a/lib/wrappers/gtk/atk.nim
+++ b/lib/wrappers/gtk/atk.nim
@@ -5,6 +5,9 @@ import
 when defined(windows): 
   const 
     lib = "libatk-1.0-0.dll"
+elif defined(macosx):
+  const 
+    lib = "libatk-1.0.dylib"
 else: 
   const 
     lib = "libatk-1.0.so"
diff --git a/lib/wrappers/gtk/gdk2.nim b/lib/wrappers/gtk/gdk2.nim
index 5841aeee3..d6e1952bc 100755
--- a/lib/wrappers/gtk/gdk2.nim
+++ b/lib/wrappers/gtk/gdk2.nim
@@ -5,7 +5,7 @@ import
 when defined(win32): 
   const 
     lib = "libgdk-win32-2.0-0.dll"
-elif defined(darwin): 
+elif defined(macosx): 
   #    linklib gtk-x11-2.0
   #    linklib gdk-x11-2.0
   #    linklib pango-1.0.0
@@ -14,7 +14,7 @@ elif defined(darwin):
   #    linklib gdk_pixbuf-2.0.0
   #    linklib atk-1.0.0
   const 
-    lib = "gdk-x11-2.0"
+    lib = "libgdk-x11-2.0.dylib"
 else: 
   const 
     lib = "libgdk-x11-2.0.so(|.0)"
diff --git a/lib/wrappers/gtk/gdk2pixbuf.nim b/lib/wrappers/gtk/gdk2pixbuf.nim
index e866e51ff..ee50317f8 100755
--- a/lib/wrappers/gtk/gdk2pixbuf.nim
+++ b/lib/wrappers/gtk/gdk2pixbuf.nim
@@ -5,9 +5,9 @@ import
 when defined(win32): 
   const 
     pixbuflib = "libgdk_pixbuf-2.0-0.dll"
-elif defined(darwin): 
+elif defined(macosx): 
   const 
-    pixbuflib = "gdk_pixbuf-2.0.0"
+    pixbuflib = "libgdk_pixbuf-2.0.0.dylib"
   # linklib gtk-x11-2.0
   # linklib gdk-x11-2.0
   # linklib pango-1.0.0
diff --git a/lib/wrappers/gtk/gdkglext.nim b/lib/wrappers/gtk/gdkglext.nim
index b5844395b..0d550c6e2 100755
--- a/lib/wrappers/gtk/gdkglext.nim
+++ b/lib/wrappers/gtk/gdkglext.nim
@@ -5,6 +5,9 @@ import
 when defined(WIN32): 
   const 
     GLExtLib = "libgdkglext-win32-1.0-0.dll"
+elif defined(macosx): 
+  const 
+    GLExtLib = "libgdkglext-x11-1.0.dylib"
 else: 
   const 
     GLExtLib = "libgdkglext-x11-1.0.so"
diff --git a/lib/wrappers/gtk/glib2.nim b/lib/wrappers/gtk/glib2.nim
index d7414cbcb..a8fa6412d 100755
--- a/lib/wrappers/gtk/glib2.nim
+++ b/lib/wrappers/gtk/glib2.nim
@@ -4,6 +4,11 @@ when defined(windows):
     gliblib = "libglib-2.0-0.dll"
     gmodulelib = "libgmodule-2.0-0.dll"
     gobjectlib = "libgobject-2.0-0.dll"
+elif defined(macosx): 
+  const 
+    gliblib = "libglib-2.0.dylib"
+    gmodulelib = "libgmodule-2.0.dylib"
+    gobjectlib = "libgobject-2.0.dylib"
 else: 
   const 
     gliblib = "libglib-2.0.so(|.0)"
diff --git a/lib/wrappers/gtk/gtk2.nim b/lib/wrappers/gtk/gtk2.nim
index d835f7b2f..7bfed2d64 100755
--- a/lib/wrappers/gtk/gtk2.nim
+++ b/lib/wrappers/gtk/gtk2.nim
@@ -5,9 +5,9 @@ import
 when defined(win32): 
   const 
     lib = "libgtk-win32-2.0-0.dll"
-elif defined(darwin): 
+elif defined(macosx): 
   const 
-    lib = "gtk-x11-2.0"
+    lib = "libgtk-x11-2.0.dylib"
   # linklib gtk-x11-2.0
   # linklib gdk-x11-2.0
   # linklib pango-1.0.0
diff --git a/lib/wrappers/gtk/gtkglext.nim b/lib/wrappers/gtk/gtkglext.nim
index b6c832a65..b3f5647bd 100755
--- a/lib/wrappers/gtk/gtkglext.nim
+++ b/lib/wrappers/gtk/gtkglext.nim
@@ -2,8 +2,15 @@
 import 
   Glib2, Gdk2, gtk2, GdkGLExt
 
-const 
-  GLExtLib* = if defined(WIN32): "libgtkglext-win32-1.0-0.dll" else: "libgtkglext-x11-1.0.so"
+when defined(windows):
+  const 
+    GLExtLib* = "libgtkglext-win32-1.0-0.dll" 
+elif defined(macosx):
+  const
+    GLExtLib* = "libgtkglext-x11-1.0.dylib"
+else:
+  const
+    GLExtLib* = "libgtkglext-x11-1.0.so"
 
 const 
   HEADER_GTKGLEXT_MAJOR_VERSION* = 1
diff --git a/lib/wrappers/gtk/gtkhtml.nim b/lib/wrappers/gtk/gtkhtml.nim
index 291913b8e..92496c03b 100755
--- a/lib/wrappers/gtk/gtkhtml.nim
+++ b/lib/wrappers/gtk/gtkhtml.nim
@@ -3,9 +3,11 @@ import
   gtk2, glib2, atk, pango, gdk2pixbuf, gdk2
 
 when defined(windows): 
-  {.define: WINDOWING_WIN32.}
   const 
     htmllib = "libgtkhtml-win32-2.0-0.dll"
+elif defined(macosx): 
+  const 
+    htmllib = "libgtkhtml-2.dylib"
 else: 
   const 
     htmllib = "libgtkhtml-2.so"
diff --git a/lib/wrappers/gtk/libglade2.nim b/lib/wrappers/gtk/libglade2.nim
index 844f055a0..6dda3364e 100755
--- a/lib/wrappers/gtk/libglade2.nim
+++ b/lib/wrappers/gtk/libglade2.nim
@@ -5,6 +5,9 @@ import
 when defined(win32): 
   const 
     LibGladeLib = "libglade-2.0-0.dll"
+elif defined(macosx): 
+  const 
+    LibGladeLib = "libglade-2.0.dylib"
 else: 
   const 
     LibGladeLib = "libglade-2.0.so"
diff --git a/lib/wrappers/gtk/pango.nim b/lib/wrappers/gtk/pango.nim
index facdffb38..cc6acb005 100755
--- a/lib/wrappers/gtk/pango.nim
+++ b/lib/wrappers/gtk/pango.nim
@@ -5,6 +5,9 @@ import
 when defined(win32): 
   const 
     lib* = "libpango-1.0-0.dll"
+elif defined(macosx): 
+  const 
+    lib* = "libpango-1.0.dylib"
 else: 
   const 
     lib* = "libpango-1.0.so.0"