984a75e189
o use internal freetype2 for consistency with x11/XFree86-4. o added xthreads obtained from x11/XFree86-4. o install "ws" type config sample for xdm. o build DRI only if kernel source installed in /sys. o fix Riva128/SGRAM driver(patch-riva_hw.c). PR: 24338(4.0.2) Submitted by: maintainer, keith
20 lines
1.1 KiB
Text
20 lines
1.1 KiB
Text
--- config/cf/Imake.tmpl.orig Tue Dec 5 10:16:28 2000
|
|
+++ config/cf/Imake.tmpl Tue Dec 5 10:39:48 2000
|
|
@@ -1425,7 +1425,7 @@
|
|
CXXOPTIONS = CplusplusOptions
|
|
CXXINCLUDES = $(INCLUDES) $(TOP_INCLUDES) $(CXXEXTRA_INCLUDES)
|
|
CXXDEFINES = $(CXXINCLUDES) $(CXXSTD_DEFINES) $(THREADS_CXXDEFINES) $(CXXEXTRA_DEFINES) $(DEFINES)
|
|
- CXXFLAGS = $(CXXDEBUGFLAGS) $(CXXOPTIONS) $(THREADS_CXXFLAGS) $(CXXDEFINES)
|
|
+ CXXFLAGS += $(CXXDEBUGFLAGS) $(CXXOPTIONS) $(THREADS_CXXFLAGS) $(CXXDEFINES)
|
|
#endif
|
|
COMPRESS = CompressCmd
|
|
GZIPCMD = GzipCmd
|
|
@@ -1616,7 +1616,7 @@
|
|
*/
|
|
ALLINCLUDES = $(INCLUDES) $(EXTRA_INCLUDES) $(TOP_INCLUDES) $(STD_INCLUDES)
|
|
ALLDEFINES = $(ALLINCLUDES) $(STD_DEFINES) $(EXTRA_DEFINES) $(PROTO_DEFINES) $(THREADS_DEFINES) $(MODULE_DEFINES) $(DEFINES)
|
|
- CFLAGS = $(CDEBUGFLAGS) $(CCOPTIONS) $(THREADS_CFLAGS) $(MODULE_CFLAGS) $(ALLDEFINES)
|
|
+ CFLAGS += $(CDEBUGFLAGS) $(CCOPTIONS) $(THREADS_CFLAGS) $(MODULE_CFLAGS) $(ALLDEFINES)
|
|
LINTFLAGS = $(LINTOPTS) -DLINT $(ALLDEFINES) $(DEPEND_DEFINES)
|
|
LDPRELIB = LdPreLib
|
|
LDPOSTLIB = LdPostLib
|