comparison nt/config.inc.samp @ 2500:3d8143fc88e1

[xemacs-hg @ 2005-01-24 23:33:30 by ben] get working with VC7 config.inc.samp: Declare OPTIONAL_LIBRARY_DIR as root of library directories. Redo all graphics library defaults to mirror the versions and directories in the current binary aux distribution on xemacs web site. Enable TIFF and COMPFACE by default since you can now compile with them and binary libs are provided. xemacs.mak: Put our own directories first in case of conflict (e.g. config.h in compface). xemacs.mak: Use MSVCRT to avoid link problems. s/windowsnt.h: bytecode.c, print.c: Add casts to avoid warning. compiler.h: Add MSC_VERSION and include definitions of DOESNT_RETURN and friends here, like for GCC. Need different definitions for VC7 and VC6. s/windowsnt.h: Remove stuff moved to compiler.h. Disable warning 4646 ("function declared with __declspec(noreturn) has non-void return type") on VC7 since lots of Lisp primitives trigger this and there is no easy way to kludge around the warning. glyphs-eimage.c: Some really nasty hacks to allow TIFF and JPEG to both be compiled. #### The better solution is to move the TIFF and JPEG code to different files. glyphs-msw.c: Define __STDC__ to avoid problems with compface.h. intl-auto-encap-win32.c, intl-auto-encap-win32.h, intl-encap-win32.c, syswindows.h: Those wankers at Microsoft cannot leave well enough alone. Various functions change parameter types semi-randomly between VC6 and VC7, so we need to include our own versions that can handle both kinds with appropriate casting. EmacsFrame.c, EmacsShell-sub.c, EmacsShell.c, alloc.c, alloca.c, buffer.c, bytecode.c, charset.h, chartab.c, cm.c, console-stream.c, console.c, data.c, debug.h, device-msw.c, device-tty.c, device-x.c, doprnt.c, dumper.c, dynarr.c, elhash.c, emacs.c, eval.c, event-Xt.c, event-gtk.c, event-msw.c, event-stream.c, events.c, extents.c, faces.c, file-coding.c, fileio.c, fns.c, font-lock.c, frame-gtk.c, frame-x.c, frame.c, free-hook.c, gccache-gtk.c, glyphs-eimage.c, glyphs-gtk.c, glyphs-msw.c, glyphs-x.c, glyphs.c, gtk-glue.c, gutter.c, input-method-xlib.c, insdel.c, intl-win32.c, keymap.c, lisp.h, lread.c, lstream.c, macros.c, malloc.c, menubar-gtk.c, menubar-msw.c, menubar-x.c, mule-coding.c, native-gtk-toolbar.c, number.c, objects-msw.c, objects.c, print.c, process-nt.c, process-unix.c, process.c, ralloc.c, rangetab.c, redisplay-gtk.c, redisplay-msw.c, redisplay-output.c, redisplay-tty.c, redisplay-x.c, redisplay.c, regex.c, scrollbar-gtk.c, scrollbar-x.c, search.c, select-x.c, signal.c, specifier.c, specifier.h, strftime.c, sunplay.c, symbols.c, sysdep.c, sysproc.h, text.c, text.h, toolbar-common.c, toolbar-msw.c, toolbar.c, ui-gtk.c, unexnt.c, unicode.c, win32.c, window.c, xgccache.c, s/windowsnt.h: abort() -> ABORT(). Eliminate preprocessor games with abort() since it creates huge problems in VC7, solvable only by including massive amounts of files in every compile (and not worth it).
author ben
date Mon, 24 Jan 2005 23:34:34 +0000
parents 3227a97effa8
children bc47870c97c2
comparison
equal deleted inserted replaced
2499:4c5ee4d2e921 2500:3d8143fc88e1
23 GTK_DIR= 23 GTK_DIR=
24 24
25 ############################################################################ 25 ############################################################################
26 # Compiled-in features: graphics formats # 26 # Compiled-in features: graphics formats #
27 ############################################################################ 27 ############################################################################
28
29 # Directory under which the optional libraries are placed. To make your
30 # life easy, just grab http://ftp.xemacs.org/aux/optional-libs.exe
31 # (a self-installing .ZIP) and unzip them into an appropriate directory
32 # (by default, c:\src). This gets you precompiled versions of all of
33 # the libraries below.
34 OPTIONAL_LIBRARY_DIR=c:\src
28 35
29 # Set this to enable XPM support (virtually mandatory), and specify 36 # Set this to enable XPM support (virtually mandatory), and specify
30 # the directory containing xpm. Get the library from 37 # the directory containing xpm. Get the library from
31 # http://ftp.xemacs.org/aux/xpm-3.4k.tar.gz. 38 # http://ftp.xemacs.org/aux/xpm-3.4k.tar.gz.
32 HAVE_XPM=1 39 HAVE_XPM=1
33 XPM_DIR=c:\src\xpm-3.4k 40 XPM_DIR=$(OPTIONAL_LIBRARY_DIR)\xpm-3.4k
34 41
35 # Set this to enable GIF support (built-in). 42 # Set this to enable GIF support (built-in).
36 HAVE_GIF=1 43 HAVE_GIF=1
37 44
38 # Set this to enable PNG support (virtually mandatory), and specify 45 # Set this to enable PNG support (virtually mandatory), and specify
39 # the directories containing png and zlib. Get the latest version from 46 # the directories containing png and zlib. Get the latest version from
40 # ftp://ftp.uu.net/graphics/png/. You will have to rename the zlib directory 47 # ftp://ftp.uu.net/graphics/png/. NOTE: In order to compile libpng,
41 # from zlib-1.1.4 or whatever to just `zlib' for the build to work. 48 # you will have to rename the zlib directory to just `zlib'. We don't
49 # do that here so we can preserve the version number, like for the other
50 # libraries.
42 HAVE_PNG=1 51 HAVE_PNG=1
43 PNG_DIR=c:\src\libpng-1.2.5 52 PNG_DIR=$(OPTIONAL_LIBRARY_DIR)\libpng-1.2.8
44 ZLIB_DIR=c:\src\zlib 53 ZLIB_DIR=$(OPTIONAL_LIBRARY_DIR)\zlib-1.2.1
45 54
46 # Set this to enable TIFF support, and specify the directory containing tiff. 55 # Set this to enable JPEG support (useful, but not necessary), and specify
47 # Get the latest version from ftp://ftp.uu.net/graphics/tiff/. Not on by 56 # the directory containing jpeg. Get the latest version from
48 # default since TIFF isn't really very important. 57 # ftp://ftp.uu.net/graphics/jpeg/.
49 HAVE_TIFF=0
50 TIFF_DIR=c:\src\tiff-v3.5.7
51
52 # Set this to enable JPEG support, and specify the directory containing jpeg.
53 # Get the latest version from ftp://ftp.uu.net/graphics/jpeg/.
54 HAVE_JPEG=1 58 HAVE_JPEG=1
55 JPEG_DIR=c:\src\jpeg-6b 59 JPEG_DIR=$(OPTIONAL_LIBRARY_DIR)\jpeg-6b
56 60
57 # Set this to enable XFace support, and specify the directory containing 61 # Set this to enable TIFF support (not very important), and specify the
58 # compface. Get the library from http://ftp.xemacs.org/aux/compface.tar.gz. 62 # directory containing tiff. Get the latest version from
59 HAVE_XFACE=0 63 # ftp://ftp.uu.net/graphics/tiff/.
60 COMPFACE_DIR= 64 HAVE_TIFF=1
65 TIFF_DIR=$(OPTIONAL_LIBRARY_DIR)\tiff-v3.5.7
66
67 # Set this to enable XFace support (not very important), and specify the
68 # directory containing compface. Get the library from
69 # http://ftp.xemacs.org/aux/compface-1.5.tar.gz.
70 HAVE_XFACE=1
71 COMPFACE_DIR=$(OPTIONAL_LIBRARY_DIR)\compface-1.5
61 72
62 ############################################################################ 73 ############################################################################
63 # Build settings # 74 # Build settings #
64 ############################################################################ 75 ############################################################################
65 76