annotate nt/Win32.cf @ 4916:a6c778975d7d

split USE_XFT into HAVE_XFT/USE_XFT -------------------- ChangeLog entries follow: -------------------- ChangeLog addition: 2010-02-01 Ben Wing <ben@xemacs.org> * configure: * configure.ac (TAB): USE_XFT* -> HAVE_XFT*. lwlib/ChangeLog addition: 2010-02-01 Ben Wing <ben@xemacs.org> * lwlib-colors.c: * lwlib-colors.h: * lwlib-fonts.c: * lwlib-fonts.h: * xlwmenu.c: * xlwmenu.c (xlwMenuResources): * xlwmenu.c (x_xft_text_width): * xlwmenu.c (label_button_draw): * xlwmenu.c (push_button_size): * xlwmenu.c (push_button_draw): * xlwmenu.c (make_drawing_gcs): * xlwmenu.c (extract_font_extents): * xlwmenu.c (default_font_of_font_list): * xlwmenu.c (XlwMenuInitialize): * xlwmenu.c (XlwMenuDestroy): * xlwmenu.c (XlwMenuSetValues): * xlwmenuP.h: * xlwmenuP.h (_XlwMenu_part): * xlwtabs.c: * xlwtabs.c (TabsInit): * xlwtabs.c (TabsDestroy): * xlwtabs.c (TabsSetValues): * xlwtabs.c (DrawTab): * xlwtabs.c (TabWidth): * xlwtabs.c (TabsAllocFgGC): * xlwtabs.c (TabsAllocGreyGC): * xlwtabsP.h: USE_XFT* -> HAVE_XFT*. src/ChangeLog addition: 2010-02-01 Ben Wing <ben@xemacs.org> * Makefile.in.in: * compiler.h: * config.h.in: * console-x-impl.h: * console-x-impl.h (struct x_frame): * console-x-impl.h (FRAME_X_TOTALLY_VISIBLE_P): * console-x.h: * console-xlike-inc.h: * emacs.c (main_1): * faces.c (complex_vars_of_faces): * font-mgr.h: * frame-x.c (x_delete_frame): * frame-x.c (x_update_frame_external_traits): * glyphs-x.c (update_widget_face): * inline.c: * objects-x-impl.h: * objects-x-impl.h (struct x_color_instance_data): * objects-x-impl.h (struct x_font_instance_data): * objects-x.c: * objects-x.c (x_initialize_color_instance): * objects-x.c (x_initialize_font_instance): * objects-x.c (x_print_font_instance): * objects-x.c (x_finalize_font_instance): * objects-x.c (x_font_instance_truename): * objects-x.c (vars_of_objects_x): * objects-x.h: USE_XFT* -> HAVE_XFT*. But in objects-xlike-inc.c and redisplay-xlike-inc.c, continue to use USE_XFT, and define it appropriately in console-xlike-inc.h when both HAVE_XFT and THIS_IS_X -- even if HAVE_XFT, we don't want to enable XFT code when included in a *-gtk.c file.
author Ben Wing <ben@xemacs.org>
date Mon, 01 Feb 2010 22:00:29 -0600
parents 43dd3413c7c7
children
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
rev   line source
155
43dd3413c7c7 Import from CVS: tag r20-3b4
cvs
parents:
diff changeset
1 XCOMM platform: $XConsortium: Win32.cf /main/51 1996/12/19 14:20:08 lehors $
43dd3413c7c7 Import from CVS: tag r20-3b4
cvs
parents:
diff changeset
2
43dd3413c7c7 Import from CVS: tag r20-3b4
cvs
parents:
diff changeset
3 #ifndef OSName
43dd3413c7c7 Import from CVS: tag r20-3b4
cvs
parents:
diff changeset
4 #define OSName Microsoft Windows NT 4.0
43dd3413c7c7 Import from CVS: tag r20-3b4
cvs
parents:
diff changeset
5 #endif
43dd3413c7c7 Import from CVS: tag r20-3b4
cvs
parents:
diff changeset
6 XCOMM operating system: OSName
43dd3413c7c7 Import from CVS: tag r20-3b4
cvs
parents:
diff changeset
7 #ifndef OSMajorVersion
43dd3413c7c7 Import from CVS: tag r20-3b4
cvs
parents:
diff changeset
8 #define OSMajorVersion 4
43dd3413c7c7 Import from CVS: tag r20-3b4
cvs
parents:
diff changeset
9 #endif
43dd3413c7c7 Import from CVS: tag r20-3b4
cvs
parents:
diff changeset
10 #ifndef OSMinorVersion
43dd3413c7c7 Import from CVS: tag r20-3b4
cvs
parents:
diff changeset
11 #define OSMinorVersion 0
43dd3413c7c7 Import from CVS: tag r20-3b4
cvs
parents:
diff changeset
12 #endif
43dd3413c7c7 Import from CVS: tag r20-3b4
cvs
parents:
diff changeset
13 #ifndef OSTeenyVersion
43dd3413c7c7 Import from CVS: tag r20-3b4
cvs
parents:
diff changeset
14 #define OSTeenyVersion 0
43dd3413c7c7 Import from CVS: tag r20-3b4
cvs
parents:
diff changeset
15 #endif
43dd3413c7c7 Import from CVS: tag r20-3b4
cvs
parents:
diff changeset
16
43dd3413c7c7 Import from CVS: tag r20-3b4
cvs
parents:
diff changeset
17 #ifndef CompilerMajorVersion
43dd3413c7c7 Import from CVS: tag r20-3b4
cvs
parents:
diff changeset
18 /* 0 == NT 3.1 Win32 SDK, 2 == MSVC++ 2, 4 == MSVC 4 */
43dd3413c7c7 Import from CVS: tag r20-3b4
cvs
parents:
diff changeset
19 #define CompilerMajorVersion 4
43dd3413c7c7 Import from CVS: tag r20-3b4
cvs
parents:
diff changeset
20 #endif
43dd3413c7c7 Import from CVS: tag r20-3b4
cvs
parents:
diff changeset
21
43dd3413c7c7 Import from CVS: tag r20-3b4
cvs
parents:
diff changeset
22 #define BootstrapCFlags -DWIN32
43dd3413c7c7 Import from CVS: tag r20-3b4
cvs
parents:
diff changeset
23 #ifdef _M_IX86
43dd3413c7c7 Import from CVS: tag r20-3b4
cvs
parents:
diff changeset
24 #define CpuDefines -D_X86_
43dd3413c7c7 Import from CVS: tag r20-3b4
cvs
parents:
diff changeset
25 #endif
43dd3413c7c7 Import from CVS: tag r20-3b4
cvs
parents:
diff changeset
26 /* brain-damaged windows headers will not compile with -Za */
43dd3413c7c7 Import from CVS: tag r20-3b4
cvs
parents:
diff changeset
27 /*#define StandardDefines -DWIN32 -DWIN32_LEAN_AND_MEAN -D_DLL -D_MT -D__STDC__ CpuDefines*/
43dd3413c7c7 Import from CVS: tag r20-3b4
cvs
parents:
diff changeset
28 /* Try with single threaded libc --marcpa */
43dd3413c7c7 Import from CVS: tag r20-3b4
cvs
parents:
diff changeset
29 #define StandardDefines -DWIN32 -DWIN32_LEAN_AND_MEAN -D__STDC__ CpuDefines
43dd3413c7c7 Import from CVS: tag r20-3b4
cvs
parents:
diff changeset
30 #if CompilerMajorVersion < 4
43dd3413c7c7 Import from CVS: tag r20-3b4
cvs
parents:
diff changeset
31 #define DefaultCCOptions -nologo -batch -G4 -W2
43dd3413c7c7 Import from CVS: tag r20-3b4
cvs
parents:
diff changeset
32 #else
43dd3413c7c7 Import from CVS: tag r20-3b4
cvs
parents:
diff changeset
33 #define DefaultCCOptions -nologo -G4 -W2
43dd3413c7c7 Import from CVS: tag r20-3b4
cvs
parents:
diff changeset
34 #endif
43dd3413c7c7 Import from CVS: tag r20-3b4
cvs
parents:
diff changeset
35 #if CompilerMajorVersion < 4
43dd3413c7c7 Import from CVS: tag r20-3b4
cvs
parents:
diff changeset
36 #define DebuggableCDebugFlags -Zi
43dd3413c7c7 Import from CVS: tag r20-3b4
cvs
parents:
diff changeset
37 #else
43dd3413c7c7 Import from CVS: tag r20-3b4
cvs
parents:
diff changeset
38 #define DebuggableCDebugFlags -Zi -Od
43dd3413c7c7 Import from CVS: tag r20-3b4
cvs
parents:
diff changeset
39 #endif
43dd3413c7c7 Import from CVS: tag r20-3b4
cvs
parents:
diff changeset
40 #define ThreadedX NO
43dd3413c7c7 Import from CVS: tag r20-3b4
cvs
parents:
diff changeset
41 #define HasThreadSafeAPI NO
43dd3413c7c7 Import from CVS: tag r20-3b4
cvs
parents:
diff changeset
42 #define CpCmd copy
43dd3413c7c7 Import from CVS: tag r20-3b4
cvs
parents:
diff changeset
43 #define LnCmd copy
43dd3413c7c7 Import from CVS: tag r20-3b4
cvs
parents:
diff changeset
44 #define MvCmd ren
43dd3413c7c7 Import from CVS: tag r20-3b4
cvs
parents:
diff changeset
45 #define RmCmd del
43dd3413c7c7 Import from CVS: tag r20-3b4
cvs
parents:
diff changeset
46 #ifndef RmTreeCmd
43dd3413c7c7 Import from CVS: tag r20-3b4
cvs
parents:
diff changeset
47 /*#define RmTreeCmd del /q /s */
43dd3413c7c7 Import from CVS: tag r20-3b4
cvs
parents:
diff changeset
48 #define RmTreeCmd rm -rf
43dd3413c7c7 Import from CVS: tag r20-3b4
cvs
parents:
diff changeset
49 #endif
43dd3413c7c7 Import from CVS: tag r20-3b4
cvs
parents:
diff changeset
50 #define CcCmd cl
43dd3413c7c7 Import from CVS: tag r20-3b4
cvs
parents:
diff changeset
51 #define HasCplusplus YES
43dd3413c7c7 Import from CVS: tag r20-3b4
cvs
parents:
diff changeset
52 #define CplusplusCmd cl
43dd3413c7c7 Import from CVS: tag r20-3b4
cvs
parents:
diff changeset
53 #if CompilerMajorVersion < 4
43dd3413c7c7 Import from CVS: tag r20-3b4
cvs
parents:
diff changeset
54 #define PreProcessCmd CcCmd -nologo -batch -EP
43dd3413c7c7 Import from CVS: tag r20-3b4
cvs
parents:
diff changeset
55 #define CppCmd CcCmd -nologo -batch -E
43dd3413c7c7 Import from CVS: tag r20-3b4
cvs
parents:
diff changeset
56 #else
43dd3413c7c7 Import from CVS: tag r20-3b4
cvs
parents:
diff changeset
57 #define PreProcessCmd CcCmd -nologo -EP
43dd3413c7c7 Import from CVS: tag r20-3b4
cvs
parents:
diff changeset
58 #define CppCmd CcCmd -nologo -E
43dd3413c7c7 Import from CVS: tag r20-3b4
cvs
parents:
diff changeset
59 #endif
43dd3413c7c7 Import from CVS: tag r20-3b4
cvs
parents:
diff changeset
60 #define PatheticCpp YES
43dd3413c7c7 Import from CVS: tag r20-3b4
cvs
parents:
diff changeset
61 #define ConstructMFLAGS YES
43dd3413c7c7 Import from CVS: tag r20-3b4
cvs
parents:
diff changeset
62 #if (CompilerMajorVersion == 0)
43dd3413c7c7 Import from CVS: tag r20-3b4
cvs
parents:
diff changeset
63 #define ArCmdBase lib32
43dd3413c7c7 Import from CVS: tag r20-3b4
cvs
parents:
diff changeset
64 #else
43dd3413c7c7 Import from CVS: tag r20-3b4
cvs
parents:
diff changeset
65 #define ArCmdBase lib
43dd3413c7c7 Import from CVS: tag r20-3b4
cvs
parents:
diff changeset
66 #endif
43dd3413c7c7 Import from CVS: tag r20-3b4
cvs
parents:
diff changeset
67 #define ArCmd ArCmdBase
43dd3413c7c7 Import from CVS: tag r20-3b4
cvs
parents:
diff changeset
68 #define CplusplusCmd cl
43dd3413c7c7 Import from CVS: tag r20-3b4
cvs
parents:
diff changeset
69 #define MkdirHierCmd mkdir
43dd3413c7c7 Import from CVS: tag r20-3b4
cvs
parents:
diff changeset
70 #define InstallCmd copy
43dd3413c7c7 Import from CVS: tag r20-3b4
cvs
parents:
diff changeset
71 #define InstPgmFlags /**/
43dd3413c7c7 Import from CVS: tag r20-3b4
cvs
parents:
diff changeset
72 #define InstBinFlags /**/
43dd3413c7c7 Import from CVS: tag r20-3b4
cvs
parents:
diff changeset
73 #define InstUidFlags /**/
43dd3413c7c7 Import from CVS: tag r20-3b4
cvs
parents:
diff changeset
74 #define InstLibFlags /**/
43dd3413c7c7 Import from CVS: tag r20-3b4
cvs
parents:
diff changeset
75 #define InstIncFlags /**/
43dd3413c7c7 Import from CVS: tag r20-3b4
cvs
parents:
diff changeset
76 #define InstManFlags /**/
43dd3413c7c7 Import from CVS: tag r20-3b4
cvs
parents:
diff changeset
77 #define InstDatFlags /**/
43dd3413c7c7 Import from CVS: tag r20-3b4
cvs
parents:
diff changeset
78 #define InstallFlags /**/
43dd3413c7c7 Import from CVS: tag r20-3b4
cvs
parents:
diff changeset
79 #if (CompilerMajorVersion == 0)
43dd3413c7c7 Import from CVS: tag r20-3b4
cvs
parents:
diff changeset
80 #define ExtraLibraries crtdll.lib kernel32.lib wsock32.lib
43dd3413c7c7 Import from CVS: tag r20-3b4
cvs
parents:
diff changeset
81 #elif (CompilerMajorVersion < 4)
43dd3413c7c7 Import from CVS: tag r20-3b4
cvs
parents:
diff changeset
82 #define ExtraLibraries msvcrt.lib kernel32.lib wsock32.lib
43dd3413c7c7 Import from CVS: tag r20-3b4
cvs
parents:
diff changeset
83 #else
43dd3413c7c7 Import from CVS: tag r20-3b4
cvs
parents:
diff changeset
84 /* Use LIBC.LIB instead of msvcrt.lib since we compile
43dd3413c7c7 Import from CVS: tag r20-3b4
cvs
parents:
diff changeset
85 with non-thread version. --marcpa */
43dd3413c7c7 Import from CVS: tag r20-3b4
cvs
parents:
diff changeset
86 #define ExtraLibraries libc.lib kernel32.lib wsock32.lib -link -nodefaultlib:libc
43dd3413c7c7 Import from CVS: tag r20-3b4
cvs
parents:
diff changeset
87 #endif
43dd3413c7c7 Import from CVS: tag r20-3b4
cvs
parents:
diff changeset
88 #define MakeCmd nmake -nologo
43dd3413c7c7 Import from CVS: tag r20-3b4
cvs
parents:
diff changeset
89 #if (CompilerMajorVersion == 0)
43dd3413c7c7 Import from CVS: tag r20-3b4
cvs
parents:
diff changeset
90 #define LdCmd link32
43dd3413c7c7 Import from CVS: tag r20-3b4
cvs
parents:
diff changeset
91 #else
43dd3413c7c7 Import from CVS: tag r20-3b4
cvs
parents:
diff changeset
92 #define LdCmd link
43dd3413c7c7 Import from CVS: tag r20-3b4
cvs
parents:
diff changeset
93 #endif
43dd3413c7c7 Import from CVS: tag r20-3b4
cvs
parents:
diff changeset
94 #define MathLibrary
43dd3413c7c7 Import from CVS: tag r20-3b4
cvs
parents:
diff changeset
95 #define HasSymLinks NO
43dd3413c7c7 Import from CVS: tag r20-3b4
cvs
parents:
diff changeset
96 #define HasPutenv YES
43dd3413c7c7 Import from CVS: tag r20-3b4
cvs
parents:
diff changeset
97 #define Osuf obj
43dd3413c7c7 Import from CVS: tag r20-3b4
cvs
parents:
diff changeset
98 #ifndef CCsuf
43dd3413c7c7 Import from CVS: tag r20-3b4
cvs
parents:
diff changeset
99 #define CCsuf cxx
43dd3413c7c7 Import from CVS: tag r20-3b4
cvs
parents:
diff changeset
100 #endif
43dd3413c7c7 Import from CVS: tag r20-3b4
cvs
parents:
diff changeset
101 #define BuildServer NO
43dd3413c7c7 Import from CVS: tag r20-3b4
cvs
parents:
diff changeset
102 #define ConnectionFlags -DTCPCONN
43dd3413c7c7 Import from CVS: tag r20-3b4
cvs
parents:
diff changeset
103
43dd3413c7c7 Import from CVS: tag r20-3b4
cvs
parents:
diff changeset
104 /* override as necessary in site.def/host.def */
43dd3413c7c7 Import from CVS: tag r20-3b4
cvs
parents:
diff changeset
105 #ifndef StdIncDir
43dd3413c7c7 Import from CVS: tag r20-3b4
cvs
parents:
diff changeset
106 #define StdIncDir C:/MSDEVSTD/INCLUDE
43dd3413c7c7 Import from CVS: tag r20-3b4
cvs
parents:
diff changeset
107 #endif
43dd3413c7c7 Import from CVS: tag r20-3b4
cvs
parents:
diff changeset
108 #define LdPreLib /**/
43dd3413c7c7 Import from CVS: tag r20-3b4
cvs
parents:
diff changeset
109 #define LdPostLib /**/
43dd3413c7c7 Import from CVS: tag r20-3b4
cvs
parents:
diff changeset
110 #ifndef UseInstalled
43dd3413c7c7 Import from CVS: tag r20-3b4
cvs
parents:
diff changeset
111 #define ImakeCmd $(IMAKESRC:/=\)\imake
43dd3413c7c7 Import from CVS: tag r20-3b4
cvs
parents:
diff changeset
112 #define DependCmd $(DEPENDSRC:/=\)\makedepend
43dd3413c7c7 Import from CVS: tag r20-3b4
cvs
parents:
diff changeset
113 #endif
43dd3413c7c7 Import from CVS: tag r20-3b4
cvs
parents:
diff changeset
114 #define DependFlags -D_WIN32
43dd3413c7c7 Import from CVS: tag r20-3b4
cvs
parents:
diff changeset
115 #define FilesToClean *.bak *.obj *.lib make.log
43dd3413c7c7 Import from CVS: tag r20-3b4
cvs
parents:
diff changeset
116 #define ShLibDir $(BINDIR)
43dd3413c7c7 Import from CVS: tag r20-3b4
cvs
parents:
diff changeset
117
43dd3413c7c7 Import from CVS: tag r20-3b4
cvs
parents:
diff changeset
118 #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)
43dd3413c7c7 Import from CVS: tag r20-3b4
cvs
parents:
diff changeset
119
43dd3413c7c7 Import from CVS: tag r20-3b4
cvs
parents:
diff changeset
120 #define XawI18nDefines -DHAS_WCHAR_H
43dd3413c7c7 Import from CVS: tag r20-3b4
cvs
parents:
diff changeset
121 #define UseRgbTxt YES
43dd3413c7c7 Import from CVS: tag r20-3b4
cvs
parents:
diff changeset
122 #define HasCbrt NO
43dd3413c7c7 Import from CVS: tag r20-3b4
cvs
parents:
diff changeset
123 #define HasFfs NO
43dd3413c7c7 Import from CVS: tag r20-3b4
cvs
parents:
diff changeset
124 #define HasXdmAuth NO
43dd3413c7c7 Import from CVS: tag r20-3b4
cvs
parents:
diff changeset
125
43dd3413c7c7 Import from CVS: tag r20-3b4
cvs
parents:
diff changeset
126 /* the following components haven't been ported yet */
43dd3413c7c7 Import from CVS: tag r20-3b4
cvs
parents:
diff changeset
127 #define BuildLBX NO
43dd3413c7c7 Import from CVS: tag r20-3b4
cvs
parents:
diff changeset
128 #define BuildXprint NO
43dd3413c7c7 Import from CVS: tag r20-3b4
cvs
parents:
diff changeset
129 #define XprtServer NO
43dd3413c7c7 Import from CVS: tag r20-3b4
cvs
parents:
diff changeset
130
43dd3413c7c7 Import from CVS: tag r20-3b4
cvs
parents:
diff changeset
131 #include <Win32.rules>