More tweaks for the Woe32 port.

Author: bhaible

ChangeLog

@@ -5,7 +5,8 @@
 	* src/Makefile.msvc (IIPREFIX, IIprefix, IIexec_prefix, IIbindir,
 	IIincludedir): New variables.
 	(INCLUDES): Add -I..\windows.
-	(iconv.exe): Define INSTALLPREFIX and INSTALLDIR.
+	(iconv.exe): Define INSTALLPREFIX and INSTALLDIR. Link with
+	../srclib/icrt.lib.
 	Patches by Perry Rapp.
 
 2003-05-07  Bruno Haible  <bruno@clisp.org>

README.woe32

@@ -24,16 +24,16 @@ Installation on Woe32 (WinNT/2000/XP, Win95/98/ME):
 
       For shared library (DLL):
 
-         nmake -f Makefile.msvc DLL=1 MFLAGS=-MD
+         nmake -f Makefile.msvc NO_NLS=1 DLL=1 MFLAGS=-MD
       or
-         nmake -f Makefile.msvc DLL=1 MFLAGS=-MD check
+         nmake -f Makefile.msvc NO_NLS=1 DLL=1 MFLAGS=-MD check
                                                    [This runs the testsuite.]
 
       For static library:
 
-         nmake -f Makefile.msvc
+         nmake -f Makefile.msvc NO_NLS=1
       or
-         nmake -f Makefile.msvc check               [This runs the testsuite.]
+         nmake -f Makefile.msvc NO_NLS=1 check     [This runs the testsuite.]
 
       If you want to build both the shared and static library, you have to
       unpack the libiconv sources twice in different directories. Don't mix
@@ -42,15 +42,15 @@ Installation on Woe32 (WinNT/2000/XP, Win95/98/ME):
 
       Install it:
 
-         nmake -f Makefile.msvc DLL=1 MFLAGS=-MD install
+         nmake -f Makefile.msvc NO_NLS=1 DLL=1 MFLAGS=-MD install
       or
-         nmake -f Makefile.msvc install
+         nmake -f Makefile.msvc NO_NLS=1 install
 
       Remove traces of this preliminary build:
 
-         nmake -f Makefile.msvc DLL=1 MFLAGS=-MD distclean
+         nmake -f Makefile.msvc NO_NLS=1 DLL=1 MFLAGS=-MD distclean
       or
-         nmake -f Makefile.msvc distclean
+         nmake -f Makefile.msvc NO_NLS=1 distclean
 
    Step 2: Build and install the GNU gettext package (version 0.12 or newer,
    libintl library and various programs) using the same MFLAGS. Then come

src/Makefile.msvc

@@ -87,8 +87,8 @@ SHELL = /bin/sh
 
 all : iconv.exe
 
-iconv.exe : $(srcdir)/iconv.c ../lib/iconv.lib
-	$(CC) $(INCLUDES) -I..\lib $(CFLAGS) -DINSTALLPREFIX=\"$(IIprefix)\" -DINSTALLDIR=\"$(IIbindir)\" $(srcdir)/iconv.c $(LIBINTL) ../lib/iconv.lib -Feiconv.exe
+iconv.exe : $(srcdir)/iconv.c ../srclib/icrt.lib ../lib/iconv.lib
+	$(CC) $(INCLUDES) -I..\lib $(CFLAGS) -DINSTALLPREFIX=\"$(IIprefix)\" -DINSTALLDIR=\"$(IIbindir)\" $(srcdir)/iconv.c ../srclib/icrt.lib $(LIBINTL) ../lib/iconv.lib -Feiconv.exe
 	$(RM) iconv.obj
 !if $(DLL)
 	copy ..\lib\iconv.dll iconv.dll