diff options
| author | marha <marha@users.sourceforge.net> | 2014-03-09 22:56:02 +0100 |
|---|---|---|
| committer | marha <marha@users.sourceforge.net> | 2014-03-09 22:56:02 +0100 |
| commit | 2112b7dec49833ba872bd3ebcd7288930fec0796 (patch) | |
| tree | 407c80c9a70f590af2d4c3e5c14678827e189331 /mesalib/windows/VC8/mesa/swrast_dri | |
| parent | 8badbdef38ce843dc443ddee219eda4040ef2cd5 (diff) | |
| parent | 3dd4b6420f686b0147d5b8136268cc63196e253b (diff) | |
| download | vcxsrv-2112b7dec49833ba872bd3ebcd7288930fec0796.tar.gz vcxsrv-2112b7dec49833ba872bd3ebcd7288930fec0796.tar.bz2 vcxsrv-2112b7dec49833ba872bd3ebcd7288930fec0796.zip | |
Merge remote-tracking branch 'origin/released'
* origin/released:
fontconfig mesa xserver git update 9 Mar 2014
Conflicts:
mesalib/src/mapi/glapi/glapi.h
xorg-server/hw/kdrive/ephyr/hostx.c
Diffstat (limited to 'mesalib/windows/VC8/mesa/swrast_dri')
| -rw-r--r-- | mesalib/windows/VC8/mesa/swrast_dri/swrast_dri.vcxproj | 1 | ||||
| -rw-r--r-- | mesalib/windows/VC8/mesa/swrast_dri/swrast_dri.vcxproj.filters | 3 |
2 files changed, 4 insertions, 0 deletions
diff --git a/mesalib/windows/VC8/mesa/swrast_dri/swrast_dri.vcxproj b/mesalib/windows/VC8/mesa/swrast_dri/swrast_dri.vcxproj index 3f8180b72..3ea6f593f 100644 --- a/mesalib/windows/VC8/mesa/swrast_dri/swrast_dri.vcxproj +++ b/mesalib/windows/VC8/mesa/swrast_dri/swrast_dri.vcxproj @@ -242,6 +242,7 @@ <ClCompile Include="..\..\..\..\..\expat\lib\xmltok.c" />
<ClCompile Include="..\..\..\..\src\mesa\drivers\common\driverfuncs.c" />
<ClCompile Include="..\..\..\..\src\mesa\drivers\common\meta.c" />
+ <ClCompile Include="..\..\..\..\src\mesa\drivers\common\meta_generate_mipmap.c" />
<ClCompile Include="..\..\..\..\src\mesa\drivers\dri\common\dri_util.c" />
<ClCompile Include="..\..\..\..\src\mesa\drivers\dri\common\megadriver_stub.c" />
<ClCompile Include="..\..\..\..\src\mesa\drivers\dri\common\xmlconfig.c" />
diff --git a/mesalib/windows/VC8/mesa/swrast_dri/swrast_dri.vcxproj.filters b/mesalib/windows/VC8/mesa/swrast_dri/swrast_dri.vcxproj.filters index f8f5c991e..e7575d9ca 100644 --- a/mesalib/windows/VC8/mesa/swrast_dri/swrast_dri.vcxproj.filters +++ b/mesalib/windows/VC8/mesa/swrast_dri/swrast_dri.vcxproj.filters @@ -138,6 +138,9 @@ <ClCompile Include="..\..\..\..\src\mesa\drivers\dri\common\megadriver_stub.c">
<Filter>Source Files</Filter>
</ClCompile>
+ <ClCompile Include="..\..\..\..\src\mesa\drivers\common\meta_generate_mipmap.c">
+ <Filter>Source Files</Filter>
+ </ClCompile>
</ItemGroup>
<ItemGroup>
<ClInclude Include="..\..\..\..\src\mesa\drivers\dri\swrast\swrast_priv.h">
|