libretro/RetroArch
1
0
Fork 0
mirror of https://github.com/libretro/RetroArch.git synced 2024-11-23 16:09:47 +00:00
Code Issues Actions 23 Packages Projects Releases Wiki Activity

get this working again

Browse Source
This commit is contained in:
radius 2016-11-19 21:19:56 -05:00
parent 26d0a6f2d0
commit fd84613db5
5 changed files with 22 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
Makefile.common
View File

@ -273,7 +273,8 @@ endif
# Qt
ifeq ($(HAVE_QT_WRAPPER), 1)
LIBS += -lQt5Quick -lQt5Widgets -lQt5Gui -lQt5Qml -lQt5Network -lQt5Core -L./ui/drivers/qt/obj/
OBJ += ui/drivers/ui_qt.o
LIBS += -lQt5Quick -lQt5Widgets -lQt5Gui -lQt5Qml -lQt5Network -lQt5Core -L./ui/drivers/qt/build/release/
LIBS += -lwrapper
endif

4
griffin/griffin_cpp.cpp
View File

@ -152,6 +152,10 @@ UI
#include "../ui/drivers/qt/ui_qt_application.cpp"
#endif
#if defined(HAVE_QT_WRAPPER)
#include "../ui/drivers/ui_qt.cpp"
#endif
/*============================================================
VIDEO DRIVER
============================================================ */

2
ui/drivers/qt/wimp/main.qml
View File

@ -30,7 +30,7 @@ ApplicationWindow {
initialPage: Page {
id: page
title: "RetroArch"
title: "QT!"
tabs: navDrawer.enabled ? [] : sectionTitles

14
ui/drivers/ui_qt.cpp
View File

@ -26,9 +26,12 @@
#include "../../config.h"
#endif
#include "ui_qt.h"
#ifdef HAVE_QT_WRAPPER
#include "qt/wrapper/wrapper.h"
#else
#include "ui_qt.h"
#endif
#include "../ui_companion_driver.h"
#include "../../core.h"
#include "../../configuration.h"
@ -151,9 +154,16 @@ const ui_companion_driver_t ui_companion_qt = {
NULL,
NULL,
NULL,
#ifdef HAVE_QT_WRAPPER
NULL,
NULL,
NULL,
NULL,
#else
&ui_browser_window_qt,
&ui_msg_window_qt,
&ui_window_qt,
&ui_application_qt,
#endif
"qt",
};

3
ui/ui_companion_driver.c
View File

@ -28,6 +28,9 @@
static const ui_companion_driver_t *ui_companion_drivers[] = {
#ifdef HAVE_QT_WRAPPER
&ui_companion_qt,
#endif
#if defined(_WIN32) && !defined(_XBOX)
&ui_companion_win32,
#endif