diff options
| author |  bunnei | 2014-04-07 00:57:37 -0400 |
|---|---|---|
| committer | bunnei | 2014-04-07 00:57:37 -0400 |
| commit | f446f79da27d8c75b85772654152ea8e67a2214d (patch) | |
| tree | cf3924876405ed5244fc8ee72c8615cc74e51267 /src/core/core.vcxproj | |
| parent | Remove Core::GetState(). Use new ARM_Interface instead. (diff) | |
| parent | removed unused comments, changed main processing loop to be infinite (diff) | |
| download | yuzu-f446f79da27d8c75b85772654152ea8e67a2214d.tar.gz yuzu-f446f79da27d8c75b85772654152ea8e67a2214d.tar.xz yuzu-f446f79da27d8c75b85772654152ea8e67a2214d.zip | |
Merge branch 'hardware-interface'
Conflicts:
src/core/src/core.h
Diffstat (limited to 'src/core/core.vcxproj')
| -rw-r--r-- | src/core/core.vcxproj | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/src/core/core.vcxproj b/src/core/core.vcxproj index bee9f3046..2edb51214 100644 --- a/src/core/core.vcxproj +++ b/src/core/core.vcxproj | |||
| @@ -152,6 +152,8 @@ | |||
| 152 | <ClCompile Include="src\elf\elf_reader.cpp" /> | 152 | <ClCompile Include="src\elf\elf_reader.cpp" /> |
| 153 | <ClCompile Include="src\file_sys\directory_file_system.cpp" /> | 153 | <ClCompile Include="src\file_sys\directory_file_system.cpp" /> |
| 154 | <ClCompile Include="src\file_sys\meta_file_system.cpp" /> | 154 | <ClCompile Include="src\file_sys\meta_file_system.cpp" /> |
| 155 | <ClCompile Include="src\hw\hw.cpp" /> | ||
| 156 | <ClCompile Include="src\hw\hw_lcd.cpp" /> | ||
| 155 | <ClCompile Include="src\loader.cpp" /> | 157 | <ClCompile Include="src\loader.cpp" /> |
| 156 | <ClCompile Include="src\mem_map.cpp" /> | 158 | <ClCompile Include="src\mem_map.cpp" /> |
| 157 | <ClCompile Include="src\mem_map_funcs.cpp" /> | 159 | <ClCompile Include="src\mem_map_funcs.cpp" /> |
| @@ -180,6 +182,8 @@ | |||
| 180 | <ClInclude Include="src\file_sys\directory_file_system.h" /> | 182 | <ClInclude Include="src\file_sys\directory_file_system.h" /> |
| 181 | <ClInclude Include="src\file_sys\file_sys.h" /> | 183 | <ClInclude Include="src\file_sys\file_sys.h" /> |
| 182 | <ClInclude Include="src\file_sys\meta_file_system.h" /> | 184 | <ClInclude Include="src\file_sys\meta_file_system.h" /> |
| 185 | <ClInclude Include="src\hw\hw.h" /> | ||
| 186 | <ClInclude Include="src\hw\hw_lcd.h" /> | ||
| 183 | <ClInclude Include="src\loader.h" /> | 187 | <ClInclude Include="src\loader.h" /> |
| 184 | <ClInclude Include="src\mem_map.h" /> | 188 | <ClInclude Include="src\mem_map.h" /> |
| 185 | <ClInclude Include="src\system.h" /> | 189 | <ClInclude Include="src\system.h" /> |