Mercurial > octave-nkf
changeset 19768:9f6ee9cb749c
put OSMESA compiler flag variables in config_options struct
* common.mk, toplev.cc, oct-conf.in.h: Put OSMESA compiler flag
variables in config_options struct.
| author | John W. Eaton <jwe@octave.org> |
|---|---|
| date | Tue, 17 Feb 2015 14:37:26 -0500 |
| parents | 08033d583435 |
| children | 5bcbedf1d06d |
| files | build-aux/common.mk libinterp/corefcn/toplev.cc libinterp/oct-conf.in.h |
| diffstat | 3 files changed, 22 insertions(+), 0 deletions(-) [+] |
line wrap: on
line diff
--- a/build-aux/common.mk Tue Feb 17 14:33:05 2015 -0500 +++ b/build-aux/common.mk Tue Feb 17 14:37:26 2015 -0500 @@ -264,6 +264,10 @@ OPENGL_LIBS = @OPENGL_LIBS@ +OSMESA_CPPFLAGS = @OSMESA_CPPFLAGS@ +OSMESA_LDFLAGS = @OSMESA_LDFLAGS@ +OSMESA_LIBS = @OSMESA_LIBS@ + PCRE_CPPFLAGS = @PCRE_CPPFLAGS@ PCRE_LIBS = @PCRE_LIBS@ @@ -608,6 +612,9 @@ -e "s|%OCTAVE_CONF_OCT_LINK_DEPS%|\"${OCT_LINK_DEPS}\"|" \ -e "s|%OCTAVE_CONF_OCT_LINK_OPTS%|\"${OCT_LINK_OPTS}\"|" \ -e "s|%OCTAVE_CONF_OPENGL_LIBS%|\"${OPENGL_LIBS}\"|" \ + -e "s|%OCTAVE_CONF_OSMESA_CPPFLAGS%|\"${OSMESA_CPPFLAGS}\"|" \ + -e "s|%OCTAVE_CONF_OSMESA_LDFLAGS%|\"${OSMESA_LDFLAGS}\"|" \ + -e "s|%OCTAVE_CONF_OSMESA_LIBS%|\"${OSMESA_LIBS}\"|" \ -e "s|%OCTAVE_CONF_PCRE_CPPFLAGS%|\"${PCRE_CPPFLAGS}\"|" \ -e "s|%OCTAVE_CONF_PCRE_LIBS%|\"${PCRE_LIBS}\"|" \ -e "s|%OCTAVE_CONF_PREFIX%|\"${prefix}\"|" \
--- a/libinterp/corefcn/toplev.cc Tue Feb 17 14:33:05 2015 -0500 +++ b/libinterp/corefcn/toplev.cc Tue Feb 17 14:37:26 2015 -0500 @@ -1384,6 +1384,9 @@ { false, "OCT_LINK_DEPS", OCTAVE_CONF_OCT_LINK_DEPS }, { false, "OCT_LINK_OPTS", OCTAVE_CONF_OCT_LINK_OPTS }, { false, "OPENGL_LIBS", OCTAVE_CONF_OPENGL_LIBS }, + { false, "OSMESA_CPPFLAGS", OCTAVE_CONF_OSMESA_CPPFLAGS }, + { false, "OSMESA_LDFLAGS", OCTAVE_CONF_OSMESA_LDFLAGS }, + { false, "OSMESA_LIBS", OCTAVE_CONF_OSMESA_LIBS }, { false, "PCRE_CPPFLAGS", OCTAVE_CONF_PCRE_CPPFLAGS }, { false, "PCRE_LIBS", OCTAVE_CONF_PCRE_LIBS }, { false, "PTHREAD_CFLAGS", OCTAVE_CONF_PTHREAD_CFLAGS },
--- a/libinterp/oct-conf.in.h Tue Feb 17 14:33:05 2015 -0500 +++ b/libinterp/oct-conf.in.h Tue Feb 17 14:37:26 2015 -0500 @@ -458,6 +458,18 @@ #define OCTAVE_CONF_OPENGL_LIBS %OCTAVE_CONF_OPENGL_LIBS% #endif +#ifndef OCTAVE_CONF_OSMESA_CPPFLAGS +#define OCTAVE_CONF_OSMESA_CPPFLAGS %OCTAVE_CONF_OSMESA_CPPFLAGS% +#endif + +#ifndef OCTAVE_CONF_OSMESA_LDFLAGS +#define OCTAVE_CONF_OSMESA_LDFLAGS %OCTAVE_CONF_OSMESA_LDFLAGS% +#endif + +#ifndef OCTAVE_CONF_OSMESA_LIBS +#define OCTAVE_CONF_OSMESA_LIBS %OCTAVE_CONF_OSMESA_LIBS% +#endif + #ifndef OCTAVE_CONF_PCRE_CPPFLAGS #define OCTAVE_CONF_PCRE_CPPFLAGS %OCTAVE_CONF_PCRE_CPPFLAGS% #endif