diff options
| author | 2014-10-07 19:44:13 -0400 | |
|---|---|---|
| committer | 2014-10-07 19:44:13 -0400 | |
| commit | a171000cbec1dbae4e5c0c34ea1d7ef1b4313164 (patch) | |
| tree | a6bc766749aabd4eb8df276749fe51db49ee7030 /src/core | |
| parent | Merge pull request #129 from linkmauve/master (diff) | |
| parent | Added configuration file system. (diff) | |
| download | yuzu-a171000cbec1dbae4e5c0c34ea1d7ef1b4313164.tar.gz yuzu-a171000cbec1dbae4e5c0c34ea1d7ef1b4313164.tar.xz yuzu-a171000cbec1dbae4e5c0c34ea1d7ef1b4313164.zip | |
Merge pull request #108 from archshift/config
Configuration files
Diffstat (limited to 'src/core')
| -rw-r--r-- | src/core/CMakeLists.txt | 2 | ||||
| -rw-r--r-- | src/core/settings.cpp | 11 | ||||
| -rw-r--r-- | src/core/settings.h | 29 |
3 files changed, 42 insertions, 0 deletions
diff --git a/src/core/CMakeLists.txt b/src/core/CMakeLists.txt index 2b26292fd..06df9a677 100644 --- a/src/core/CMakeLists.txt +++ b/src/core/CMakeLists.txt | |||
| @@ -56,6 +56,7 @@ set(SRCS | |||
| 56 | core_timing.cpp | 56 | core_timing.cpp |
| 57 | mem_map.cpp | 57 | mem_map.cpp |
| 58 | mem_map_funcs.cpp | 58 | mem_map_funcs.cpp |
| 59 | settings.cpp | ||
| 59 | system.cpp | 60 | system.cpp |
| 60 | ) | 61 | ) |
| 61 | 62 | ||
| @@ -117,6 +118,7 @@ set(HEADERS | |||
| 117 | core.h | 118 | core.h |
| 118 | core_timing.h | 119 | core_timing.h |
| 119 | mem_map.h | 120 | mem_map.h |
| 121 | settings.h | ||
| 120 | system.h | 122 | system.h |
| 121 | ) | 123 | ) |
| 122 | 124 | ||
diff --git a/src/core/settings.cpp b/src/core/settings.cpp new file mode 100644 index 000000000..c486f6274 --- /dev/null +++ b/src/core/settings.cpp | |||
| @@ -0,0 +1,11 @@ | |||
| 1 | // Copyright 2014 Citra Emulator Project | ||
| 2 | // Licensed under GPLv2 | ||
| 3 | // Refer to the license.txt file included. | ||
| 4 | |||
| 5 | #include "settings.h" | ||
| 6 | |||
| 7 | namespace Settings { | ||
| 8 | |||
| 9 | Values values = {}; | ||
| 10 | |||
| 11 | } | ||
diff --git a/src/core/settings.h b/src/core/settings.h new file mode 100644 index 000000000..a84c3d4b6 --- /dev/null +++ b/src/core/settings.h | |||
| @@ -0,0 +1,29 @@ | |||
| 1 | // Copyright 2014 Citra Emulator Project | ||
| 2 | // Licensed under GPLv2 | ||
| 3 | // Refer to the license.txt file included. | ||
| 4 | |||
| 5 | #pragma once | ||
| 6 | |||
| 7 | namespace Settings { | ||
| 8 | |||
| 9 | struct Values { | ||
| 10 | int pad_a_key; | ||
| 11 | int pad_b_key; | ||
| 12 | int pad_x_key; | ||
| 13 | int pad_y_key; | ||
| 14 | int pad_l_key; | ||
| 15 | int pad_r_key; | ||
| 16 | int pad_start_key; | ||
| 17 | int pad_select_key; | ||
| 18 | int pad_home_key; | ||
| 19 | int pad_dup_key; | ||
| 20 | int pad_ddown_key; | ||
| 21 | int pad_dleft_key; | ||
| 22 | int pad_dright_key; | ||
| 23 | int pad_sup_key; | ||
| 24 | int pad_sdown_key; | ||
| 25 | int pad_sleft_key; | ||
| 26 | int pad_sright_key; | ||
| 27 | } extern values; | ||
| 28 | |||
| 29 | } | ||