diff options
| author | marha <marha@users.sourceforge.net> | 2012-08-21 07:55:46 +0200 |
|---|---|---|
| committer | marha <marha@users.sourceforge.net> | 2012-08-21 07:55:46 +0200 |
| commit | 1bf52245e51f23656a3520056b440a633ea5a61b (patch) | |
| tree | 4e175b2e2a4a843e101d582ba996eaef336f90fc /mesalib/src/mesa/sources.mak | |
| parent | 0f140f539691e1657d8ea0fcbcca2d5947574406 (diff) | |
| parent | 7cd970786d72a68b735f33904bdded6c8aebdf33 (diff) | |
| download | vcxsrv-1bf52245e51f23656a3520056b440a633ea5a61b.tar.gz vcxsrv-1bf52245e51f23656a3520056b440a633ea5a61b.tar.bz2 vcxsrv-1bf52245e51f23656a3520056b440a633ea5a61b.zip | |
Merge remote-tracking branch 'origin/released'
Diffstat (limited to 'mesalib/src/mesa/sources.mak')
| -rw-r--r-- | mesalib/src/mesa/sources.mak | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/mesalib/src/mesa/sources.mak b/mesalib/src/mesa/sources.mak index 30e2219b0..ee260cbfd 100644 --- a/mesalib/src/mesa/sources.mak +++ b/mesalib/src/mesa/sources.mak @@ -6,7 +6,8 @@ # this is part of MAIN_FILES MAIN_ES_FILES = \ $(BUILDDIR)main/api_exec_es1.c \ - $(BUILDDIR)main/api_exec_es2.c + $(BUILDDIR)main/api_exec_es2.c \ + $(SRCDIR)main/es1_conversion.c MAIN_FILES = \ $(SRCDIR)main/api_arrayelt.c \ |