Merge branch 'master' into cde-next

This commit is contained in:
Jon Trulson
2018-06-28 16:55:04 -06:00
11 changed files with 60 additions and 25 deletions

View File

@@ -148,10 +148,8 @@ XCOMM operating system: OSName (OSMajorVersion./**/OSMinorVersion./**/OSTeenyVe
# endif
#endif
/* Use installed versions of Xm and X11 */
#if OSMajorVersion >= 6
/* Use installed X11 includes/libs */
# define UseInstalledX11 YES
#endif
/*
* Compiler Features
@@ -1050,8 +1048,13 @@ CXXDEPENDINCLUDE != CcCmd -v -x c++ /dev/null -fsyntax-only \
# endif
#endif
/* Suppress warnings dependant from compiler versions */
#if !defined(GccWarningOptions)
# define GccWarningOptions -Wpointer-arith -Wno-unused -Wno-write-strings -Wno-switch -Wno-unused-result
# if (defined __clang__)
# define GccWarningOptions -Wpointer-arith -Wno-unused -Wno-write-strings -Wno-switch -Wno-unused-result
# else
# define GccWarningOptions -Wpointer-arith -Wno-unused -Wno-write-strings -Wno-switch
# endif
#endif
#define TtClientLibs $(TTLIB) $(XTOOLLIB) $(XLIB)