projects
/
mesa.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
freedreno/ir3: fix register usage calculations
[mesa.git]
/
src
/
gallium
/
auxiliary
/
Makefile.am
diff --git
a/src/gallium/auxiliary/Makefile.am
b/src/gallium/auxiliary/Makefile.am
index 4085e510bd1180df28bbafd524549f00b8d418c6..27a8b3fe4201e8a874794eb48ca905b981d0e164 100644
(file)
--- a/
src/gallium/auxiliary/Makefile.am
+++ b/
src/gallium/auxiliary/Makefile.am
@@
-12,9
+12,12
@@
noinst_LTLIBRARIES = libgallium.la
AM_CFLAGS = \
-I$(top_srcdir)/src/gallium/auxiliary/util \
$(GALLIUM_CFLAGS) \
AM_CFLAGS = \
-I$(top_srcdir)/src/gallium/auxiliary/util \
$(GALLIUM_CFLAGS) \
- $(VISIBILITY_CFLAGS)
+ $(VISIBILITY_CFLAGS) \
+ $(MSVC2008_COMPAT_CXXFLAGS)
-AM_CXXFLAGS = $(VISIBILITY_CXXFLAGS)
+AM_CXXFLAGS = \
+ $(VISIBILITY_CXXFLAGS) \
+ $(MSVC2008_COMPAT_CXXFLAGS)
libgallium_la_SOURCES = \
$(C_SOURCES) \
libgallium_la_SOURCES = \
$(C_SOURCES) \
@@
-53,32
+56,50
@@
libgalliumvl_stub_la_SOURCES = \
if NEED_GALLIUM_VL
if NEED_GALLIUM_VL
-noinst_LTLIBRARIES += libgalliumvl.la
-
-libgalliumvl_la_CFLAGS = \
+COMMON_VL_CFLAGS = \
$(AM_CFLAGS) \
$(VL_CFLAGS) \
$(AM_CFLAGS) \
$(VL_CFLAGS) \
+ $(DRI2PROTO_CFLAGS) \
$(LIBDRM_CFLAGS) \
$(GALLIUM_PIPE_LOADER_DEFINES) \
-DPIPE_SEARCH_DIR=\"$(libdir)/gallium-pipe\"
if HAVE_GALLIUM_STATIC_TARGETS
$(LIBDRM_CFLAGS) \
$(GALLIUM_PIPE_LOADER_DEFINES) \
-DPIPE_SEARCH_DIR=\"$(libdir)/gallium-pipe\"
if HAVE_GALLIUM_STATIC_TARGETS
-
libgalliumvl_la
_CFLAGS += \
+
COMMON_VL
_CFLAGS += \
-DGALLIUM_STATIC_TARGETS=1
endif # HAVE_GALLIUM_STATIC_TARGETS
-DGALLIUM_STATIC_TARGETS=1
endif # HAVE_GALLIUM_STATIC_TARGETS
+noinst_LTLIBRARIES += libgalliumvl.la
+
+libgalliumvl_la_CFLAGS = \
+ $(COMMON_VL_CFLAGS)
+
libgalliumvl_la_SOURCES = \
$(VL_SOURCES)
libgalliumvl_la_SOURCES = \
$(VL_SOURCES)
+if NEED_GALLIUM_VL_WINSYS
+
+noinst_LTLIBRARIES += libgalliumvlwinsys.la
+
+libgalliumvlwinsys_la_CFLAGS = \
+ $(COMMON_VL_CFLAGS)
+
+libgalliumvlwinsys_la_SOURCES = \
+ $(VL_WINSYS_SOURCES)
+
+endif
+
endif
EXTRA_DIST = \
endif
EXTRA_DIST = \
-
Android.mk
SConscript \
+ SConscript \
indices/u_indices.c \
indices/u_unfilled_indices.c \
indices/u_indices_gen.py \
indices/u_unfilled_gen.py \
indices/u_indices.c \
indices/u_unfilled_indices.c \
indices/u_indices_gen.py \
indices/u_unfilled_gen.py \
+ postprocess/ADDING \
+ rbug/README \
target-helpers \
util/u_format.csv \
util/u_format_pack.py \
target-helpers \
util/u_format.csv \
util/u_format_pack.py \