diff options
| author |  bunnei <ericbunnie@gmail.com> | 2014-06-14 12:13:16 -0400 |
|---|---|---|
| committer | bunnei <ericbunnie@gmail.com> | 2014-06-14 12:13:16 -0400 |
| commit | 004df767953a949817da89bddcd5d1379240f769 (patch) | |
| tree | b2d54928dcbf3cb4dde0cd5d3277afe7999b7bd9 /src/core/core.vcxproj | |
| parent | c34ba380011921a9d984136381c3a65a1e2389d5 (diff) | |
| parent | b45a38f55794e47b0429a8667441a20433e19e42 (diff) | |
Merge branch 'threading' of https://github.com/bunnei/citra
Conflicts:
src/core/hle/function_wrappers.h
src/core/hle/service/gsp.cpp
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 8a3ad83e..8eb189a8 100644 --- a/src/core/core.vcxproj +++ b/src/core/core.vcxproj @@ -168,12 +168,14 @@ <ClCompile Include="hle\config_mem.cpp" /> <ClCompile Include="hle\coprocessor.cpp" /> <ClCompile Include="hle\hle.cpp" /> + <ClCompile Include="hle\kernel\event.cpp" /> <ClCompile Include="hle\kernel\kernel.cpp" /> <ClCompile Include="hle\kernel\mutex.cpp" /> <ClCompile Include="hle\kernel\thread.cpp" /> <ClCompile Include="hle\service\apt.cpp" /> <ClCompile Include="hle\service\gsp.cpp" /> <ClCompile Include="hle\service\hid.cpp" /> + <ClCompile Include="hle\service\ndm.cpp" /> <ClCompile Include="hle\service\service.cpp" /> <ClCompile Include="hle\service\srv.cpp" /> <ClCompile Include="hle\svc.cpp" /> @@ -217,12 +219,14 @@ <ClInclude Include="hle\coprocessor.h" /> <ClInclude Include="hle\function_wrappers.h" /> <ClInclude Include="hle\hle.h" /> + <ClInclude Include="hle\kernel\event.h" /> <ClInclude Include="hle\kernel\kernel.h" /> <ClInclude Include="hle\kernel\mutex.h" /> <ClInclude Include="hle\kernel\thread.h" /> <ClInclude Include="hle\service\apt.h" /> <ClInclude Include="hle\service\gsp.h" /> <ClInclude Include="hle\service\hid.h" /> + <ClInclude Include="hle\service\ndm.h" /> <ClInclude Include="hle\service\service.h" /> <ClInclude Include="hle\service\srv.h" /> <ClInclude Include="hle\svc.h" /> |