1 diff -ur gettext-0.14.1-src\gettext-runtime/config.h.msvc svn-gettext-runtime/config.h.msvc
\r
2 --- gettext-0.14.1-src\gettext-runtime/config.h.msvc 2004-01-29 18:17:46.000000000 +0100
\r
3 +++ svn-gettext-runtime/config.h.msvc 2005-02-15 10:55:59.615625000 +0100
\r
7 /* Define if you have the iconv() function. */
\r
8 -#define HAVE_ICONV 1
\r
11 /* Define if you have the 'intmax_t' type in <stdint.h> or <inttypes.h>. */
\r
12 #undef HAVE_INTMAX_T
\r
13 diff -ur gettext-0.14.1-src\gettext-runtime/intl/Makefile.msvc svn-gettext-runtime/intl/Makefile.msvc
\r
14 --- gettext-0.14.1-src\gettext-runtime/intl/Makefile.msvc 2003-06-19 16:32:00.000000000 +0200
\r
15 +++ svn-gettext-runtime/intl/Makefile.msvc 2005-02-15 10:57:29.428125000 +0100
\r
19 # Some people prefer -O2 -G6 instead of -O1, but -O2 is not reliable in MSVC5.
\r
20 -OPTIMFLAGS = -D_NDEBUG -O1
\r
22 +OPTIMFLAGS = -FD -O2 -GX -Zi
\r
26 -CFLAGS = $(MFLAGS) $(WARN_CFLAGS) $(OPTIMFLAGS) -DHAVE_CONFIG_H -DLOCALEDIR=\"$(IIlocaledir)\" -DLOCALE_ALIAS_PATH=\"$(IIaliaspath)\" -DIN_LIBINTL -DENABLE_RELOCATABLE=1 -DIN_LIBRARY -DINSTALLDIR=\"$(IIbindir)\" -DNO_XMALLOC -Dset_relocation_prefix=libintl_set_relocation_prefix -Drelocate=libintl_relocate -DDEPENDS_ON_LIBICONV=1
\r
27 +CFLAGS = $(MFLAGS) $(WARN_CFLAGS) $(OPTIMFLAGS) -DHAVE_CONFIG_H -DLOCALEDIR=\"$(IIlocaledir)\" -DLOCALE_ALIAS_PATH=\"$(IIaliaspath)\" -DIN_LIBINTL -DENABLE_RELOCATABLE=1 -DIN_LIBRARY -DINSTALLDIR=\"$(IIbindir)\" -DNO_XMALLOC -Dset_relocation_prefix=libintl_set_relocation_prefix -Drelocate=libintl_relocate -DDEPENDS_ON_LIBICONV=0
\r
29 INCLUDES = -I. -I.. -I$(includedir)
\r
33 RESOURCES = intl.res
\r
35 -all : intl.lib libintl.h
\r
36 +all : intl3_svn.lib libintl.h
\r
40 @@ -183,18 +183,18 @@
\r
44 -intl.lib : $(OBJECTS)
\r
46 - $(AR) $(AR_FLAGS)intl.lib $(OBJECTS)
\r
47 +intl3_svn.lib : $(OBJECTS)
\r
48 + -$(RM) intl3_svn.lib
\r
49 + $(AR) $(AR_FLAGS)intl3_svn.lib $(OBJECTS)
\r
53 # intl.dll and intl.lib are created together.
\r
54 -intl.lib : $(OBJECTS) $(RESOURCES)
\r
55 - $(CC) $(MFLAGS) $(DEBUGFLAGS) -LD $(OBJECTS) $(libdir)\iconv.lib $(RESOURCES) -Feintl.dll
\r
56 +intl3_svn.lib : $(OBJECTS) $(RESOURCES)
\r
57 + $(CC) $(MFLAGS) $(DEBUGFLAGS) -LD $(OBJECTS) $(RESOURCES) -Feintl3_svn.dll
\r
59 intl.res : $(srcdir)\..\windows\intl.rc
\r
60 - rc -Fo intl.res $(srcdir)\..\windows\intl.rc
\r
61 + rc -Fo intl.res $(srcdir)\libintl3-dll.rc
\r