freedreno/ir3: use env_var_as_unsigned()

[mesa.git] / src / gallium / drivers / freedreno / Makefile.am

diff --git a/src/gallium/drivers/freedreno/Makefile.am b/src/gallium/drivers/freedreno/Makefile.am
index 128c7fb599074def16ccc050c1e792542cf084aa..39887e13e379ca3e5b8d3079490d7a684208edad 100644 (file)
--- a/src/gallium/drivers/freedreno/Makefile.am
+++ b/src/gallium/drivers/freedreno/Makefile.am
@@ -4,15 +4,15 @@ include $(top_srcdir)/src/gallium/Automake.inc
 AM_CFLAGS = \
        -Wno-packed-bitfield-compat \
        -I$(top_srcdir)/src/gallium/drivers/freedreno/ir3 \
+       -I$(top_srcdir)/src/freedreno \
        -I$(top_builddir)/src/compiler/nir \
        -I$(top_srcdir)/src/compiler/nir \
-       $(GALLIUM_DRIVER_CFLAGS) \
-       $(FREEDRENO_CFLAGS)
+       $(GALLIUM_DRIVER_CFLAGS)
 
 MKDIR_GEN = $(AM_V_at)$(MKDIR_P) $(@D)
 ir3/ir3_nir_trig.c: ir3/ir3_nir_trig.py $(top_srcdir)/src/compiler/nir/nir_algebraic.py
        $(MKDIR_GEN)
-       $(AM_V_GEN) PYTHONPATH=$(top_srcdir)/src/compiler/nir $(PYTHON2) $(PYTHON_FLAGS) $(srcdir)/ir3/ir3_nir_trig.py > $@ || ($(RM) $@; false)
+       $(AM_V_GEN) $(PYTHON) $(PYTHON_FLAGS) $(srcdir)/ir3/ir3_nir_trig.py -p $(top_srcdir)/src/compiler/nir > $@ || ($(RM) $@; false)
 
 noinst_LTLIBRARIES = libfreedreno.la
 
@@ -22,6 +22,7 @@ libfreedreno_la_SOURCES = \
        $(a3xx_SOURCES) \
        $(a4xx_SOURCES) \
        $(a5xx_SOURCES) \
+       $(a6xx_SOURCES) \
        $(ir3_SOURCES) \
        $(ir3_GENERATED_FILES)
 
@@ -43,5 +44,7 @@ ir3_compiler_LDADD = \
        $(top_builddir)/src/compiler/glsl/libstandalone.la \
        $(top_builddir)/src/util/libmesautil.la \
        $(top_builddir)/src/mesa/libmesagallium.la \
-       $(GALLIUM_COMMON_LIB_DEPS) \
-       $(FREEDRENO_LIBS)
+       $(top_builddir)/src/freedreno/libfreedreno_drm.la \
+       $(GALLIUM_COMMON_LIB_DEPS)
+
+EXTRA_DIST += meson.build