Mirrors/yuzu
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

yuzu/CMakeLists: Remove qt5_wrap_ui macro usage

Browse source 
We can simply enable CMAKE_AUTOUIC and let CMake take care of handling
the UI code generation for targets.

As part of letting CMake automatically handle the header file parsing,
we must not name includes with "ui_*" unless they're related to the
output of the Qt UIC compiler. Because of this, we need to rename
ui_settings, given it would conflict with this restriction.
This commit is contained in:
Lioncash 2019-07-29 16:06:33 -04:00
parent f601f25bcc
commit 5980aa1e51
16 changed files with 41 additions and 46 deletions
Download patch file Download diff file Expand all files Collapse all files

2
src/yuzu/configuration/config.cpp
View file

@ -11,7 +11,7 @@
#include "core/hle/service/hid/controllers/npad.h"
#include "input_common/main.h"
#include "yuzu/configuration/config.h"
#include "yuzu/ui_settings.h"
#include "yuzu/uisettings.h"
Config::Config() {
// TODO: Don't hardcode the path; let the frontend decide where to put the config files.