diff options
| author | Pierre Bourdon <delroth@gmail.com> | 2012-05-16 09:27:37 +0200 |
|---|---|---|
| committer | Pierre Bourdon <delroth@gmail.com> | 2012-05-16 09:27:37 +0200 |
| commit | fdff4cb1ffa76e894dd41ca5f97d31f122fd3f86 (patch) | |
| tree | 20059e8c98923d27f235c9f12de31be97e20240f /Source/Core/DiscIO/DiscIO.vcxproj | |
| parent | 2b77acc705eae11fdb4a25be6d6ea5db1fa52e21 (diff) | |
| parent | 5a8ad9230271a5088b0cf582932959214c6b5527 (diff) | |
Merge branch 'master' into wii-network
Conflicts:
Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE.cpp
Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_FileIO.cpp
Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_es.cpp
Source/VSProps/Dolphin.Win32.props
Source/VSProps/Dolphin.x64.props
Diffstat (limited to 'Source/Core/DiscIO/DiscIO.vcxproj')
| -rw-r--r-- | Source/Core/DiscIO/DiscIO.vcxproj | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/Source/Core/DiscIO/DiscIO.vcxproj b/Source/Core/DiscIO/DiscIO.vcxproj index d94ac13212..6dd24ddd44 100644 --- a/Source/Core/DiscIO/DiscIO.vcxproj +++ b/Source/Core/DiscIO/DiscIO.vcxproj @@ -175,6 +175,7 @@ <ClInclude Include="Src\BannerLoaderWii.h" /> <ClInclude Include="Src\Blob.h" /> <ClInclude Include="Src\CISOBlob.h" /> + <ClInclude Include="Src\WbfsBlob.h" /> <ClInclude Include="Src\CompressedBlob.h" /> <ClInclude Include="Src\DiscScrubber.h" /> <ClInclude Include="Src\DriveBlob.h" /> @@ -199,6 +200,7 @@ <ClCompile Include="Src\BannerLoaderWii.cpp" /> <ClCompile Include="Src\Blob.cpp" /> <ClCompile Include="Src\CISOBlob.cpp" /> + <ClCompile Include="Src\WbfsBlob.cpp" /> <ClCompile Include="Src\CompressedBlob.cpp" /> <ClCompile Include="Src\DiscScrubber.cpp" /> <ClCompile Include="Src\DriveBlob.cpp" /> @@ -226,7 +228,6 @@ </ItemGroup> <ItemGroup> <None Include="CMakeLists.txt" /> - <None Include="Src\SConscript" /> </ItemGroup> <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" /> <ImportGroup Label="ExtensionTargets"> |