diff options
| author | bunnei <ericbunnie@gmail.com> | 2014-04-07 00:57:37 -0400 |
|---|---|---|
| committer | bunnei <ericbunnie@gmail.com> | 2014-04-07 00:57:37 -0400 |
| commit | f446f79da27d8c75b85772654152ea8e67a2214d (patch) | |
| tree | cf3924876405ed5244fc8ee72c8615cc74e51267 /src/core/core.vcxproj | |
| parent | 9b6041d8189653514e87135e2139fd9a0934c9bf (diff) | |
| parent | efef514fd8252e1f07cd1b45455dbb5207f2b0c3 (diff) | |
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 @@ <ClCompile Include="src\elf\elf_reader.cpp" /> <ClCompile Include="src\file_sys\directory_file_system.cpp" /> <ClCompile Include="src\file_sys\meta_file_system.cpp" /> + <ClCompile Include="src\hw\hw.cpp" /> + <ClCompile Include="src\hw\hw_lcd.cpp" /> <ClCompile Include="src\loader.cpp" /> <ClCompile Include="src\mem_map.cpp" /> <ClCompile Include="src\mem_map_funcs.cpp" /> @@ -180,6 +182,8 @@ <ClInclude Include="src\file_sys\directory_file_system.h" /> <ClInclude Include="src\file_sys\file_sys.h" /> <ClInclude Include="src\file_sys\meta_file_system.h" /> + <ClInclude Include="src\hw\hw.h" /> + <ClInclude Include="src\hw\hw_lcd.h" /> <ClInclude Include="src\loader.h" /> <ClInclude Include="src\mem_map.h" /> <ClInclude Include="src\system.h" /> |