+2004-10-29 Hans Breuer <hans@breuer.org>
+
+ * glibconfig.h */makefile.msc.in : updated [and finally fixed my
+ script to produce ready to go de-in(ed) files, w/o autotools]
+
+ * */*.rc.in : updated copyrights to 2004
+
+ * glib/gutils.c : some CSIDL_* defines lacking from older SDK;
+ use the same fallback mecahnism as on *NIX where ever applicable
+
2004-10-29 Matthias Clasen <mclasen@redhat.com>
* tests/option-test.c: Add tests for the handling of
+2004-10-29 Hans Breuer <hans@breuer.org>
+
+ * glibconfig.h */makefile.msc.in : updated [and finally fixed my
+ script to produce ready to go de-in(ed) files, w/o autotools]
+
+ * */*.rc.in : updated copyrights to 2004
+
+ * glib/gutils.c : some CSIDL_* defines lacking from older SDK;
+ use the same fallback mecahnism as on *NIX where ever applicable
+
2004-10-29 Matthias Clasen <mclasen@redhat.com>
* tests/option-test.c: Add tests for the handling of
+2004-10-29 Hans Breuer <hans@breuer.org>
+
+ * glibconfig.h */makefile.msc.in : updated [and finally fixed my
+ script to produce ready to go de-in(ed) files, w/o autotools]
+
+ * */*.rc.in : updated copyrights to 2004
+
+ * glib/gutils.c : some CSIDL_* defines lacking from older SDK;
+ use the same fallback mecahnism as on *NIX where ever applicable
+
2004-10-29 Matthias Clasen <mclasen@redhat.com>
* tests/option-test.c: Add tests for the handling of
+2004-10-29 Hans Breuer <hans@breuer.org>
+
+ * glibconfig.h */makefile.msc.in : updated [and finally fixed my
+ script to produce ready to go de-in(ed) files, w/o autotools]
+
+ * */*.rc.in : updated copyrights to 2004
+
+ * glib/gutils.c : some CSIDL_* defines lacking from older SDK;
+ use the same fallback mecahnism as on *NIX where ever applicable
+
2004-10-29 Matthias Clasen <mclasen@redhat.com>
* tests/option-test.c: Add tests for the handling of
+2004-10-29 Hans Breuer <hans@breuer.org>
+
+ * glibconfig.h */makefile.msc.in : updated [and finally fixed my
+ script to produce ready to go de-in(ed) files, w/o autotools]
+
+ * */*.rc.in : updated copyrights to 2004
+
+ * glib/gutils.c : some CSIDL_* defines lacking from older SDK;
+ use the same fallback mecahnism as on *NIX where ever applicable
+
2004-10-29 Matthias Clasen <mclasen@redhat.com>
* tests/option-test.c: Add tests for the handling of
VALUE "FileDescription", "GLib"
VALUE "FileVersion", "@GLIB_VERSION@.BUILDNUMBER"
VALUE "InternalName", "libglib-2.0-@LT_CURRENT_MINUS_AGE@"
- VALUE "LegalCopyright", "Copyright © 1995-1997 Peter Mattis, Spencer Kimball and Josh MacDonald. Modified by the GLib Team and others 1997-2000."
+ VALUE "LegalCopyright", "Copyright © 1995-1997 Peter Mattis, Spencer Kimball and Josh MacDonald. Modified by the GLib Team and others 1997-2004."
VALUE "OriginalFilename", "libglib-2.0-@LT_CURRENT_MINUS_AGE@.dll"
VALUE "ProductName", "GLib"
VALUE "ProductVersion", "@GLIB_VERSION@"
#ifdef G_OS_WIN32
# include <direct.h>
# include <shlobj.h>
+ /* older SDK (e.g. msvc 5.0) does not have these*/
+# ifndef CSIDL_INTERNET_CACHE
+# define CSIDL_INTERNET_CACHE 32
+# endif
+# ifndef CSIDL_COMMON_APPDATA
+# define CSIDL_COMMON_APPDATA 35
+# endif
+# ifndef CSIDL_COMMON_DOCUMENTS
+# define CSIDL_COMMON_DOCUMENTS 46
+# endif
+# ifndef CSIDL_PROFILE
+# define CSIDL_PROFILE 40
+# endif
#endif
#ifdef HAVE_CODESET
}
CoTaskMemFree (pidl);
}
- if (retval == NULL)
- return "C:\\";
- else
- return retval;
+ return retval;
}
#endif
if (!g_home_dir)
g_home_dir = get_special_folder (CSIDL_PROFILE);
-
+
if (!g_home_dir)
{
/* At least at some time, HOMEDRIVE and HOMEPATH were used
data_dir = get_special_folder (CSIDL_PERSONAL);
#else
data_dir = (gchar *) g_getenv ("XDG_DATA_HOME");
+#endif
if (data_dir && data_dir[0])
data_dir = g_strdup (data_dir);
data_dir = g_build_filename (g_home_dir, ".local",
"share", NULL);
}
-#endif
+
g_user_data_dir = data_dir;
}
else
config_dir = get_special_folder (CSIDL_APPDATA);
#else
config_dir = (gchar *) g_getenv ("XDG_CONFIG_HOME");
-
+#endif
+
if (config_dir && config_dir[0])
config_dir = g_strdup (config_dir);
else
config_dir = g_build_filename (g_home_dir, ".config", NULL);
}
-#endif
g_user_config_dir = config_dir;
}
else
cache_dir = get_special_folder (CSIDL_INTERNET_CACHE); /* XXX correct? */
#else
cache_dir = (gchar *) g_getenv ("XDG_CACHE_HOME");
-
+#endif
if (cache_dir && cache_dir[0])
cache_dir = g_strdup (cache_dir);
else
cache_dir = g_build_filename (g_home_dir, ".cache", NULL);
}
-#endif
g_user_cache_dir = cache_dir;
}
else
gfileutils.obj \
ghash.obj \
ghook.obj \
+ gkeyfile.obj \
giochannel.obj \
giowin32.obj \
glist.obj \
gshell.obj \
gslist.obj \
gspawn-win32.obj \
+ gstdio.obj \
gstrfuncs.obj \
gstring.obj \
gthread.obj \
..\config.h: ..\config.h.win32
copy ..\config.h.win32 ..\config.h
+galias.h: glib.symbols
+ perl makegalias.pl < glib.symbols > galias.h
+
localcharset.c : libcharset/localcharset.c
copy libcharset\localcharset.c localcharset.c
+glib.def: glib.symbols
+ echo EXPORTS > glib.def
+ cl /EP -DINCLUDE_VARIABLES -DG_OS_WIN32 -DINCLUDE_INTERNAL_SYMBOLS glib.symbols >> glib.def
+
+glib.res : glib.rc
+ rc -DBUILDNUMBER=0 -r -fo glib.res glib.rc
+
################ glib
# create a static libary
glib-@GLIB_MAJOR_VERSION@.@GLIB_MINOR_VERSION@s.lib : $(glib_OBJECTS) gnulib\gnulib.lib
lib /out:glib-@GLIB_MAJOR_VERSION@.@GLIB_MINOR_VERSION@s.lib $(glib_OBJECTS) gnulib\gnulib.lib
-libglib-2.0-@LT_CURRENT_MINUS_AGE@.dll : $(glib_OBJECTS) gnulib\gnulib.lib glib.def
- $(CC) $(CFLAGS) -LD -Fe$@ $(glib_OBJECTS) $(LIBICONV_LIBS) $(INTL_LIBS) \
- gnulib\gnulib.lib $(DIRENT_LIBS) user32.lib advapi32.lib shell32.lib wsock32.lib $(LDFLAGS) /implib:glib-2.0.lib /def:glib.def
+libglib-2.0-@LT_CURRENT_MINUS_AGE@.dll : $(glib_OBJECTS) gnulib\gnulib.lib glib.def glib.res
+ $(CC) $(CFLAGS) -LD -Fe$@ $(glib_OBJECTS) glib.res $(LIBICONV_LIBS) $(INTL_LIBS) \
+ gnulib\gnulib.lib $(DIRENT_LIBS) user32.lib advapi32.lib shell32.lib wsock32.lib ole32.lib $(LDFLAGS) /implib:glib-2.0.lib /def:glib.def
gspawn-win32-helper.exe : gspawn-win32-helper.c libglib-2.0-@LT_CURRENT_MINUS_AGE@.dll
$(CC) $(CFLAGS) -Fe$@ -DG_LOG_DOMAIN=\"gspawn-win32-helper\" gspawn-win32-helper.c glib-2.0.lib $(LDFLAGS) /subsystem:windows user32.lib
#define __G_LIBCONFIG_H__
#include <glib/gmacros.h>
-
+#ifndef __GNUC__
+#define G_GNUC_INTERNAL /* wont have that */
+#endif
#include <limits.h>
#include <float.h>
VALUE "FileDescription", "GModule"
VALUE "FileVersion", "@GLIB_VERSION@.BUILDNUMBER"
VALUE "InternalName", "libgmodule-2.0-@LT_CURRENT_MINUS_AGE@"
- VALUE "LegalCopyright", "Copyright © 1998-2000 Tim Janik. Modified by the GLib Team and others 1998-2000."
+ VALUE "LegalCopyright", "Copyright © 1998-2000 Tim Janik. Modified by the GLib Team and others 1998-2004."
VALUE "OriginalFilename", "libgmodule-2.0-@LT_CURRENT_MINUS_AGE@.dll"
VALUE "ProductName", "GLib"
VALUE "ProductVersion", "@GLIB_VERSION@"
gmoduleconf.h: gmoduleconf.h.win32
copy gmoduleconf.h.win32 gmoduleconf.h
-libgmodule-2.0-@LT_CURRENT_MINUS_AGE@.dll : $(gmodule_OBJECTS) gmodule.def
- $(CC) $(CFLAGS) -LD -Fe$@ $(gmodule_OBJECTS) \
+gmodule.res : gmodule.rc
+ rc -DBUILDNUMBER=0 -r -fo gmodule.res gmodule.rc
+
+libgmodule-2.0-@LT_CURRENT_MINUS_AGE@.dll : $(gmodule_OBJECTS) gmodule.def gmodule.res
+ $(CC) $(CFLAGS) -LD -Fe$@ $(gmodule_OBJECTS) gmodule.res \
..\glib\glib-2.0.lib $(LDFLAGS) /implib:gmodule-2.0.lib /def:gmodule.def
clean::
VALUE "FileDescription", "GObject"
VALUE "FileVersion", "@GLIB_VERSION@.BUILDNUMBER"
VALUE "InternalName", "libgobject-2.0-@LT_CURRENT_MINUS_AGE@"
- VALUE "LegalCopyright", "Copyright © 1998-2000 Tim Janik and Red Hat, Inc."
+ VALUE "LegalCopyright", "Copyright © 1998-2004 Tim Janik and Red Hat, Inc."
VALUE "OriginalFilename", "libgobject-2.0-@LT_CURRENT_MINUS_AGE@.dll"
VALUE "ProductName", "GLib"
VALUE "ProductVersion", "@GLIB_VERSION@"
gobject-query.exe \
libgobject-2.0-@LT_CURRENT_MINUS_AGE@.dll \
gobject-@GLIB_MAJOR_VERSION@.@GLIB_MINOR_VERSION@s.lib \
- testgobject.exe \
- testoverride.exe
+ testgobject.exe
gobject_OBJECTS = \
gboxed.obj \
gvaluetypes.obj \
gvaluetransform.obj
+gobjectalias.h: gobject.symbols
+ perl makegobjectalias.pl < gobject.symbols > gobjectalias.h
+
+gobject.def: gobject.symbols
+ echo EXPORTS > gobject.def
+ cl /EP -DINCLUDE_VARIABLES -DG_OS_WIN32 gobject.symbols >> gobject.def
+
+gobject.res : gobject.rc
+ rc -DBUILDNUMBER=0 -r -fo gobject.res gobject.rc
+
gmarshal.h : gmarshal.list glib-genmarshal.exe
echo #ifndef __G_MARSHAL_H__ > xgen-gmh
echo #define __G_MARSHAL_H__ >> xgen-gmh
gmarshal.c: gmarshal.list gmarshal.h glib-genmarshal.exe
glib-genmarshal --nostdinc --prefix=g_cclosure_marshal gmarshal.list --body > gmarshal.c
-libgobject-2.0-@LT_CURRENT_MINUS_AGE@.dll : $(gobject_OBJECTS) gobject.def
- $(CC) $(CFLAGS) -Fm -LD -Fe$@ $(gobject_OBJECTS) \
+libgobject-2.0-@LT_CURRENT_MINUS_AGE@.dll : $(gobject_OBJECTS) gobject.def gobject.res
+ $(CC) $(CFLAGS) -Fm -LD -Fe$@ $(gobject_OBJECTS) gobject.res \
..\glib\glib-2.0.lib $(LDFLAGS) /implib:gobject-2.0.lib /def:gobject.def
gobject-@GLIB_MAJOR_VERSION@.@GLIB_MINOR_VERSION@s.lib : $(gobject_OBJECTS)
# link glib's static version to avoid installing
glib-genmarshal.exe : glib-genmarshal.c gmarshal.strings
$(CC) -Fe$@ $(CFLAGS) -UGOBJECT_COMPILATION glib-genmarshal.c \
- ..\glib\glib-@GLIB_MAJOR_VERSION@.@GLIB_MINOR_VERSION@s.lib user32.lib advapi32.lib $(INTL_LIBS) $(LIBICONV_LIBS)
+ ..\glib\glib-@GLIB_MAJOR_VERSION@.@GLIB_MINOR_VERSION@s.lib user32.lib advapi32.lib ole32.lib shell32.lib $(INTL_LIBS) $(LIBICONV_LIBS)
gobject-query.exe : gobject-query.c libgobject-2.0-@LT_CURRENT_MINUS_AGE@.dll
$(CC) -Fe$@ $(CFLAGS) -UGOBJECT_COMPILATION gobject-query.c \
VALUE "FileDescription", "GThread"
VALUE "FileVersion", "@GLIB_VERSION@.BUILDNUMBER"
VALUE "InternalName", "libgthread-2.0-@LT_CURRENT_MINUS_AGE@"
- VALUE "LegalCopyright", "Copyright © 1995-1997 Peter Mattis, Spencer Kimball and Josh MacDonald. Copyright © 1998 Sebastian Wilhelmi. Modified by the GLib Team and others 1997-2000."
+ VALUE "LegalCopyright", "Copyright © 1995-1997 Peter Mattis, Spencer Kimball and Josh MacDonald. Copyright © 1998 Sebastian Wilhelmi. Modified by the GLib Team and others 1997-2004."
VALUE "OriginalFilename", "libgthread-2.0-@LT_CURRENT_MINUS_AGE@.dll"
VALUE "ProductName", "GLib"
VALUE "ProductVersion", "@GLIB_VERSION@"
gthread-impl.obj : gthread-impl.c gthread-win32.c
$(CC) -c $(CFLAGS) gthread-impl.c
-libgthread-2.0-@LT_CURRENT_MINUS_AGE@.dll : $(gthread_OBJECTS) gthread.def
- $(CC) $(CFLAGS) -LD -Fe$@ $(gthread_OBJECTS) ..\glib\glib-2.0.lib $(DEPCLIBS) $(LDFLAGS) /implib:gthread-2.0.lib /def:gthread.def
+gthread.res : gthread.rc
+ rc -DBUILDNUMBER=0 -r -fo gthread.res gthread.rc
+
+libgthread-2.0-@LT_CURRENT_MINUS_AGE@.dll : $(gthread_OBJECTS) gthread.def gthread.res
+ $(CC) $(CFLAGS) -LD -Fe$@ $(gthread_OBJECTS) gthread.res \
+ ..\glib\glib-2.0.lib $(DEPCLIBS) $(LDFLAGS) /implib:gthread-2.0.lib /def:gthread.def