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/CMakeLists.txt | |
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/CMakeLists.txt')
-rw-r--r-- | src/core/CMakeLists.txt | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/src/core/CMakeLists.txt b/src/core/CMakeLists.txt index 1c1a2eeb..7116b88e 100644 --- a/src/core/CMakeLists.txt +++ b/src/core/CMakeLists.txt @@ -34,12 +34,14 @@ set(SRCS core.cpp hle/config_mem.cpp hle/coprocessor.cpp hle/svc.cpp + hle/kernel/event.cpp hle/kernel/kernel.cpp hle/kernel/mutex.cpp hle/kernel/thread.cpp hle/service/apt.cpp hle/service/gsp.cpp hle/service/hid.cpp + hle/service/ndm.cpp hle/service/service.cpp hle/service/srv.cpp hw/gpu.cpp |