Reviewed-by: Bas Nieuwenhuizen <b...@basnieuwenhuizen.nl>
for both. On Mon, Nov 26, 2018 at 5:14 AM Eric Engestrom <eric.engest...@intel.com> wrote: > > Scons and autotools don't define it, and as of last commit nothing > uses it. > > `VERSION` is also a generic enough name that something somewhere will > eventually clash, and we don't want to repeat the LLVM `DEBUG` fiasco. > > Signed-off-by: Eric Engestrom <eric.engest...@intel.com> > --- > Android.common.mk | 1 - > meson.build | 3 +-- > 2 files changed, 1 insertion(+), 3 deletions(-) > > diff --git a/Android.common.mk b/Android.common.mk > index 25a3838bbc07784c5ca4..db21dcf26c65364188a2 100644 > --- a/Android.common.mk > +++ b/Android.common.mk > @@ -38,7 +38,6 @@ LOCAL_CFLAGS += \ > -Wno-missing-field-initializers \ > -Wno-initializer-overrides \ > -Wno-mismatched-tags \ > - -DVERSION=\"$(MESA_VERSION)\" \ > -DPACKAGE_VERSION=\"$(MESA_VERSION)\" \ > > -DPACKAGE_BUGREPORT=\"https://bugs.freedesktop.org/enter_bug.cgi?product=Mesa\"; > > diff --git a/meson.build b/meson.build > index 5a74943eb393bd3dd157..4ee40503d044a0985c89 100644 > --- a/meson.build > +++ b/meson.build > @@ -43,8 +43,7 @@ pre_args = [ > '-D__STDC_CONSTANT_MACROS', > '-D__STDC_FORMAT_MACROS', > '-D__STDC_LIMIT_MACROS', > - '-DVERSION="@0@"'.format(meson.project_version()), > - '-DPACKAGE_VERSION=VERSION', > + '-DPACKAGE_VERSION="@0@"'.format(meson.project_version()), > > '-DPACKAGE_BUGREPORT="https://bugs.freedesktop.org/enter_bug.cgi?product=Mesa";', > ] > > -- > Cheers, > Eric > > _______________________________________________ > mesa-dev mailing list > mesa-dev@lists.freedesktop.org > https://lists.freedesktop.org/mailman/listinfo/mesa-dev _______________________________________________ mesa-dev mailing list mesa-dev@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/mesa-dev
