Mercurial > hg > xemacs-beta

changeset 817:ece8c2170578

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
[xemacs-hg @ 2002-04-23 00:44:29 by jhar] Default to using MSVCRT as the C runtime for xpm
author jhar
date Tue, 23 Apr 2002 00:44:30 +0000
parents 39b1580316c8
children accc481aef34
files nt/ChangeLog nt/README nt/xpm.mak
diffstat 3 files changed, 10 insertions(+), 11 deletions(-) [+]
line wrap: on
line diff
--- a/nt/ChangeLog	Mon Apr 15 09:42:19 2002 +0000
+++ b/nt/ChangeLog	Tue Apr 23 00:44:30 2002 +0000
@@ -1,3 +1,8 @@
+2002-04-23  Jonathan Harris  <jonathan@xemacs.org>
+
+	* README: Document build for latest versions of zlib & png
+	* xpm.mak: Default to using MSVCRT as the C runtime
+
 2002-04-14  Ben Wing  <ben@xemacs.org>
 
 	* config.inc.samp (HAVE_MS_WINDOWS):
--- a/nt/README	Mon Apr 15 09:42:19 2002 +0000
+++ b/nt/README	Tue Apr 23 00:44:30 2002 +0000
@@ -120,16 +120,15 @@
     xpm sources, cd to that directory and build xpm with 'nmake -f xpm.mak'.
 
 2.  You probably also want PNG image support. Grab the latest versions of zlib
-    and libpng (zlib-1.1.3 and libpng-1.0.2 at time of writing) from
+    and libpng (zlib-1.1.4 and libpng-1.0.9 at time of writing) from
     ftp://ftp.xemacs.org/pub/xemacs/aux/, unpack them somewhere and read
     the respective READMEs for details on how to build them.  The following
-    build procedure works for zlib-1.1.3 and libpng-1.0.2:
+    build procedure works for zlib-1.1.4 and libpng-1.0.9:
 
-    cd to the zlib directory, type 'copy msdos\makefile.w32 Makefile' and
-    then type 'nmake'.
+    cd to the zlib directory and type 'nmake -f msdos\makefile.w32'.
 
     cd to the libpng directory, rename or move the zlib directory to ..\zlib
-    and type 'nmake -f scripts\makefile.w32'.
+    and type 'nmake -f scripts\makefile.vcwin32'.
 
 3.  If you want TIFF support, grap the latest version of libtiff (tiff-v3.4
     at time of writing) from ftp://ftp.xemacs.org/pub/xemacs/aux/ and unpack
--- a/nt/xpm.mak	Mon Apr 15 09:42:19 2002 +0000
+++ b/nt/xpm.mak	Tue Apr 23 00:44:30 2002 +0000
@@ -10,7 +10,7 @@
 !endif
 
 !if !defined(USE_CRTDLL)
-USE_CRTDLL=0
+USE_CRTDLL=1
 !endif
 
 !if $(DEBUG)
@@ -67,9 +67,4 @@
 	mkdir ..\X11
 
 Xpm.lib: $(OBJS)
-!if $(USE_CRTDLL)
-# Target is ok, link builds lib as a side effect.
-	link -nologo -dll -def:xpm.def -out:Xpm.dll gdi32.lib $(OBJS) 
-!else
 	lib -nologo -out:$@ $(OBJS)
-!endif