piwalker/dolphin
1
0
Fork 0
mirror of https://github.com/dolphin-emu/dolphin.git synced 2025-07-30 01:29:42 -06:00
Code Issues Packages Projects Releases Wiki Activity

Merge 'master' into shader-uids-awesome.

Browse Source 
Conflicts:
	Source/Core/VideoCommon/Src/LightingShaderGen.cpp
	Source/Core/VideoCommon/Src/PixelShaderGen.cpp
	Source/Core/VideoCommon/Src/PixelShaderGen.h
	Source/Core/VideoCommon/Src/VertexShaderGen.cpp
This commit is contained in:
NeoBrainX
2013-06-17 12:05:47 +02:00
parent f0ea525d3b 43a4d41889
commit ca22872dae
172 changed files with 4585 additions and 1736 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
Source/Core/VideoCommon/VideoCommon.vcxproj
View File

@ -182,6 +182,7 @@
<ClCompile Include="Src\CommandProcessor.cpp" />
<ClCompile Include="Src\CPMemory.cpp" />
<ClCompile Include="Src\Debugger.cpp" />
<ClCompile Include="Src\DriverDetails.cpp" />
<ClCompile Include="Src\EmuWindow.cpp" />
<ClCompile Include="Src\Fifo.cpp" />
<ClCompile Include="Src\FPSCounter.cpp" />
@ -229,6 +230,7 @@
<ClInclude Include="Src\CPMemory.h" />
<ClInclude Include="Src\DataReader.h" />
<ClInclude Include="Src\Debugger.h" />
<ClInclude Include="Src\DriverDetails.h" />
<ClInclude Include="Src\DLCache.h" />
<ClInclude Include="Src\EmuWindow.h" />
<ClInclude Include="Src\Fifo.h" />
@ -303,4 +305,4 @@
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
<ImportGroup Label="ExtensionTargets">
</ImportGroup>
</Project>
</Project>