diff options
| author | Hans Breuer <hans@breuer.org> | 2007-12-20 19:13:18 +0000 |
|---|---|---|
| committer | Hans Breuer <hans@src.gnome.org> | 2007-12-20 19:13:18 +0000 |
| commit | b64e1dfd47a6d6d95d5ac5da54a2b5c440532bd7 (patch) | |
| tree | 4ea230db3fa99873bc0ea13049a7abb6c595be98 | |
| parent | 0c99959a797add449f0ae00bc6d8121c7c4eabfe (diff) | |
| download | glib-b64e1dfd47a6d6d95d5ac5da54a2b5c440532bd7.tar.gz | |
don't build gdesktopappinfo.obj, it collides with symbols
2007-12-20 Hans Breuer <hans@breuer.org>
* makefile.msc : don't build gdesktopappinfo.obj, it collides
with symbols gwin32appinfo.obj, added gmount.obj
* gio.symbols : mark g_desktop_app_* as G_OS_UNIX
svn path=/trunk/; revision=6178
| -rw-r--r-- | gio/ChangeLog | 6 | ||||
| -rw-r--r-- | gio/gio.symbols | 2 | ||||
| -rw-r--r-- | gio/makefile.msc | 5 |
3 files changed, 12 insertions, 1 deletions
diff --git a/gio/ChangeLog b/gio/ChangeLog index 5fd89386b..fb86c43d2 100644 --- a/gio/ChangeLog +++ b/gio/ChangeLog @@ -1,3 +1,9 @@ +2007-12-20 Hans Breuer <hans@breuer.org> + + * makefile.msc : don't build gdesktopappinfo.obj, it collides + with symbols gwin32appinfo.obj, added gmount.obj + * gio.symbols : mark g_desktop_app_* as G_OS_UNIX + 2007-12-20 Alexander Larsson <alexl@redhat.com> * gfile.c: diff --git a/gio/gio.symbols b/gio/gio.symbols index c487f4d6c..c2caa43bf 100644 --- a/gio/gio.symbols +++ b/gio/gio.symbols @@ -63,12 +63,14 @@ g_app_info_get_default_for_uri_scheme #if IN_HEADER(__G_DESKTOP_APP_INFO_H__) #if IN_FILE(__G_DESKTOP_APP_INFO_C__) +#ifdef G_OS_UNIX g_desktop_app_info_new_from_filename g_desktop_app_info_new g_desktop_app_info_get_type G_GNUC_CONST g_desktop_app_info_get_is_hidden #endif #endif +#endif #if IN_HEADER(__G_ASYNC_RESULT_H__) diff --git a/gio/makefile.msc b/gio/makefile.msc index 8f546c42e..78348ccce 100644 --- a/gio/makefile.msc +++ b/gio/makefile.msc @@ -22,7 +22,8 @@ INCLUDES = \ DEFINES = \ -DG_LOG_DOMAIN=\"GLib-GIO\" \ - -DGIO_MODULE_DIR=\"$(libdir)/gio/modules\" + -DGIO_MODULE_DIR=\"$(libdir)/gio/modules\" \ + -DGIO_COMPILATION appinfo_sources = \ gwin32appinfo.c gwin32appinfo.h @@ -78,6 +79,7 @@ OBJECTS = \ gcontenttype.obj \ gdatainputstream.obj \ gdataoutputstream.obj \ +# gdesktopappinfo.obj \ gdirectorymonitor.obj \ gdrive.obj \ gdummyfile.obj \ @@ -101,6 +103,7 @@ OBJECTS = \ gloadableicon.obj \ gmemoryinputstream.obj \ gmemoryoutputstream.obj \ + gmount.obj \ gmountoperation.obj \ gnativevolumemonitor.obj \ goutputstream.obj \ |