/*
* Compiler Features
*/
+#ifndef HasGcc2ForCplusplus
+#define HasGcc2ForCplusplus YES
+#endif
#define GccUsesGas YES
#define UseGas YES
#define GnuCpp YES
# endif /* XorgServer */
-# include <xorg.cf>
#endif /* AlphaArchitecture */
# define HasAgpGart YES
+# define LdPostLib -L/usr/X11R6/lib -L/usr/local/lib
+
# define ServerExtraSysLibs -lamd64
# define ServerExtraDefines GccGasOption -D_XSERVER64 XFree86ServerDefines
# ifndef HasX86Support
# define HasX86Support YES
# endif
-/* # include <xorg.cf> */
+
+/* For DtHelp TIFF processing routines. */
+#define LSBBitOrder YES
#endif /* AMD64Architecture */
# ifndef DefaultGcc2i386Opt
# if (OSMajorVersion == 2 && OSMinorVersion >= 3) || OSMajorVersion > 2
/* The GCC strength-reduce bug is fixed for OpenBSD 2.3 and later */
-# define DefaultGcc2i386Opt -O2 GccAliasingArgs
+# define DefaultGcc2i386Opt -O2 -fno-strict-aliasing
# endif
# endif
# define OptimizedCDebugFlags DefaultGcc2i386Opt
# define ServerOSDefines XFree86ServerOSDefines -DDDXTIME
# define ServerExtraSysLibs -li386
-# define LdPostLib /**/
+# define LdPostLib -L/usr/X11R6/lib -L/usr/local/lib
# define ServerExtraDefines GccGasOption XFree86ServerDefines
# ifndef XFree86ConsoleDefines
# define XFree86ConsoleDefines -DWSCONS_SUPPORT -DPCVT_SUPPORT
# define HasX86Support UseElfFormat
# endif
-# include <xorg.cf>
+/* For DtHelp TIFF processing routines. */
+#define LSBBitOrder YES
+
#endif /* i386Architecture */
# define ServerExtraDefines -DXFree86Server
-# include <xorg.cf>
#endif /* AmigaArchitecture */
# define ServerExtraDefines -DXFree86Server
-#include <xorg.cf>
#endif /* Hp300Architecture */
# define ServerExtraDefines -DXFree86Server
-# include <xorg.cf>
#endif /* mac68kArchitecture */
# define ServerExtraDefines -DXFree86Server
-# include <xorg.cf>
#endif /* Mvme68kArchitecture */
# define XFree86ConsoleDefines -DWSCONS_SUPPORT
# endif
-# include <xorg.cf>
#endif /* MipsArchitecture */
# endif /* XorgServer */
-# include <xorg.cf>
#endif /* PpcArchitecture */
# ifndef BuildXInputExt
# define BuildXInputExt NO
# endif
-# include <xorg.cf>
#endif /* SparcArchitecture */
# define XFree86ConsoleDefines -DWSCONS_SUPPORT
# endif
-# include <xorg.cf>
#endif /* Sparc64Architecture */
# define BuildGlxExt NO
# define BuildGLXLibrary NO
-# include <xorg.cf>
#endif /* VaxArchitecture */
* which can be overridden by architecture specific sections above
*/
+#ifdef HasGcc2ForCplusplus
+CXXDEPENDINCLUDE != echo | `CcCmd -print-prog-name=cc1plus` -v 2>&1 | \
+ sed -n 's/ \(.*[cg]++.*\)/-I\1/p'; rm -f gccdump.s
+#define CplusplusDependIncludes $(CXXDEPENDINCLUDE)
+#endif
+
#ifndef StandardDefines
# define StandardDefines -DCSRG_BASED
#endif
+#ifndef StandardIncludes
+# define StandardIncludes -I/usr/X11R6/include -I/usr/local/include
+#endif
+
+#ifndef TopMotifInclude
+# define TopMotifInclude /usr/local/include
+#endif
+
#if !defined(OptimizedCDebugFlags)
# define OptimizedCDebugFlags -O2
#endif
#define TtClientDepLibs $(DEPTTLIB) $(DEPXTOOLLIB) $(DEPXLIB)
#define CplusplusLibC -lstdc++
+#define CplusplusOptions -Wall -Wpointer-arith -Wno-unused -Wno-write-strings -Wno-switch
+#define LibraryCplusplusOptions -Wall -Wpointer-arith -Wno-unused -Wno-write-strings -Wno-switch
#define ArchitectureDefines -DOPENBSD_ARCHITECTURE