N-archive/citra
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Fixed Cmakelists

Browse source
This commit is contained in:
inspuration 2014-05-29 14:09:43 -04:00
parent 9b6c4ac77d
commit 53cc3e8f67
3 changed files with 10 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
src/citra_qt/CMakeLists.txt
View file

@ -5,6 +5,7 @@ set(SRCS
debugger/ramview.cpp debugger/ramview.cpp
debugger/registers.cpp debugger/registers.cpp
hotkeys.cpp hotkeys.cpp
key_bindings.cpp
main.cpp main.cpp
config/controller_config.cpp config/controller_config.cpp
config/controller_config_util.cpp) config/controller_config_util.cpp)
@ -15,11 +16,13 @@ set (HEADERS
debugger/ramview.hxx debugger/ramview.hxx
debugger/registers.hxx debugger/registers.hxx
hotkeys.hxx hotkeys.hxx
key_bindings.hxx
main.hxx main.hxx
ui_callstack.h ui_callstack.h
ui_controller_config.h ui_controller_config.h
ui_disassembler.h ui_disassembler.h
ui_hotkeys.h ui_hotkeys.h
ui_key_bindings.h
ui_main.h ui_main.h
ui_registers.h ui_registers.h
version.h version.h
@ -31,6 +34,7 @@ qt4_wrap_ui(UI_HDRS
debugger/disassembler.ui debugger/disassembler.ui
debugger/registers.ui debugger/registers.ui
hotkeys.ui hotkeys.ui
key_bindings.ui
main.ui main.ui
config/controller_config.ui) config/controller_config.ui)
@ -41,6 +45,7 @@ qt4_wrap_cpp(MOC_SRCS
debugger/registers.hxx debugger/registers.hxx
debugger/ramview.hxx debugger/ramview.hxx
hotkeys.hxx hotkeys.hxx
key_bindings.hxx
main.hxx main.hxx
config/controller_config.hxx config/controller_config.hxx
config/controller_config_util.hxx) config/controller_config_util.hxx)

2
src/citra_qt/key_bindings.cpp
View file

@ -99,7 +99,7 @@ public:
}; };
void GKeyBindingsDialog::updateItem(QTreeWidgetItem * item, int column) { void GKeyBindingsDialog::updateItem(QTreeWidgetItem * item, int column) {
bindings[item->text(1)] = reverseNames[item->text(0)]; //sanitise bindings[item->text(1)] = reverseNames[item->text(0)]; //TODO: sanitise
reverseBindings[reverseNames[item->text(0)]] = item->text(1); reverseBindings[reverseNames[item->text(0)]] = item->text(1);
return; return;
} }

6
src/core/CMakeLists.txt
View file

@ -44,7 +44,8 @@ set(SRCS core.cpp
hle/service/srv.cpp hle/service/srv.cpp
hw/hw.cpp hw/hw.cpp
hw/lcd.cpp hw/lcd.cpp
hw/ndma.cpp) hw/ndma.cpp
hw/hid.cpp)
set(HEADERS core.h set(HEADERS core.h
core_timing.h core_timing.h
@ -90,6 +91,7 @@ set(HEADERS core.h
hle/service/srv.h hle/service/srv.h
hw/hw.h hw/hw.h
hw/lcd.h hw/lcd.h
hw/ndma.h) hw/ndma.h
hw/hid.h)
add_library(core STATIC ${SRCS} ${HEADERS}) add_library(core STATIC ${SRCS} ${HEADERS})