android,autotools,i965: Fix location of float64_glsl.h

[mesa.git] / src / mesa / drivers / dri / i965 / Makefile.am

diff --git a/src/mesa/drivers/dri/i965/Makefile.am b/src/mesa/drivers/dri/i965/Makefile.am
index ff47add93f4a9e37404864ab918e9a02c00c870c..0bda2897e8e6e171b1fdd9de58ee003a79d002fb 100644 (file)
--- a/src/mesa/drivers/dri/i965/Makefile.am
+++ b/src/mesa/drivers/dri/i965/Makefile.am
@@ -26,6 +26,7 @@ include Makefile.sources
 AM_CFLAGS = \
        -I$(top_srcdir)/include \
        -I$(top_srcdir)/src/ \
+       -I$(top_builddir)/src/ \
        -I$(top_srcdir)/src/mapi \
        -I$(top_srcdir)/src/mesa/ \
        -I$(top_srcdir)/src/gallium/include \
@@ -33,6 +34,8 @@ AM_CFLAGS = \
        -I$(top_builddir)/src/util \
        -I$(top_srcdir)/src/mesa/drivers/dri/common \
        -I$(top_srcdir)/src/gtest/include \
+       -I$(top_builddir)/src/compiler \
+       -I$(top_srcdir)/src/compiler \
        -I$(top_builddir)/src/compiler/glsl \
        -I$(top_builddir)/src/compiler/nir \
        -I$(top_srcdir)/src/compiler/nir \
@@ -44,7 +47,7 @@ AM_CFLAGS = \
        $(WNO_OVERRIDE_INIT) \
        $(LIBDRM_CFLAGS) \
        $(VALGRIND_CFLAGS) \
-       -msse2
+       -msse2 -mstackrealign
 
 AM_CXXFLAGS = $(AM_CFLAGS)
 
@@ -92,14 +95,8 @@ libi965_gen11_la_CFLAGS = $(AM_CFLAGS) -DGEN_VERSIONx10=110
 
 noinst_LTLIBRARIES = \
        libi965_dri.la \
-       libintel_tiled_memcpy.la \
        $(I965_PERGEN_LIBS)
 
-libintel_tiled_memcpy_la_SOURCES = \
-       $(intel_tiled_memcpy_FILES)
-libintel_tiled_memcpy_la_CFLAGS = \
-       $(AM_CFLAGS) $(SSE41_CFLAGS)
-
 libi965_dri_la_SOURCES = \
        $(i965_FILES) \
        $(i965_oa_GENERATED_FILES)
@@ -110,7 +107,6 @@ libi965_dri_la_LIBADD = \
        $(top_builddir)/src/intel/compiler/libintel_compiler.la \
        $(top_builddir)/src/intel/blorp/libblorp.la \
        $(I965_PERGEN_LIBS) \
-       libintel_tiled_memcpy.la
        $(LIBDRM_LIBS)
 
 BUILT_SOURCES = $(i965_oa_GENERATED_FILES)
@@ -122,7 +118,7 @@ EXTRA_DIST = \
        meson.build
 
 brw_oa_metrics.c: brw_oa.py $(i965_oa_xml_FILES)
-       $(PYTHON2) $(PYTHON_FLAGS) $(srcdir)/brw_oa.py \
+       $(PYTHON) $(PYTHON_FLAGS) $(srcdir)/brw_oa.py \
        --code=$(builddir)/brw_oa_metrics.c \
        --header=$(builddir)/brw_oa_metrics.h \
        $(i965_oa_xml_FILES:%=$(srcdir)/%)