Merged to master. Thanks!
-jon
On 11/24/19 12:42 AM, wrote:
> Hi.
>
> This patch makes tt_type_comp respect CppCmd
>
> Thanks!
>
> ---
> cde/lib/tt/bin/tt_type_comp/Imakefile | 4 +++-
> cde/lib/tt/lib/tt_options.h | 5 +++++
> 2 files changed, 8 insertions(+), 1 deletion(-)
>
> diff --git a/cde/lib/tt/bin/tt_type_comp/Imakefile
> b/cde/lib/tt/bin/tt_type_comp/Imakefile
> index 92179208..62434929 100644
> --- a/cde/lib/tt/bin/tt_type_comp/Imakefile
> +++ b/cde/lib/tt/bin/tt_type_comp/Imakefile
> @@ -8,7 +8,9 @@ EXTRA_LOAD_FLAGS = ExtraLoadFlags $(UNSHARED_CXXLIB)
>
> #include "../../tooltalk.tmpl"
>
> -DEFINES =
> +CPP_PROGRAM = CppCmd
> +CPP_DEFINES = -DCPP_PROGRAM="\"$(CPP_PROGRAM)\""
> +DEFINES = $(CPP_DEFINES)
> INCLUDES = $(TIRPCINC) -I../../lib -I../../slib
>
> DEPLIBS = ../../slib/libstt.a TtClientDepLibs
> diff --git a/cde/lib/tt/lib/tt_options.h b/cde/lib/tt/lib/tt_options.h
> index 4315daa8..e23bb9e5 100644
> --- a/cde/lib/tt/lib/tt_options.h
> +++ b/cde/lib/tt/lib/tt_options.h
> @@ -529,4 +529,9 @@
>
> #endif
>
> +#ifdef CPP_PROGRAM
> +# undef OPT_CPP_PATH
> +# define OPT_CPP_PATH CPP_PROGRAM
> +#endif
> +
> #endif /* _TT_OPTIONS_H */
--
Jon Trulson
"Entropy. It isn't what it used to be."
-- Sheldon
_______________________________________________
cdesktopenv-devel mailing list
cdesktopenv-devel@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/cdesktopenv-devel
