summaryrefslogtreecommitdiffstats
path: root/src/mesa/sources.mak
diff options
context:
space:
mode:
authorChristian König <[email protected]>2011-03-03 00:59:12 +0100
committerChristian König <[email protected]>2011-03-03 00:59:12 +0100
commit0eccb1038a620bc76ba45ac00c293b3e88427510 (patch)
tree4bd9209ac6e9b824284d47799b13a99a401c6963 /src/mesa/sources.mak
parented12c29bc45b100b758c9affe2cebe8c8498e25e (diff)
parent2e756f3d6f15d61297a3bb4efe6a88c29081a5eb (diff)
Merge remote branch 'origin/master' into pipe-video
Diffstat (limited to 'src/mesa/sources.mak')
-rw-r--r--src/mesa/sources.mak2
1 files changed, 2 insertions, 0 deletions
diff --git a/src/mesa/sources.mak b/src/mesa/sources.mak
index bdf4126cf58..ae92e4da940 100644
--- a/src/mesa/sources.mak
+++ b/src/mesa/sources.mak
@@ -59,6 +59,7 @@ MAIN_SOURCES = \
main/multisample.c \
main/nvprogram.c \
main/pack.c \
+ main/pbo.c \
main/pixel.c \
main/pixelstore.c \
main/pixeltransfer.c \
@@ -253,6 +254,7 @@ PROGRAM_SOURCES = \
program/register_allocate.c \
program/symbol_table.c
+
SHADER_CXX_SOURCES = \
program/ir_to_mesa.cpp \
program/sampler.cpp