summaryrefslogtreecommitdiff
path: root/glib/makefile.mk
diff options
context:
space:
mode:
authorTor Lillqvist <tlillqvist@novell.com>2011-05-28 12:17:08 +0300
committerTor Lillqvist <tlillqvist@novell.com>2011-05-28 12:26:59 +0300
commita031b8d16b6887c82d2186c05a6607565e871569 (patch)
treea7677f737d42714badefbeca42c2f8b341e38de0 /glib/makefile.mk
parentb833043246cf309dce728ea410f8e9a115afe41e (diff)
Avoid potential mixup of incomopatible but identically named GLib DLLs
Don't use the same name for the GLib DLLs that we build with MSVS9 as in the "official" MinGW-built packages (either the ones from www.gtk.org, or the ones from OBS). The "official" GLib DLLs use msvcrt.dll, while the ones we build use msvcr90.dll. We want to avoid potential confusion. Call the DLLs we build glib-2.0.dll etc, not libglib-2.0-0.dll etc.
Diffstat (limited to 'glib/makefile.mk')
-rw-r--r--[-rwxr-xr-x]glib/makefile.mk10
1 files changed, 5 insertions, 5 deletions
diff --git a/glib/makefile.mk b/glib/makefile.mk
index e724baee219f..8827dc3d8cfb 100755..100644
--- a/glib/makefile.mk
+++ b/glib/makefile.mk
@@ -300,11 +300,11 @@ ADDITIONAL_FILES= config.h \
BUILD_ACTION=nmake -f makefile.msc
-OUT2BIN+=gio$/libgio-2.0-0.dll
-OUT2BIN+=glib$/libglib-2.0-0.dll
-OUT2BIN+=gmodule$/libgmodule-2.0-0.dll
-OUT2BIN+=gobject$/libgobject-2.0-0.dll
-OUT2BIN+=gthread$/libgthread-2.0-0.dll
+OUT2BIN+=gio$/gio-2.0.dll
+OUT2BIN+=glib$/glib-2.0.dll
+OUT2BIN+=gmodule$/gmodule-2.0.dll
+OUT2BIN+=gobject$/gobject-2.0.dll
+OUT2BIN+=gthread$/gthread-2.0.dll
OUT2BIN+=gobject$/glib-mkenums
OUT2BIN+=gobject$/glib-genmarshal.exe