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

get this building again

Browse Source
This commit is contained in:
radius 2016-11-14 21:03:46 -05:00
parent 8551cc4f9b
commit ff3841ed7c
6 changed files with 20 additions and 109 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
ui/drivers/qt/wimp-test/main.cpp
View File

@ -37,8 +37,6 @@ int main(int argc, char *argv[])
Sleep(1000);
printf("test = %d\n",i);
i++;
if(j < 2)
t->SetTitle("test");
}
pthread_join(gui,NULL);

18
ui/drivers/qt/wimp-test/wimp-test.pro
View File

@ -8,13 +8,15 @@ win32:CONFIG(release, debug|release): LIBS += -L$$PWD/../wimp/build/release/ -lw
else:win32:CONFIG(debug, debug|release): LIBS += -L$$PWD/../wimp/build/debug/ -lwimp.dll
else:unix: LIBS += -L$$PWD/../wimp/build/ -lwimp.dll
INCLUDEPATH += $$PWD/../wimp/build/release
DEPENDPATH += $$PWD/../wimp/build/release
win32:CONFIG(release, debug|release): LIBS += -L$$PWD/../build/release/ -lwrapper.dll
else:win32:CONFIG(debug, debug|release): LIBS += -L$$PWD/../build/debug/ -lwrapper.dll
else:unix:CONFIG(debug, debug|release): LIBS += -L$$PWD/../build/debug/ -lwrapper.so
else:unix:CONFIG(release, debug|release): LIBS += -L$$PWD/../build/debug/ -lwrapper.so
INCLUDEPATH += $$PWD/../../../../
INCLUDEPATH += $$PWD/../../../../libretro-common/include/
win32:CONFIG(release, debug|release): LIBS += -L$$PWD/../wrapper/build/release/ -lwrapper.dll
else:win32:CONFIG(debug, debug|release): LIBS += -L$$PWD/../wrapper/build/debug/ -lwrapper.dll
else:unix: LIBS += -L$$PWD/../wrapper/build/ -lwrapper.dll
INCLUDEPATH += $$PWD/../wrapper/build/release
DEPENDPATH += $$PWD/../wrapper/build/release
win32:CONFIG(release, debug|release): INCLUDEPATH += $$PWD/../build/release
else:win32:CONFIG(debug, debug|release): INCLUDEPATH += $$PWD/../build/debug
else:unix:CONFIG(debug, debug|release): INCLUDEPATH += $$PWD/../build/release
else:unix:CONFIG(release, debug|release): INCLUDEPATH += $$PWD/../build/release

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

@ -98,55 +98,7 @@ ApplicationWindow {
}
}
TabView {
id: tabView
anchors.fill: parent
currentIndex: page.selectedTab
model: sections
delegate: Item {
width: tabView.width
height: tabView.height
clip: true
Sidebar {
id: sidebar
expanded: !navDrawer.enabled
Column {
width: parent.width
Repeater {
model: modelData
delegate: ListItem.Standard {
text: modelData
selected: modelData == selectedItem
onClicked: selectedItem = modelData
}
}
}
}
Flickable {
id: flickable
anchors {
left: sidebar.right
right: parent.right
top: parent.top
bottom: parent.bottom
}
clip: true
Column {
width: parent.width
}
}
Scrollbar {
flickableItem: flickable
}
}
}
}
Dialog {

46
ui/drivers/qt/wimp/wimp.cpp
View File

@ -33,17 +33,11 @@ int Wimp::CreateMainWindow()
topLevel = engine.rootObjects().value(0);
window = qobject_cast<QQuickWindow *>(topLevel);
if(settings->playlist_directory[0] != '\0')
GetCollections(settings->playlist_directory);
else
collections.append("Collection dir not defined");
collections.append("Collection dir not defined");
engine.rootContext()->setContextProperty("collections", QVariant::fromValue(collections));
if(settings->libretro_directory[0] != '\0')
GetCores(settings->libretro_directory);
else
cores.append("Core dir not defined");
cores.append("Core dir not defined");
engine.rootContext()->setContextProperty("cores", QVariant::fromValue(cores));
@ -55,39 +49,3 @@ void Wimp::GetSettings(settings_t *s)
{
settings = s;
}
void Wimp::GetCollections(char* path)
{
QDir dir(path);
dir.setNameFilters(QStringList(file_path_str(FILE_PATH_LPL_EXTENSION)));
QStringList fileList = dir.entryList();
if(fileList.count() == 0)
collections.append("Empty");
for (int i=0; i < fileList.count(); i++)
{
QString collection = fileList[i].section('.',0,0);
collections.append(collection);
qDebug() << "Found file: " << collection;
}
}
void Wimp::GetCores(char* path)
{
QDir dir(path);
dir.setNameFilters(QStringList("*.dll"));
QStringList fileList = dir.entryList();
if(fileList.count() == 0)
cores.append("Empty");
for (int i=0; i < fileList.count(); i++)
{
QString core = fileList[i].section('.',0,0);
cores.append(core);
qDebug() << "Found file: " << core;
}
}

2
ui/drivers/qt/wrapper/wrapper.h
View File

@ -17,8 +17,6 @@
#define HAVE_MENU
#endif
#include <retro_common_api.h>
#include "config.h"
#include "configuration.h"

13
ui/drivers/qt/wrapper/wrapper.pro
View File

@ -14,12 +14,15 @@ HEADERS += \
wrapper.h
win32:CONFIG(release, debug|release): LIBS += -L$$PWD/../wimp/build/release/ -lwimp.dll
else:win32:CONFIG(debug, debug|release): LIBS += -L$$PWD/../wimp/build/debug/ -lwimp.dll
else:unix: LIBS += -L$$PWD/../wimp/build/ -lwimp.dll
win32:CONFIG(release, debug|release): LIBS += -L$$PWD/../build/release/ -lwimp.dll
else:win32:CONFIG(debug, debug|release): LIBS += -L$$PWD/../build/debug/ -lwimp.dll
else:unix:CONFIG(debug, debug|release): LIBS += -L$$PWD/../build/debug/ -lwimp.so
else:unix:CONFIG(release, debug|release): LIBS += -L$$PWD/../build/debug/ -lwimp.so
INCLUDEPATH += $$PWD/../wimp/build/release
DEPENDPATH += $$PWD/../wimp/build/release
win32:CONFIG(release, debug|release): INCLUDEPATH += $$PWD/../build/release
else:win32:CONFIG(debug, debug|release): INCLUDEPATH += $$PWD/../build/debug
else:unix:CONFIG(debug, debug|release): INCLUDEPATH += $$PWD/../build/release
else:unix:CONFIG(release, debug|release): INCLUDEPATH += $$PWD/../build/release
INCLUDEPATH += $$PWD/../../../../
INCLUDEPATH += $$PWD/../../../../libretro-common/include/