view nt/Win32.cf @ 5015:d95c102a96d3

cleanups for specifier font stages, from ben-unicode-internal (preparation for eliminating shadowed warnings) -------------------- ChangeLog entries follow: -------------------- src/ChangeLog addition: 2010-02-08 Ben Wing <ben@xemacs.org> * faces.c: * faces.c (face_property_matching_instance): * faces.c (ensure_face_cachel_contains_charset): * faces.h (FACE_FONT): * lisp.h: * lisp.h (enum font_specifier_matchspec_stages): * objects-msw.c: * objects-msw.c (mswindows_font_spec_matches_charset): * objects-msw.c (mswindows_find_charset_font): * objects-tty.c: * objects-tty.c (tty_font_spec_matches_charset): * objects-tty.c (tty_find_charset_font): * objects-xlike-inc.c: * objects-xlike-inc.c (XFUN): * objects-xlike-inc.c (xft_find_charset_font): * objects.c: * objects.c (font_instantiate): * objects.c (FROB): * specifier.c: * specifier.c (charset_matches_specifier_tag_set_p): * specifier.c (call_charset_predicate): * specifier.c (define_specifier_tag): * specifier.c (Fdefine_specifier_tag): * specifier.c (setup_charset_initial_specifier_tags): * specifier.c (specifier_instance_from_inst_list): * specifier.c (FROB): * specifier.c (vars_of_specifier): * specifier.h: Rename the specifier-font-matching stages in preparation for eliminating shadowed warnings, some other related fixes from ben-unicode-internal. 1. Rename raw enums: initial -> STAGE_INITIAL final -> STAGE_FINAL impossible -> NUM_MATCHSPEC_STAGES 2. Move `enum font_specifier_matchspec_stages' from specifier.h to lisp.h. 3. Whitespace changes to match coding standards. 4. Eliminate unused second argument STAGE in charset predicates that don't use it -- the code that calls the charset predicates is now smart enough to supply the right number of arguments automatically. 5. Add some long(ish) comments and authorial notices, esp. in objects.c. 6. In specifier.c, change Vcharset_tag_lists from a vector over leading bytes to a hash table over charsets. This change is unnecessary currently but doesn't hurt and will be required when we merge in Unicode-internal. 7. In specifier.c, extract out the code that calls charset predicates into a function call_charset_predicate().
author Ben Wing <ben@xemacs.org>
date Mon, 08 Feb 2010 16:51:25 -0600 (2010-02-08)
parents 43dd3413c7c7
children
line wrap: on
line source
XCOMM platform:  $XConsortium: Win32.cf /main/51 1996/12/19 14:20:08 lehors $

#ifndef OSName
#define OSName			Microsoft Windows NT 4.0
#endif
XCOMM operating system:  OSName
#ifndef OSMajorVersion
#define OSMajorVersion		4
#endif
#ifndef OSMinorVersion
#define OSMinorVersion		0
#endif
#ifndef OSTeenyVersion
#define OSTeenyVersion		0
#endif

#ifndef CompilerMajorVersion
/* 0 == NT 3.1 Win32 SDK, 2 == MSVC++ 2, 4 == MSVC 4 */
#define CompilerMajorVersion	4	
#endif

#define BootstrapCFlags		-DWIN32
#ifdef _M_IX86
#define CpuDefines -D_X86_
#endif
/* brain-damaged windows headers will not compile with -Za */
/*#define StandardDefines -DWIN32 -DWIN32_LEAN_AND_MEAN -D_DLL -D_MT -D__STDC__ CpuDefines*/
/* Try with single threaded libc --marcpa */
#define StandardDefines -DWIN32 -DWIN32_LEAN_AND_MEAN -D__STDC__ CpuDefines
#if CompilerMajorVersion < 4
#define DefaultCCOptions -nologo -batch -G4 -W2
#else
#define DefaultCCOptions -nologo -G4 -W2
#endif
#if CompilerMajorVersion < 4
#define DebuggableCDebugFlags -Zi
#else
#define DebuggableCDebugFlags -Zi -Od
#endif
#define ThreadedX		NO
#define HasThreadSafeAPI	NO
#define CpCmd copy
#define LnCmd copy
#define MvCmd ren
#define RmCmd del
#ifndef RmTreeCmd
/*#define RmTreeCmd del /q /s */
#define RmTreeCmd rm -rf
#endif
#define CcCmd cl
#define HasCplusplus		YES
#define CplusplusCmd cl
#if CompilerMajorVersion < 4
#define PreProcessCmd CcCmd -nologo -batch -EP
#define CppCmd  CcCmd -nologo -batch -E
#else
#define PreProcessCmd CcCmd -nologo -EP
#define CppCmd  CcCmd -nologo -E
#endif
#define PatheticCpp		YES
#define ConstructMFLAGS		YES
#if (CompilerMajorVersion == 0)
#define ArCmdBase lib32
#else
#define ArCmdBase lib
#endif
#define ArCmd ArCmdBase
#define CplusplusCmd cl
#define MkdirHierCmd mkdir
#define InstallCmd copy
#define InstPgmFlags /**/
#define InstBinFlags /**/
#define InstUidFlags /**/
#define InstLibFlags /**/
#define InstIncFlags /**/
#define InstManFlags /**/
#define InstDatFlags /**/
#define InstallFlags /**/
#if (CompilerMajorVersion == 0)
#define ExtraLibraries crtdll.lib kernel32.lib wsock32.lib
#elif (CompilerMajorVersion < 4)
#define ExtraLibraries msvcrt.lib kernel32.lib wsock32.lib
#else
/* Use LIBC.LIB instead of msvcrt.lib since we compile
   with non-thread version. --marcpa */
#define ExtraLibraries libc.lib kernel32.lib wsock32.lib -link -nodefaultlib:libc
#endif
#define MakeCmd nmake -nologo
#if (CompilerMajorVersion == 0)
#define LdCmd link32
#else
#define LdCmd link
#endif
#define MathLibrary
#define HasSymLinks		NO
#define HasPutenv		YES
#define Osuf obj
#ifndef CCsuf
#define CCsuf cxx
#endif
#define BuildServer		NO
#define ConnectionFlags		-DTCPCONN

/* override as necessary in site.def/host.def */
#ifndef StdIncDir
#define StdIncDir 		C:/MSDEVSTD/INCLUDE
#endif
#define LdPreLib /**/
#define LdPostLib /**/
#ifndef UseInstalled
#define ImakeCmd $(IMAKESRC:/=\)\imake
#define DependCmd $(DEPENDSRC:/=\)\makedepend
#endif
#define DependFlags -D_WIN32
#define FilesToClean *.bak *.obj *.lib make.log
#define ShLibDir $(BINDIR)

#define XFileSearchPathBase Concat4($(LIBDIR)/;L/;T/;N;C,;S:$(LIBDIR)/;l/;T/;N;C,;S:$(LIBDIR)/;T/;N;C,;S:$(LIBDIR)/;L/;T/;N;S:$(LIBDIR)/;l/;T/;N;S:$(LIBDIR)/;T/;N;S)

#define XawI18nDefines		-DHAS_WCHAR_H
#define UseRgbTxt  YES
#define HasCbrt NO
#define HasFfs NO
#define HasXdmAuth NO

/* the following components haven't been ported yet */
#define BuildLBX NO
#define BuildXprint NO
#define XprtServer NO

#include <Win32.rules>