From 76642c27a5e056be9a46e3c80c46091a8e45d17b Mon Sep 17 00:00:00 2001 From: Hans Breuer Date: Sun, 23 Nov 2008 11:59:25 +0000 Subject: [PATCH] add -DG_DISABLE_DEPRECTAED; rule for localcharset.obj 2008-11-23 Hans Breuer * glib/makefile.msc.in : add -DG_DISABLE_DEPRECTAED; rule for localcharset.obj svn path=/branches/glib-2-18/; revision=7668 --- ChangeLog | 5 +++++ glib/makefile.msc.in | 6 +++--- 2 files changed, 8 insertions(+), 3 deletions(-) diff --git a/ChangeLog b/ChangeLog index 23656e891..0c8256a94 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,8 @@ +2008-11-23 Hans Breuer + + * glib/makefile.msc.in : add -DG_DISABLE_DEPRECTAED; rule for + localcharset.obj + 2008-11-21 Matthias Clasen * NEWS: Updates diff --git a/glib/makefile.msc.in b/glib/makefile.msc.in index ebaeff308..182511c92 100644 --- a/glib/makefile.msc.in +++ b/glib/makefile.msc.in @@ -8,7 +8,7 @@ TOP = ..\.. ################################################################ INCLUDES = -FImsvc_recommended_pragmas.h -I . -I .. -DEFINES = -DHAVE_CONFIG_H -DGLIB_COMPILATION -DG_LOG_DOMAIN=\"GLib\" -DG_ENABLE_DEBUG -DPCRE_STATIC +DEFINES = -DHAVE_CONFIG_H -DGLIB_COMPILATION -DG_LOG_DOMAIN=\"GLib\" -DG_ENABLE_DEBUG -DPCRE_STATIC -DG_DISABLE_DEPRECATED DEPCFLAGS = -Zm400 $(INTL_CFLAGS) $(DIRENT_CFLAGS) all : \ @@ -106,8 +106,8 @@ galias.h: glib.symbols galiasdef.c: glib.symbols perl makegalias.pl -def < glib.symbols > galiasdef.c -localcharset.c : libcharset/localcharset.c - copy libcharset\localcharset.c localcharset.c +localcharset.obj : libcharset\localcharset.c + $(CC) $(CFLAGS) -DLIBDIR=\".\" -c libcharset\localcharset.c glib.def: glib.symbols echo EXPORTS > glib.def