From 7a7f778341dff82c40435ca51630e48fa6688b17 Mon Sep 17 00:00:00 2001 From: radius Date: Mon, 31 Aug 2015 21:00:46 -0500 Subject: [PATCH] Try to pass settings to the QT ui driver --- ui/drivers/qt/wimp-test/main.cpp | 51 ++++++++++++++---- ui/drivers/qt/wimp/wimp.cpp | 15 +++--- ui/drivers/qt/wimp/wimp.h | 6 +++ ui/drivers/qt/wrapper/build/Makefile.Debug | 54 +++++++++++++++++++- ui/drivers/qt/wrapper/build/Makefile.Release | 54 +++++++++++++++++++- ui/drivers/qt/wrapper/wrapper.cpp | 5 ++ ui/drivers/qt/wrapper/wrapper.h | 2 + ui/drivers/qt/wrapper/wrapper.pro | 3 ++ ui/drivers/ui_qt.c | 9 ++-- 9 files changed, 170 insertions(+), 29 deletions(-) diff --git a/ui/drivers/qt/wimp-test/main.cpp b/ui/drivers/qt/wimp-test/main.cpp index af4d77bd28..868dab39bc 100644 --- a/ui/drivers/qt/wimp-test/main.cpp +++ b/ui/drivers/qt/wimp-test/main.cpp @@ -2,17 +2,46 @@ #include "../wrapper/wrapper.h" #include "../wimp/wimp.h" -int main(int argc, char *argv[]) +#include +#include +#include + +struct Wimp* t; + + +int i=0; + +void *initGui(void *arg) { - struct Wimp* wimp; - char* args[] = {""}; - - qDebug() << "C++ Style Debug Message"; - - wimp = ctrWimp(0, argv); - if(wimp) - CreateMainWindow(wimp); - - return 1; + char **arguments = (char**)arg; + t = ctrWimp(i,arguments); + CreateMainWindow(t); //-->uncomment this to open the QT gui + return 0; +} + +int main(int argc, char *argv[]) +{ + i = argc; + + pthread_t gui; + int rc; + rc=pthread_create(&gui, NULL, initGui, (void *)argv); + if(rc!=0) + { + printf("failed"); + exit(1); + } + + for(int j=0;j<100;j++) + { + Sleep(1000); + printf("test = %d\n",i); + i++; + if(j < 2) + t->SetTitle("test"); + } + + pthread_join(gui,NULL); + return 0; } diff --git a/ui/drivers/qt/wimp/wimp.cpp b/ui/drivers/qt/wimp/wimp.cpp index e927bb71f5..2ec3bbc811 100644 --- a/ui/drivers/qt/wimp/wimp.cpp +++ b/ui/drivers/qt/wimp/wimp.cpp @@ -20,11 +20,7 @@ #include #include -#include "configuration.h" - QObject *topLevel; -QQuickWindow *window; -static settings_t *g_config; int Wimp::CreateMainWindow() { @@ -33,18 +29,19 @@ int Wimp::CreateMainWindow() topLevel = engine.rootObjects().value(0); window = qobject_cast(topLevel); - SetTitle("RetroArch"); - return this->exec(); } void Wimp::SetTitle(char* title) { - window->setTitle(title); + window->setTitle(title); } -settings_t *config_get_ptr(void) +void Wimp::ConfigGetPtr(settings_t *settings) { - return g_config; + this->settings = settings; + /* Test, print the video driver name to check if we got the settings data succesfully */ + printf("Video Driver: %s\n",settings->video.driver); + fflush(stdout); } diff --git a/ui/drivers/qt/wimp/wimp.h b/ui/drivers/qt/wimp/wimp.h index 9f86e8b509..c10eb1e6f4 100644 --- a/ui/drivers/qt/wimp/wimp.h +++ b/ui/drivers/qt/wimp/wimp.h @@ -20,14 +20,20 @@ #include #include #include +#include +#include "configuration.h" class WIMPSHARED_EXPORT Wimp : public QGuiApplication { + QQuickWindow *window; + settings_t *settings; + Q_OBJECT public: Wimp(int argc, char *argv[]): QGuiApplication(argc, argv) {} int CreateMainWindow(); void SetTitle(char* title); + void ConfigGetPtr(settings_t* settings); }; diff --git a/ui/drivers/qt/wrapper/build/Makefile.Debug b/ui/drivers/qt/wrapper/build/Makefile.Debug index 6e8a286825..4b2027dfea 100644 --- a/ui/drivers/qt/wrapper/build/Makefile.Debug +++ b/ui/drivers/qt/wrapper/build/Makefile.Debug @@ -14,7 +14,7 @@ CXX = g++ DEFINES = -DUNICODE -DQT_QUICK_LIB -DQT_WIDGETS_LIB -DQT_GUI_LIB -DQT_QML_LIB -DQT_NETWORK_LIB -DQT_CORE_LIB CFLAGS = -pipe -fno-keep-inline-dllexport -march=nocona -mtune=core2 -g -Wall -Wextra $(DEFINES) CXXFLAGS = -pipe -fno-keep-inline-dllexport -march=nocona -mtune=core2 -g -frtti -Wall -Wextra -fexceptions -mthreads $(DEFINES) -INCPATH = -I../../wrapper -I. -I../../wimp/build/release -IE:/Working/Development/Tools/msys/mingw64/include/QtQuick -IE:/Working/Development/Tools/msys/mingw64/include/QtWidgets -IE:/Working/Development/Tools/msys/mingw64/include/QtGui -IE:/Working/Development/Tools/msys/mingw64/include/QtQml -IE:/Working/Development/Tools/msys/mingw64/include/QtNetwork -IE:/Working/Development/Tools/msys/mingw64/include/QtCore -Idebug -IE:/Working/Development/Tools/msys/mingw64/share/qt5/mkspecs/win32-g++ +INCPATH = -I../../wrapper -I. -I../../wimp/build/release -ID:/PortableData/CloudServices/Data/Home/Andres/repositories/retroarch -ID:/PortableData/CloudServices/Data/Home/Andres/repositories/retroarch/libretro-common/include -IE:/Working/Development/Tools/msys/mingw64/include/QtQuick -IE:/Working/Development/Tools/msys/mingw64/include/QtWidgets -IE:/Working/Development/Tools/msys/mingw64/include/QtGui -IE:/Working/Development/Tools/msys/mingw64/include/QtQml -IE:/Working/Development/Tools/msys/mingw64/include/QtNetwork -IE:/Working/Development/Tools/msys/mingw64/include/QtCore -Idebug -IE:/Working/Development/Tools/msys/mingw64/share/qt5/mkspecs/win32-g++ LINKER = g++ LFLAGS = -shared -Wl,-subsystem,console -mthreads -Wl,--out-implib,debug/libwrapper.dll.a LIBS = -lglu32 -lopengl32 -lgdi32 -luser32 -LD:/PortableData/CloudServices/Data/Home/Andres/repositories/retroarch/ui/drivers/qt/wrapper/../wimp/build/debug/ -lwimp.dll -lQt5Quickd -lQt5Widgetsd -lQt5Guid -lQt5Qmld -lQt5Networkd -lQt5Cored @@ -82,7 +82,7 @@ qmake: FORCE qmake_all: FORCE dist: - $(ZIP) wrapper.zip $(SOURCES) $(DIST) ../wrapper.pro E:/Working/Development/Tools/msys/mingw64/share/qt5/mkspecs/features/spec_pre.prf E:/Working/Development/Tools/msys/mingw64/share/qt5/mkspecs/qdevice.pri E:/Working/Development/Tools/msys/mingw64/share/qt5/mkspecs/features/device_config.prf E:/Working/Development/Tools/msys/mingw64/share/qt5/mkspecs/qconfig.pri E:/Working/Development/Tools/msys/mingw64/share/qt5/mkspecs/modules/qt_lib_3dcore.pri E:/Working/Development/Tools/msys/mingw64/share/qt5/mkspecs/modules/qt_lib_3dcore_private.pri E:/Working/Development/Tools/msys/mingw64/share/qt5/mkspecs/modules/qt_lib_3dinput.pri E:/Working/Development/Tools/msys/mingw64/share/qt5/mkspecs/modules/qt_lib_3dinput_private.pri E:/Working/Development/Tools/msys/mingw64/share/qt5/mkspecs/modules/qt_lib_3dquick.pri E:/Working/Development/Tools/msys/mingw64/share/qt5/mkspecs/modules/qt_lib_3dquick_private.pri E:/Working/Development/Tools/msys/mingw64/share/qt5/mkspecs/modules/qt_lib_3dquickrenderer.pri E:/Working/Development/Tools/msys/mingw64/share/qt5/mkspecs/modules/qt_lib_3dquickrenderer_private.pri E:/Working/Development/Tools/msys/mingw64/share/qt5/mkspecs/modules/qt_lib_3drenderer.pri E:/Working/Development/Tools/msys/mingw64/share/qt5/mkspecs/modules/qt_lib_3drenderer_private.pri E:/Working/Development/Tools/msys/mingw64/share/qt5/mkspecs/modules/qt_lib_axbase.pri E:/Working/Development/Tools/msys/mingw64/share/qt5/mkspecs/modules/qt_lib_axbase_private.pri E:/Working/Development/Tools/msys/mingw64/share/qt5/mkspecs/modules/qt_lib_axcontainer.pri E:/Working/Development/Tools/msys/mingw64/share/qt5/mkspecs/modules/qt_lib_axcontainer_private.pri E:/Working/Development/Tools/msys/mingw64/share/qt5/mkspecs/modules/qt_lib_axserver.pri E:/Working/Development/Tools/msys/mingw64/share/qt5/mkspecs/modules/qt_lib_axserver_private.pri E:/Working/Development/Tools/msys/mingw64/share/qt5/mkspecs/modules/qt_lib_bluetooth.pri E:/Working/Development/Tools/msys/mingw64/share/qt5/mkspecs/modules/qt_lib_bluetooth_private.pri E:/Working/Development/Tools/msys/mingw64/share/qt5/mkspecs/modules/qt_lib_bootstrap_private.pri E:/Working/Development/Tools/msys/mingw64/share/qt5/mkspecs/modules/qt_lib_clucene_private.pri E:/Working/Development/Tools/msys/mingw64/share/qt5/mkspecs/modules/qt_lib_concurrent.pri E:/Working/Development/Tools/msys/mingw64/share/qt5/mkspecs/modules/qt_lib_concurrent_private.pri E:/Working/Development/Tools/msys/mingw64/share/qt5/mkspecs/modules/qt_lib_core.pri E:/Working/Development/Tools/msys/mingw64/share/qt5/mkspecs/modules/qt_lib_core_private.pri E:/Working/Development/Tools/msys/mingw64/share/qt5/mkspecs/modules/qt_lib_dbus.pri E:/Working/Development/Tools/msys/mingw64/share/qt5/mkspecs/modules/qt_lib_dbus_private.pri E:/Working/Development/Tools/msys/mingw64/share/qt5/mkspecs/modules/qt_lib_declarative.pri E:/Working/Development/Tools/msys/mingw64/share/qt5/mkspecs/modules/qt_lib_declarative_private.pri E:/Working/Development/Tools/msys/mingw64/share/qt5/mkspecs/modules/qt_lib_designer.pri E:/Working/Development/Tools/msys/mingw64/share/qt5/mkspecs/modules/qt_lib_designer_private.pri E:/Working/Development/Tools/msys/mingw64/share/qt5/mkspecs/modules/qt_lib_designercomponents_private.pri E:/Working/Development/Tools/msys/mingw64/share/qt5/mkspecs/modules/qt_lib_enginio.pri E:/Working/Development/Tools/msys/mingw64/share/qt5/mkspecs/modules/qt_lib_enginio_private.pri E:/Working/Development/Tools/msys/mingw64/share/qt5/mkspecs/modules/qt_lib_gui.pri E:/Working/Development/Tools/msys/mingw64/share/qt5/mkspecs/modules/qt_lib_gui_private.pri E:/Working/Development/Tools/msys/mingw64/share/qt5/mkspecs/modules/qt_lib_help.pri E:/Working/Development/Tools/msys/mingw64/share/qt5/mkspecs/modules/qt_lib_help_private.pri E:/Working/Development/Tools/msys/mingw64/share/qt5/mkspecs/modules/qt_lib_location.pri E:/Working/Development/Tools/msys/mingw64/share/qt5/mkspecs/modules/qt_lib_location_private.pri E:/Working/Development/Tools/msys/mingw64/share/qt5/mkspecs/modules/qt_lib_multimedia.pri E:/Working/Development/Tools/msys/mingw64/share/qt5/mkspecs/modules/qt_lib_multimedia_private.pri E:/Working/Development/Tools/msys/mingw64/share/qt5/mkspecs/modules/qt_lib_multimediawidgets.pri E:/Working/Development/Tools/msys/mingw64/share/qt5/mkspecs/modules/qt_lib_multimediawidgets_private.pri E:/Working/Development/Tools/msys/mingw64/share/qt5/mkspecs/modules/qt_lib_network.pri E:/Working/Development/Tools/msys/mingw64/share/qt5/mkspecs/modules/qt_lib_network_private.pri E:/Working/Development/Tools/msys/mingw64/share/qt5/mkspecs/modules/qt_lib_nfc.pri E:/Working/Development/Tools/msys/mingw64/share/qt5/mkspecs/modules/qt_lib_nfc_private.pri E:/Working/Development/Tools/msys/mingw64/share/qt5/mkspecs/modules/qt_lib_opengl.pri E:/Working/Development/Tools/msys/mingw64/share/qt5/mkspecs/modules/qt_lib_opengl_private.pri E:/Working/Development/Tools/msys/mingw64/share/qt5/mkspecs/modules/qt_lib_openglextensions.pri E:/Working/Development/Tools/msys/mingw64/share/qt5/mkspecs/modules/qt_lib_openglextensions_private.pri E:/Working/Development/Tools/msys/mingw64/share/qt5/mkspecs/modules/qt_lib_platformsupport_private.pri E:/Working/Development/Tools/msys/mingw64/share/qt5/mkspecs/modules/qt_lib_positioning.pri E:/Working/Development/Tools/msys/mingw64/share/qt5/mkspecs/modules/qt_lib_positioning_private.pri E:/Working/Development/Tools/msys/mingw64/share/qt5/mkspecs/modules/qt_lib_printsupport.pri E:/Working/Development/Tools/msys/mingw64/share/qt5/mkspecs/modules/qt_lib_printsupport_private.pri E:/Working/Development/Tools/msys/mingw64/share/qt5/mkspecs/modules/qt_lib_qml.pri E:/Working/Development/Tools/msys/mingw64/share/qt5/mkspecs/modules/qt_lib_qml_private.pri E:/Working/Development/Tools/msys/mingw64/share/qt5/mkspecs/modules/qt_lib_qmldevtools_private.pri E:/Working/Development/Tools/msys/mingw64/share/qt5/mkspecs/modules/qt_lib_qmltest.pri E:/Working/Development/Tools/msys/mingw64/share/qt5/mkspecs/modules/qt_lib_qmltest_private.pri E:/Working/Development/Tools/msys/mingw64/share/qt5/mkspecs/modules/qt_lib_qtmultimediaquicktools_private.pri E:/Working/Development/Tools/msys/mingw64/share/qt5/mkspecs/modules/qt_lib_quick.pri E:/Working/Development/Tools/msys/mingw64/share/qt5/mkspecs/modules/qt_lib_quick_private.pri E:/Working/Development/Tools/msys/mingw64/share/qt5/mkspecs/modules/qt_lib_quickparticles_private.pri E:/Working/Development/Tools/msys/mingw64/share/qt5/mkspecs/modules/qt_lib_quickwidgets.pri E:/Working/Development/Tools/msys/mingw64/share/qt5/mkspecs/modules/qt_lib_quickwidgets_private.pri E:/Working/Development/Tools/msys/mingw64/share/qt5/mkspecs/modules/qt_lib_script.pri E:/Working/Development/Tools/msys/mingw64/share/qt5/mkspecs/modules/qt_lib_script_private.pri E:/Working/Development/Tools/msys/mingw64/share/qt5/mkspecs/modules/qt_lib_scripttools.pri E:/Working/Development/Tools/msys/mingw64/share/qt5/mkspecs/modules/qt_lib_scripttools_private.pri E:/Working/Development/Tools/msys/mingw64/share/qt5/mkspecs/modules/qt_lib_sensors.pri E:/Working/Development/Tools/msys/mingw64/share/qt5/mkspecs/modules/qt_lib_sensors_private.pri E:/Working/Development/Tools/msys/mingw64/share/qt5/mkspecs/modules/qt_lib_serialport.pri E:/Working/Development/Tools/msys/mingw64/share/qt5/mkspecs/modules/qt_lib_serialport_private.pri E:/Working/Development/Tools/msys/mingw64/share/qt5/mkspecs/modules/qt_lib_sql.pri E:/Working/Development/Tools/msys/mingw64/share/qt5/mkspecs/modules/qt_lib_sql_private.pri E:/Working/Development/Tools/msys/mingw64/share/qt5/mkspecs/modules/qt_lib_svg.pri E:/Working/Development/Tools/msys/mingw64/share/qt5/mkspecs/modules/qt_lib_svg_private.pri E:/Working/Development/Tools/msys/mingw64/share/qt5/mkspecs/modules/qt_lib_testlib.pri E:/Working/Development/Tools/msys/mingw64/share/qt5/mkspecs/modules/qt_lib_testlib_private.pri E:/Working/Development/Tools/msys/mingw64/share/qt5/mkspecs/modules/qt_lib_uiplugin.pri E:/Working/Development/Tools/msys/mingw64/share/qt5/mkspecs/modules/qt_lib_uitools.pri E:/Working/Development/Tools/msys/mingw64/share/qt5/mkspecs/modules/qt_lib_uitools_private.pri E:/Working/Development/Tools/msys/mingw64/share/qt5/mkspecs/modules/qt_lib_webchannel.pri E:/Working/Development/Tools/msys/mingw64/share/qt5/mkspecs/modules/qt_lib_webchannel_private.pri E:/Working/Development/Tools/msys/mingw64/share/qt5/mkspecs/modules/qt_lib_webkit.pri E:/Working/Development/Tools/msys/mingw64/share/qt5/mkspecs/modules/qt_lib_webkit_private.pri E:/Working/Development/Tools/msys/mingw64/share/qt5/mkspecs/modules/qt_lib_webkitwidgets.pri E:/Working/Development/Tools/msys/mingw64/share/qt5/mkspecs/modules/qt_lib_webkitwidgets_private.pri E:/Working/Development/Tools/msys/mingw64/share/qt5/mkspecs/modules/qt_lib_websockets.pri E:/Working/Development/Tools/msys/mingw64/share/qt5/mkspecs/modules/qt_lib_websockets_private.pri E:/Working/Development/Tools/msys/mingw64/share/qt5/mkspecs/modules/qt_lib_widgets.pri E:/Working/Development/Tools/msys/mingw64/share/qt5/mkspecs/modules/qt_lib_widgets_private.pri E:/Working/Development/Tools/msys/mingw64/share/qt5/mkspecs/modules/qt_lib_winextras.pri E:/Working/Development/Tools/msys/mingw64/share/qt5/mkspecs/modules/qt_lib_winextras_private.pri E:/Working/Development/Tools/msys/mingw64/share/qt5/mkspecs/modules/qt_lib_xml.pri E:/Working/Development/Tools/msys/mingw64/share/qt5/mkspecs/modules/qt_lib_xml_private.pri E:/Working/Development/Tools/msys/mingw64/share/qt5/mkspecs/modules/qt_lib_xmlpatterns.pri E:/Working/Development/Tools/msys/mingw64/share/qt5/mkspecs/modules/qt_lib_xmlpatterns_private.pri E:/Working/Development/Tools/msys/mingw64/share/qt5/mkspecs/features/qt_functions.prf E:/Working/Development/Tools/msys/mingw64/share/qt5/mkspecs/features/qt_config.prf E:/Working/Development/Tools/msys/mingw64/share/qt5/mkspecs/features/win32/qt_config.prf E:/Working/Development/Tools/msys/mingw64/share/qt5/mkspecs/win32-g++/qmake.conf E:/Working/Development/Tools/msys/mingw64/share/qt5/mkspecs/features/spec_post.prf E:/Working/Development/Tools/msys/mingw64/share/qt5/mkspecs/features/exclusive_builds.prf E:/Working/Development/Tools/msys/mingw64/share/qt5/mkspecs/features/default_pre.prf E:/Working/Development/Tools/msys/mingw64/share/qt5/mkspecs/features/win32/default_pre.prf ../deployment.pri E:/Working/Development/Tools/msys/mingw64/share/qt5/mkspecs/features/resolve_config.prf E:/Working/Development/Tools/msys/mingw64/share/qt5/mkspecs/features/exclusive_builds_post.prf E:/Working/Development/Tools/msys/mingw64/share/qt5/mkspecs/features/default_post.prf E:/Working/Development/Tools/msys/mingw64/share/qt5/mkspecs/features/build_pass.prf E:/Working/Development/Tools/msys/mingw64/share/qt5/mkspecs/features/win32/console.prf E:/Working/Development/Tools/msys/mingw64/share/qt5/mkspecs/features/win32/rtti.prf E:/Working/Development/Tools/msys/mingw64/share/qt5/mkspecs/features/precompile_header.prf E:/Working/Development/Tools/msys/mingw64/share/qt5/mkspecs/features/warn_on.prf E:/Working/Development/Tools/msys/mingw64/share/qt5/mkspecs/features/qt.prf E:/Working/Development/Tools/msys/mingw64/share/qt5/mkspecs/features/resources.prf E:/Working/Development/Tools/msys/mingw64/share/qt5/mkspecs/features/moc.prf E:/Working/Development/Tools/msys/mingw64/share/qt5/mkspecs/features/win32/opengl.prf E:/Working/Development/Tools/msys/mingw64/share/qt5/mkspecs/features/uic.prf E:/Working/Development/Tools/msys/mingw64/share/qt5/mkspecs/features/testcase_targets.prf E:/Working/Development/Tools/msys/mingw64/share/qt5/mkspecs/features/exceptions.prf E:/Working/Development/Tools/msys/mingw64/share/qt5/mkspecs/features/yacc.prf E:/Working/Development/Tools/msys/mingw64/share/qt5/mkspecs/features/lex.prf ../wrapper.pro NO_PCH_SOURCES RESOURCES HEADERS SOURCES OBJECTIVE_SOURCES FORMS YACCSOURCES YACCSOURCES LEXSOURCES + $(ZIP) wrapper.zip $(SOURCES) $(DIST) ../../wrapper.pro E:/Working/Development/Tools/msys/mingw64/share/qt5/mkspecs/features/spec_pre.prf E:/Working/Development/Tools/msys/mingw64/share/qt5/mkspecs/qdevice.pri E:/Working/Development/Tools/msys/mingw64/share/qt5/mkspecs/features/device_config.prf E:/Working/Development/Tools/msys/mingw64/share/qt5/mkspecs/qconfig.pri E:/Working/Development/Tools/msys/mingw64/share/qt5/mkspecs/modules/qt_lib_3dcore.pri E:/Working/Development/Tools/msys/mingw64/share/qt5/mkspecs/modules/qt_lib_3dcore_private.pri E:/Working/Development/Tools/msys/mingw64/share/qt5/mkspecs/modules/qt_lib_3dinput.pri E:/Working/Development/Tools/msys/mingw64/share/qt5/mkspecs/modules/qt_lib_3dinput_private.pri E:/Working/Development/Tools/msys/mingw64/share/qt5/mkspecs/modules/qt_lib_3dquick.pri E:/Working/Development/Tools/msys/mingw64/share/qt5/mkspecs/modules/qt_lib_3dquick_private.pri E:/Working/Development/Tools/msys/mingw64/share/qt5/mkspecs/modules/qt_lib_3dquickrenderer.pri E:/Working/Development/Tools/msys/mingw64/share/qt5/mkspecs/modules/qt_lib_3dquickrenderer_private.pri E:/Working/Development/Tools/msys/mingw64/share/qt5/mkspecs/modules/qt_lib_3drenderer.pri E:/Working/Development/Tools/msys/mingw64/share/qt5/mkspecs/modules/qt_lib_3drenderer_private.pri E:/Working/Development/Tools/msys/mingw64/share/qt5/mkspecs/modules/qt_lib_axbase.pri E:/Working/Development/Tools/msys/mingw64/share/qt5/mkspecs/modules/qt_lib_axbase_private.pri E:/Working/Development/Tools/msys/mingw64/share/qt5/mkspecs/modules/qt_lib_axcontainer.pri E:/Working/Development/Tools/msys/mingw64/share/qt5/mkspecs/modules/qt_lib_axcontainer_private.pri E:/Working/Development/Tools/msys/mingw64/share/qt5/mkspecs/modules/qt_lib_axserver.pri E:/Working/Development/Tools/msys/mingw64/share/qt5/mkspecs/modules/qt_lib_axserver_private.pri E:/Working/Development/Tools/msys/mingw64/share/qt5/mkspecs/modules/qt_lib_bluetooth.pri E:/Working/Development/Tools/msys/mingw64/share/qt5/mkspecs/modules/qt_lib_bluetooth_private.pri E:/Working/Development/Tools/msys/mingw64/share/qt5/mkspecs/modules/qt_lib_bootstrap_private.pri E:/Working/Development/Tools/msys/mingw64/share/qt5/mkspecs/modules/qt_lib_clucene_private.pri E:/Working/Development/Tools/msys/mingw64/share/qt5/mkspecs/modules/qt_lib_concurrent.pri E:/Working/Development/Tools/msys/mingw64/share/qt5/mkspecs/modules/qt_lib_concurrent_private.pri E:/Working/Development/Tools/msys/mingw64/share/qt5/mkspecs/modules/qt_lib_core.pri E:/Working/Development/Tools/msys/mingw64/share/qt5/mkspecs/modules/qt_lib_core_private.pri E:/Working/Development/Tools/msys/mingw64/share/qt5/mkspecs/modules/qt_lib_dbus.pri E:/Working/Development/Tools/msys/mingw64/share/qt5/mkspecs/modules/qt_lib_dbus_private.pri E:/Working/Development/Tools/msys/mingw64/share/qt5/mkspecs/modules/qt_lib_declarative.pri E:/Working/Development/Tools/msys/mingw64/share/qt5/mkspecs/modules/qt_lib_declarative_private.pri E:/Working/Development/Tools/msys/mingw64/share/qt5/mkspecs/modules/qt_lib_designer.pri E:/Working/Development/Tools/msys/mingw64/share/qt5/mkspecs/modules/qt_lib_designer_private.pri E:/Working/Development/Tools/msys/mingw64/share/qt5/mkspecs/modules/qt_lib_designercomponents_private.pri E:/Working/Development/Tools/msys/mingw64/share/qt5/mkspecs/modules/qt_lib_enginio.pri E:/Working/Development/Tools/msys/mingw64/share/qt5/mkspecs/modules/qt_lib_enginio_private.pri E:/Working/Development/Tools/msys/mingw64/share/qt5/mkspecs/modules/qt_lib_gui.pri E:/Working/Development/Tools/msys/mingw64/share/qt5/mkspecs/modules/qt_lib_gui_private.pri E:/Working/Development/Tools/msys/mingw64/share/qt5/mkspecs/modules/qt_lib_help.pri E:/Working/Development/Tools/msys/mingw64/share/qt5/mkspecs/modules/qt_lib_help_private.pri E:/Working/Development/Tools/msys/mingw64/share/qt5/mkspecs/modules/qt_lib_location.pri E:/Working/Development/Tools/msys/mingw64/share/qt5/mkspecs/modules/qt_lib_location_private.pri E:/Working/Development/Tools/msys/mingw64/share/qt5/mkspecs/modules/qt_lib_multimedia.pri E:/Working/Development/Tools/msys/mingw64/share/qt5/mkspecs/modules/qt_lib_multimedia_private.pri E:/Working/Development/Tools/msys/mingw64/share/qt5/mkspecs/modules/qt_lib_multimediawidgets.pri E:/Working/Development/Tools/msys/mingw64/share/qt5/mkspecs/modules/qt_lib_multimediawidgets_private.pri E:/Working/Development/Tools/msys/mingw64/share/qt5/mkspecs/modules/qt_lib_network.pri E:/Working/Development/Tools/msys/mingw64/share/qt5/mkspecs/modules/qt_lib_network_private.pri E:/Working/Development/Tools/msys/mingw64/share/qt5/mkspecs/modules/qt_lib_nfc.pri E:/Working/Development/Tools/msys/mingw64/share/qt5/mkspecs/modules/qt_lib_nfc_private.pri E:/Working/Development/Tools/msys/mingw64/share/qt5/mkspecs/modules/qt_lib_opengl.pri E:/Working/Development/Tools/msys/mingw64/share/qt5/mkspecs/modules/qt_lib_opengl_private.pri E:/Working/Development/Tools/msys/mingw64/share/qt5/mkspecs/modules/qt_lib_openglextensions.pri E:/Working/Development/Tools/msys/mingw64/share/qt5/mkspecs/modules/qt_lib_openglextensions_private.pri E:/Working/Development/Tools/msys/mingw64/share/qt5/mkspecs/modules/qt_lib_platformsupport_private.pri E:/Working/Development/Tools/msys/mingw64/share/qt5/mkspecs/modules/qt_lib_positioning.pri E:/Working/Development/Tools/msys/mingw64/share/qt5/mkspecs/modules/qt_lib_positioning_private.pri E:/Working/Development/Tools/msys/mingw64/share/qt5/mkspecs/modules/qt_lib_printsupport.pri E:/Working/Development/Tools/msys/mingw64/share/qt5/mkspecs/modules/qt_lib_printsupport_private.pri E:/Working/Development/Tools/msys/mingw64/share/qt5/mkspecs/modules/qt_lib_qml.pri E:/Working/Development/Tools/msys/mingw64/share/qt5/mkspecs/modules/qt_lib_qml_private.pri E:/Working/Development/Tools/msys/mingw64/share/qt5/mkspecs/modules/qt_lib_qmldevtools_private.pri E:/Working/Development/Tools/msys/mingw64/share/qt5/mkspecs/modules/qt_lib_qmltest.pri E:/Working/Development/Tools/msys/mingw64/share/qt5/mkspecs/modules/qt_lib_qmltest_private.pri E:/Working/Development/Tools/msys/mingw64/share/qt5/mkspecs/modules/qt_lib_qtmultimediaquicktools_private.pri E:/Working/Development/Tools/msys/mingw64/share/qt5/mkspecs/modules/qt_lib_quick.pri E:/Working/Development/Tools/msys/mingw64/share/qt5/mkspecs/modules/qt_lib_quick_private.pri E:/Working/Development/Tools/msys/mingw64/share/qt5/mkspecs/modules/qt_lib_quickparticles_private.pri E:/Working/Development/Tools/msys/mingw64/share/qt5/mkspecs/modules/qt_lib_quickwidgets.pri E:/Working/Development/Tools/msys/mingw64/share/qt5/mkspecs/modules/qt_lib_quickwidgets_private.pri E:/Working/Development/Tools/msys/mingw64/share/qt5/mkspecs/modules/qt_lib_script.pri E:/Working/Development/Tools/msys/mingw64/share/qt5/mkspecs/modules/qt_lib_script_private.pri E:/Working/Development/Tools/msys/mingw64/share/qt5/mkspecs/modules/qt_lib_scripttools.pri E:/Working/Development/Tools/msys/mingw64/share/qt5/mkspecs/modules/qt_lib_scripttools_private.pri E:/Working/Development/Tools/msys/mingw64/share/qt5/mkspecs/modules/qt_lib_sensors.pri E:/Working/Development/Tools/msys/mingw64/share/qt5/mkspecs/modules/qt_lib_sensors_private.pri E:/Working/Development/Tools/msys/mingw64/share/qt5/mkspecs/modules/qt_lib_serialport.pri E:/Working/Development/Tools/msys/mingw64/share/qt5/mkspecs/modules/qt_lib_serialport_private.pri E:/Working/Development/Tools/msys/mingw64/share/qt5/mkspecs/modules/qt_lib_sql.pri E:/Working/Development/Tools/msys/mingw64/share/qt5/mkspecs/modules/qt_lib_sql_private.pri E:/Working/Development/Tools/msys/mingw64/share/qt5/mkspecs/modules/qt_lib_svg.pri E:/Working/Development/Tools/msys/mingw64/share/qt5/mkspecs/modules/qt_lib_svg_private.pri E:/Working/Development/Tools/msys/mingw64/share/qt5/mkspecs/modules/qt_lib_testlib.pri E:/Working/Development/Tools/msys/mingw64/share/qt5/mkspecs/modules/qt_lib_testlib_private.pri E:/Working/Development/Tools/msys/mingw64/share/qt5/mkspecs/modules/qt_lib_uiplugin.pri E:/Working/Development/Tools/msys/mingw64/share/qt5/mkspecs/modules/qt_lib_uitools.pri E:/Working/Development/Tools/msys/mingw64/share/qt5/mkspecs/modules/qt_lib_uitools_private.pri E:/Working/Development/Tools/msys/mingw64/share/qt5/mkspecs/modules/qt_lib_webchannel.pri E:/Working/Development/Tools/msys/mingw64/share/qt5/mkspecs/modules/qt_lib_webchannel_private.pri E:/Working/Development/Tools/msys/mingw64/share/qt5/mkspecs/modules/qt_lib_webkit.pri E:/Working/Development/Tools/msys/mingw64/share/qt5/mkspecs/modules/qt_lib_webkit_private.pri E:/Working/Development/Tools/msys/mingw64/share/qt5/mkspecs/modules/qt_lib_webkitwidgets.pri E:/Working/Development/Tools/msys/mingw64/share/qt5/mkspecs/modules/qt_lib_webkitwidgets_private.pri E:/Working/Development/Tools/msys/mingw64/share/qt5/mkspecs/modules/qt_lib_websockets.pri E:/Working/Development/Tools/msys/mingw64/share/qt5/mkspecs/modules/qt_lib_websockets_private.pri E:/Working/Development/Tools/msys/mingw64/share/qt5/mkspecs/modules/qt_lib_widgets.pri E:/Working/Development/Tools/msys/mingw64/share/qt5/mkspecs/modules/qt_lib_widgets_private.pri E:/Working/Development/Tools/msys/mingw64/share/qt5/mkspecs/modules/qt_lib_winextras.pri E:/Working/Development/Tools/msys/mingw64/share/qt5/mkspecs/modules/qt_lib_winextras_private.pri E:/Working/Development/Tools/msys/mingw64/share/qt5/mkspecs/modules/qt_lib_xml.pri E:/Working/Development/Tools/msys/mingw64/share/qt5/mkspecs/modules/qt_lib_xml_private.pri E:/Working/Development/Tools/msys/mingw64/share/qt5/mkspecs/modules/qt_lib_xmlpatterns.pri E:/Working/Development/Tools/msys/mingw64/share/qt5/mkspecs/modules/qt_lib_xmlpatterns_private.pri E:/Working/Development/Tools/msys/mingw64/share/qt5/mkspecs/features/qt_functions.prf E:/Working/Development/Tools/msys/mingw64/share/qt5/mkspecs/features/qt_config.prf E:/Working/Development/Tools/msys/mingw64/share/qt5/mkspecs/features/win32/qt_config.prf E:/Working/Development/Tools/msys/mingw64/share/qt5/mkspecs/win32-g++/qmake.conf E:/Working/Development/Tools/msys/mingw64/share/qt5/mkspecs/features/spec_post.prf E:/Working/Development/Tools/msys/mingw64/share/qt5/mkspecs/features/exclusive_builds.prf E:/Working/Development/Tools/msys/mingw64/share/qt5/mkspecs/features/default_pre.prf E:/Working/Development/Tools/msys/mingw64/share/qt5/mkspecs/features/win32/default_pre.prf ../deployment.pri E:/Working/Development/Tools/msys/mingw64/share/qt5/mkspecs/features/resolve_config.prf E:/Working/Development/Tools/msys/mingw64/share/qt5/mkspecs/features/exclusive_builds_post.prf E:/Working/Development/Tools/msys/mingw64/share/qt5/mkspecs/features/default_post.prf E:/Working/Development/Tools/msys/mingw64/share/qt5/mkspecs/features/build_pass.prf E:/Working/Development/Tools/msys/mingw64/share/qt5/mkspecs/features/win32/console.prf E:/Working/Development/Tools/msys/mingw64/share/qt5/mkspecs/features/win32/rtti.prf E:/Working/Development/Tools/msys/mingw64/share/qt5/mkspecs/features/precompile_header.prf E:/Working/Development/Tools/msys/mingw64/share/qt5/mkspecs/features/warn_on.prf E:/Working/Development/Tools/msys/mingw64/share/qt5/mkspecs/features/qt.prf E:/Working/Development/Tools/msys/mingw64/share/qt5/mkspecs/features/resources.prf E:/Working/Development/Tools/msys/mingw64/share/qt5/mkspecs/features/moc.prf E:/Working/Development/Tools/msys/mingw64/share/qt5/mkspecs/features/win32/opengl.prf E:/Working/Development/Tools/msys/mingw64/share/qt5/mkspecs/features/uic.prf E:/Working/Development/Tools/msys/mingw64/share/qt5/mkspecs/features/testcase_targets.prf E:/Working/Development/Tools/msys/mingw64/share/qt5/mkspecs/features/exceptions.prf E:/Working/Development/Tools/msys/mingw64/share/qt5/mkspecs/features/yacc.prf E:/Working/Development/Tools/msys/mingw64/share/qt5/mkspecs/features/lex.prf ../wrapper.pro NO_PCH_SOURCES RESOURCES HEADERS SOURCES OBJECTIVE_SOURCES FORMS YACCSOURCES YACCSOURCES LEXSOURCES clean: compiler_clean -$(DEL_FILE) debug/wrapper.o @@ -122,6 +122,56 @@ compiler_clean: debug/wrapper.o: ../wrapper.cpp ../../wimp/wimp.h \ ../../wimp/wimp_global.h \ + D:/PortableData/CloudServices/Data/Home/Andres/repositories/retroarch/configuration.h \ + D:/PortableData/CloudServices/Data/Home/Andres/repositories/retroarch/libretro-common/include/retro_miscellaneous.h \ + D:/PortableData/CloudServices/Data/Home/Andres/repositories/retroarch/libretro-common/include/compat/msvc.h \ + D:/PortableData/CloudServices/Data/Home/Andres/repositories/retroarch/libretro-common/include/retro_log.h \ + D:/PortableData/CloudServices/Data/Home/Andres/repositories/retroarch/libretro-common/include/retro_inline.h \ + D:/PortableData/CloudServices/Data/Home/Andres/repositories/retroarch/libretro-common/include/boolean.h \ + D:/PortableData/CloudServices/Data/Home/Andres/repositories/retroarch/libretro-common/include/compat/posix_string.h \ + D:/PortableData/CloudServices/Data/Home/Andres/repositories/retroarch/libretro-common/include/compat/strl.h \ + D:/PortableData/CloudServices/Data/Home/Andres/repositories/retroarch/config.h \ + D:/PortableData/CloudServices/Data/Home/Andres/repositories/retroarch/libretro-common/include/retro_endianness.h \ + D:/PortableData/CloudServices/Data/Home/Andres/repositories/retroarch/driver.h \ + D:/PortableData/CloudServices/Data/Home/Andres/repositories/retroarch/libretro_private.h \ + D:/PortableData/CloudServices/Data/Home/Andres/repositories/retroarch/libretro.h \ + D:/PortableData/CloudServices/Data/Home/Andres/repositories/retroarch/frontend/frontend_driver.h \ + ../../../../ui_companion_driver.h \ + D:/PortableData/CloudServices/Data/Home/Andres/repositories/retroarch/libretro-common/include/file/file_list.h \ + D:/PortableData/CloudServices/Data/Home/Andres/repositories/retroarch/command_event.h \ + D:/PortableData/CloudServices/Data/Home/Andres/repositories/retroarch/gfx/video_driver.h \ + D:/PortableData/CloudServices/Data/Home/Andres/repositories/retroarch/libretro-common/include/gfx/scaler/scaler.h \ + D:/PortableData/CloudServices/Data/Home/Andres/repositories/retroarch/libretro-common/include/clamping.h \ + D:/PortableData/CloudServices/Data/Home/Andres/repositories/retroarch/gfx/video_filter.h \ + D:/PortableData/CloudServices/Data/Home/Andres/repositories/retroarch/gfx/video_shader_parse.h \ + D:/PortableData/CloudServices/Data/Home/Andres/repositories/retroarch/libretro-common/include/file/config_file.h \ + D:/PortableData/CloudServices/Data/Home/Andres/repositories/retroarch/gfx/video_state_tracker.h \ + D:/PortableData/CloudServices/Data/Home/Andres/repositories/retroarch/gfx/video_viewport.h \ + D:/PortableData/CloudServices/Data/Home/Andres/repositories/retroarch/input/input_driver.h \ + D:/PortableData/CloudServices/Data/Home/Andres/repositories/retroarch/input/input_joypad_driver.h \ + D:/PortableData/CloudServices/Data/Home/Andres/repositories/retroarch/input/input_overlay.h \ + D:/PortableData/CloudServices/Data/Home/Andres/repositories/retroarch/gfx/font_renderer_driver.h \ + D:/PortableData/CloudServices/Data/Home/Andres/repositories/retroarch/audio/audio_driver.h \ + D:/PortableData/CloudServices/Data/Home/Andres/repositories/retroarch/audio/audio_dsp_filter.h \ + D:/PortableData/CloudServices/Data/Home/Andres/repositories/retroarch/camera/camera_driver.h \ + D:/PortableData/CloudServices/Data/Home/Andres/repositories/retroarch/location/location_driver.h \ + D:/PortableData/CloudServices/Data/Home/Andres/repositories/retroarch/audio/audio_resampler_driver.h \ + D:/PortableData/CloudServices/Data/Home/Andres/repositories/retroarch/record/record_driver.h \ + D:/PortableData/CloudServices/Data/Home/Andres/repositories/retroarch/libretro_version_1.h \ + D:/PortableData/CloudServices/Data/Home/Andres/repositories/retroarch/menu/menu_driver.h \ + D:/PortableData/CloudServices/Data/Home/Andres/repositories/retroarch/menu/menu_animation.h \ + D:/PortableData/CloudServices/Data/Home/Andres/repositories/retroarch/menu/menu_display.h \ + D:/PortableData/CloudServices/Data/Home/Andres/repositories/retroarch/libretro-common/include/queues/message_queue.h \ + D:/PortableData/CloudServices/Data/Home/Andres/repositories/retroarch/menu/menu_displaylist.h \ + D:/PortableData/CloudServices/Data/Home/Andres/repositories/retroarch/menu/menu_setting.h \ + D:/PortableData/CloudServices/Data/Home/Andres/repositories/retroarch/menu/menu_entries.h \ + D:/PortableData/CloudServices/Data/Home/Andres/repositories/retroarch/menu/menu_navigation.h \ + D:/PortableData/CloudServices/Data/Home/Andres/repositories/retroarch/menu/menu_list.h \ + D:/PortableData/CloudServices/Data/Home/Andres/repositories/retroarch/menu/menu_entry.h \ + D:/PortableData/CloudServices/Data/Home/Andres/repositories/retroarch/menu/menu_input.h \ + D:/PortableData/CloudServices/Data/Home/Andres/repositories/retroarch/input/keyboard_line.h \ + D:/PortableData/CloudServices/Data/Home/Andres/repositories/retroarch/playlist.h \ + D:/PortableData/CloudServices/Data/Home/Andres/repositories/retroarch/command.h \ ../wrapper.h $(CXX) -c $(CXXFLAGS) $(INCPATH) -o debug/wrapper.o ../wrapper.cpp diff --git a/ui/drivers/qt/wrapper/build/Makefile.Release b/ui/drivers/qt/wrapper/build/Makefile.Release index 0a93739ee0..063aff3fdd 100644 --- a/ui/drivers/qt/wrapper/build/Makefile.Release +++ b/ui/drivers/qt/wrapper/build/Makefile.Release @@ -14,7 +14,7 @@ CXX = g++ DEFINES = -DUNICODE -DQT_NO_DEBUG -DQT_QUICK_LIB -DQT_WIDGETS_LIB -DQT_GUI_LIB -DQT_QML_LIB -DQT_NETWORK_LIB -DQT_CORE_LIB CFLAGS = -pipe -fno-keep-inline-dllexport -march=nocona -mtune=core2 -O2 -Wall -Wextra $(DEFINES) CXXFLAGS = -pipe -fno-keep-inline-dllexport -march=nocona -mtune=core2 -O2 -frtti -Wall -Wextra -fexceptions -mthreads $(DEFINES) -INCPATH = -I../../wrapper -I. -I../../wimp/build/release -IE:/Working/Development/Tools/msys/mingw64/include/QtQuick -IE:/Working/Development/Tools/msys/mingw64/include/QtWidgets -IE:/Working/Development/Tools/msys/mingw64/include/QtGui -IE:/Working/Development/Tools/msys/mingw64/include/QtQml -IE:/Working/Development/Tools/msys/mingw64/include/QtNetwork -IE:/Working/Development/Tools/msys/mingw64/include/QtCore -Irelease -IE:/Working/Development/Tools/msys/mingw64/share/qt5/mkspecs/win32-g++ +INCPATH = -I../../wrapper -I. -I../../wimp/build/release -ID:/PortableData/CloudServices/Data/Home/Andres/repositories/retroarch -ID:/PortableData/CloudServices/Data/Home/Andres/repositories/retroarch/libretro-common/include -IE:/Working/Development/Tools/msys/mingw64/include/QtQuick -IE:/Working/Development/Tools/msys/mingw64/include/QtWidgets -IE:/Working/Development/Tools/msys/mingw64/include/QtGui -IE:/Working/Development/Tools/msys/mingw64/include/QtQml -IE:/Working/Development/Tools/msys/mingw64/include/QtNetwork -IE:/Working/Development/Tools/msys/mingw64/include/QtCore -Irelease -IE:/Working/Development/Tools/msys/mingw64/share/qt5/mkspecs/win32-g++ LINKER = g++ LFLAGS = -Wl,-s -shared -Wl,-subsystem,console -mthreads -Wl,--out-implib,release/libwrapper.dll.a LIBS = -lglu32 -lopengl32 -lgdi32 -luser32 -LD:/PortableData/CloudServices/Data/Home/Andres/repositories/retroarch/ui/drivers/qt/wrapper/../wimp/build/release/ -lwimp.dll -lQt5Quick -lQt5Widgets -lQt5Gui -lQt5Qml -lQt5Network -lQt5Core @@ -82,7 +82,7 @@ qmake: FORCE qmake_all: FORCE dist: - $(ZIP) wrapper.zip $(SOURCES) $(DIST) ../wrapper.pro E:/Working/Development/Tools/msys/mingw64/share/qt5/mkspecs/features/spec_pre.prf E:/Working/Development/Tools/msys/mingw64/share/qt5/mkspecs/qdevice.pri E:/Working/Development/Tools/msys/mingw64/share/qt5/mkspecs/features/device_config.prf E:/Working/Development/Tools/msys/mingw64/share/qt5/mkspecs/qconfig.pri E:/Working/Development/Tools/msys/mingw64/share/qt5/mkspecs/modules/qt_lib_3dcore.pri E:/Working/Development/Tools/msys/mingw64/share/qt5/mkspecs/modules/qt_lib_3dcore_private.pri E:/Working/Development/Tools/msys/mingw64/share/qt5/mkspecs/modules/qt_lib_3dinput.pri E:/Working/Development/Tools/msys/mingw64/share/qt5/mkspecs/modules/qt_lib_3dinput_private.pri E:/Working/Development/Tools/msys/mingw64/share/qt5/mkspecs/modules/qt_lib_3dquick.pri E:/Working/Development/Tools/msys/mingw64/share/qt5/mkspecs/modules/qt_lib_3dquick_private.pri E:/Working/Development/Tools/msys/mingw64/share/qt5/mkspecs/modules/qt_lib_3dquickrenderer.pri E:/Working/Development/Tools/msys/mingw64/share/qt5/mkspecs/modules/qt_lib_3dquickrenderer_private.pri E:/Working/Development/Tools/msys/mingw64/share/qt5/mkspecs/modules/qt_lib_3drenderer.pri E:/Working/Development/Tools/msys/mingw64/share/qt5/mkspecs/modules/qt_lib_3drenderer_private.pri E:/Working/Development/Tools/msys/mingw64/share/qt5/mkspecs/modules/qt_lib_axbase.pri E:/Working/Development/Tools/msys/mingw64/share/qt5/mkspecs/modules/qt_lib_axbase_private.pri E:/Working/Development/Tools/msys/mingw64/share/qt5/mkspecs/modules/qt_lib_axcontainer.pri E:/Working/Development/Tools/msys/mingw64/share/qt5/mkspecs/modules/qt_lib_axcontainer_private.pri E:/Working/Development/Tools/msys/mingw64/share/qt5/mkspecs/modules/qt_lib_axserver.pri E:/Working/Development/Tools/msys/mingw64/share/qt5/mkspecs/modules/qt_lib_axserver_private.pri E:/Working/Development/Tools/msys/mingw64/share/qt5/mkspecs/modules/qt_lib_bluetooth.pri E:/Working/Development/Tools/msys/mingw64/share/qt5/mkspecs/modules/qt_lib_bluetooth_private.pri E:/Working/Development/Tools/msys/mingw64/share/qt5/mkspecs/modules/qt_lib_bootstrap_private.pri E:/Working/Development/Tools/msys/mingw64/share/qt5/mkspecs/modules/qt_lib_clucene_private.pri E:/Working/Development/Tools/msys/mingw64/share/qt5/mkspecs/modules/qt_lib_concurrent.pri E:/Working/Development/Tools/msys/mingw64/share/qt5/mkspecs/modules/qt_lib_concurrent_private.pri E:/Working/Development/Tools/msys/mingw64/share/qt5/mkspecs/modules/qt_lib_core.pri E:/Working/Development/Tools/msys/mingw64/share/qt5/mkspecs/modules/qt_lib_core_private.pri E:/Working/Development/Tools/msys/mingw64/share/qt5/mkspecs/modules/qt_lib_dbus.pri E:/Working/Development/Tools/msys/mingw64/share/qt5/mkspecs/modules/qt_lib_dbus_private.pri E:/Working/Development/Tools/msys/mingw64/share/qt5/mkspecs/modules/qt_lib_declarative.pri E:/Working/Development/Tools/msys/mingw64/share/qt5/mkspecs/modules/qt_lib_declarative_private.pri E:/Working/Development/Tools/msys/mingw64/share/qt5/mkspecs/modules/qt_lib_designer.pri E:/Working/Development/Tools/msys/mingw64/share/qt5/mkspecs/modules/qt_lib_designer_private.pri E:/Working/Development/Tools/msys/mingw64/share/qt5/mkspecs/modules/qt_lib_designercomponents_private.pri E:/Working/Development/Tools/msys/mingw64/share/qt5/mkspecs/modules/qt_lib_enginio.pri E:/Working/Development/Tools/msys/mingw64/share/qt5/mkspecs/modules/qt_lib_enginio_private.pri E:/Working/Development/Tools/msys/mingw64/share/qt5/mkspecs/modules/qt_lib_gui.pri E:/Working/Development/Tools/msys/mingw64/share/qt5/mkspecs/modules/qt_lib_gui_private.pri E:/Working/Development/Tools/msys/mingw64/share/qt5/mkspecs/modules/qt_lib_help.pri E:/Working/Development/Tools/msys/mingw64/share/qt5/mkspecs/modules/qt_lib_help_private.pri E:/Working/Development/Tools/msys/mingw64/share/qt5/mkspecs/modules/qt_lib_location.pri E:/Working/Development/Tools/msys/mingw64/share/qt5/mkspecs/modules/qt_lib_location_private.pri E:/Working/Development/Tools/msys/mingw64/share/qt5/mkspecs/modules/qt_lib_multimedia.pri E:/Working/Development/Tools/msys/mingw64/share/qt5/mkspecs/modules/qt_lib_multimedia_private.pri E:/Working/Development/Tools/msys/mingw64/share/qt5/mkspecs/modules/qt_lib_multimediawidgets.pri E:/Working/Development/Tools/msys/mingw64/share/qt5/mkspecs/modules/qt_lib_multimediawidgets_private.pri E:/Working/Development/Tools/msys/mingw64/share/qt5/mkspecs/modules/qt_lib_network.pri E:/Working/Development/Tools/msys/mingw64/share/qt5/mkspecs/modules/qt_lib_network_private.pri E:/Working/Development/Tools/msys/mingw64/share/qt5/mkspecs/modules/qt_lib_nfc.pri E:/Working/Development/Tools/msys/mingw64/share/qt5/mkspecs/modules/qt_lib_nfc_private.pri E:/Working/Development/Tools/msys/mingw64/share/qt5/mkspecs/modules/qt_lib_opengl.pri E:/Working/Development/Tools/msys/mingw64/share/qt5/mkspecs/modules/qt_lib_opengl_private.pri E:/Working/Development/Tools/msys/mingw64/share/qt5/mkspecs/modules/qt_lib_openglextensions.pri E:/Working/Development/Tools/msys/mingw64/share/qt5/mkspecs/modules/qt_lib_openglextensions_private.pri E:/Working/Development/Tools/msys/mingw64/share/qt5/mkspecs/modules/qt_lib_platformsupport_private.pri E:/Working/Development/Tools/msys/mingw64/share/qt5/mkspecs/modules/qt_lib_positioning.pri E:/Working/Development/Tools/msys/mingw64/share/qt5/mkspecs/modules/qt_lib_positioning_private.pri E:/Working/Development/Tools/msys/mingw64/share/qt5/mkspecs/modules/qt_lib_printsupport.pri E:/Working/Development/Tools/msys/mingw64/share/qt5/mkspecs/modules/qt_lib_printsupport_private.pri E:/Working/Development/Tools/msys/mingw64/share/qt5/mkspecs/modules/qt_lib_qml.pri E:/Working/Development/Tools/msys/mingw64/share/qt5/mkspecs/modules/qt_lib_qml_private.pri E:/Working/Development/Tools/msys/mingw64/share/qt5/mkspecs/modules/qt_lib_qmldevtools_private.pri E:/Working/Development/Tools/msys/mingw64/share/qt5/mkspecs/modules/qt_lib_qmltest.pri E:/Working/Development/Tools/msys/mingw64/share/qt5/mkspecs/modules/qt_lib_qmltest_private.pri E:/Working/Development/Tools/msys/mingw64/share/qt5/mkspecs/modules/qt_lib_qtmultimediaquicktools_private.pri E:/Working/Development/Tools/msys/mingw64/share/qt5/mkspecs/modules/qt_lib_quick.pri E:/Working/Development/Tools/msys/mingw64/share/qt5/mkspecs/modules/qt_lib_quick_private.pri E:/Working/Development/Tools/msys/mingw64/share/qt5/mkspecs/modules/qt_lib_quickparticles_private.pri E:/Working/Development/Tools/msys/mingw64/share/qt5/mkspecs/modules/qt_lib_quickwidgets.pri E:/Working/Development/Tools/msys/mingw64/share/qt5/mkspecs/modules/qt_lib_quickwidgets_private.pri E:/Working/Development/Tools/msys/mingw64/share/qt5/mkspecs/modules/qt_lib_script.pri E:/Working/Development/Tools/msys/mingw64/share/qt5/mkspecs/modules/qt_lib_script_private.pri E:/Working/Development/Tools/msys/mingw64/share/qt5/mkspecs/modules/qt_lib_scripttools.pri E:/Working/Development/Tools/msys/mingw64/share/qt5/mkspecs/modules/qt_lib_scripttools_private.pri E:/Working/Development/Tools/msys/mingw64/share/qt5/mkspecs/modules/qt_lib_sensors.pri E:/Working/Development/Tools/msys/mingw64/share/qt5/mkspecs/modules/qt_lib_sensors_private.pri E:/Working/Development/Tools/msys/mingw64/share/qt5/mkspecs/modules/qt_lib_serialport.pri E:/Working/Development/Tools/msys/mingw64/share/qt5/mkspecs/modules/qt_lib_serialport_private.pri E:/Working/Development/Tools/msys/mingw64/share/qt5/mkspecs/modules/qt_lib_sql.pri E:/Working/Development/Tools/msys/mingw64/share/qt5/mkspecs/modules/qt_lib_sql_private.pri E:/Working/Development/Tools/msys/mingw64/share/qt5/mkspecs/modules/qt_lib_svg.pri E:/Working/Development/Tools/msys/mingw64/share/qt5/mkspecs/modules/qt_lib_svg_private.pri E:/Working/Development/Tools/msys/mingw64/share/qt5/mkspecs/modules/qt_lib_testlib.pri E:/Working/Development/Tools/msys/mingw64/share/qt5/mkspecs/modules/qt_lib_testlib_private.pri E:/Working/Development/Tools/msys/mingw64/share/qt5/mkspecs/modules/qt_lib_uiplugin.pri E:/Working/Development/Tools/msys/mingw64/share/qt5/mkspecs/modules/qt_lib_uitools.pri E:/Working/Development/Tools/msys/mingw64/share/qt5/mkspecs/modules/qt_lib_uitools_private.pri E:/Working/Development/Tools/msys/mingw64/share/qt5/mkspecs/modules/qt_lib_webchannel.pri E:/Working/Development/Tools/msys/mingw64/share/qt5/mkspecs/modules/qt_lib_webchannel_private.pri E:/Working/Development/Tools/msys/mingw64/share/qt5/mkspecs/modules/qt_lib_webkit.pri E:/Working/Development/Tools/msys/mingw64/share/qt5/mkspecs/modules/qt_lib_webkit_private.pri E:/Working/Development/Tools/msys/mingw64/share/qt5/mkspecs/modules/qt_lib_webkitwidgets.pri E:/Working/Development/Tools/msys/mingw64/share/qt5/mkspecs/modules/qt_lib_webkitwidgets_private.pri E:/Working/Development/Tools/msys/mingw64/share/qt5/mkspecs/modules/qt_lib_websockets.pri E:/Working/Development/Tools/msys/mingw64/share/qt5/mkspecs/modules/qt_lib_websockets_private.pri E:/Working/Development/Tools/msys/mingw64/share/qt5/mkspecs/modules/qt_lib_widgets.pri E:/Working/Development/Tools/msys/mingw64/share/qt5/mkspecs/modules/qt_lib_widgets_private.pri E:/Working/Development/Tools/msys/mingw64/share/qt5/mkspecs/modules/qt_lib_winextras.pri E:/Working/Development/Tools/msys/mingw64/share/qt5/mkspecs/modules/qt_lib_winextras_private.pri E:/Working/Development/Tools/msys/mingw64/share/qt5/mkspecs/modules/qt_lib_xml.pri E:/Working/Development/Tools/msys/mingw64/share/qt5/mkspecs/modules/qt_lib_xml_private.pri E:/Working/Development/Tools/msys/mingw64/share/qt5/mkspecs/modules/qt_lib_xmlpatterns.pri E:/Working/Development/Tools/msys/mingw64/share/qt5/mkspecs/modules/qt_lib_xmlpatterns_private.pri E:/Working/Development/Tools/msys/mingw64/share/qt5/mkspecs/features/qt_functions.prf E:/Working/Development/Tools/msys/mingw64/share/qt5/mkspecs/features/qt_config.prf E:/Working/Development/Tools/msys/mingw64/share/qt5/mkspecs/features/win32/qt_config.prf E:/Working/Development/Tools/msys/mingw64/share/qt5/mkspecs/win32-g++/qmake.conf E:/Working/Development/Tools/msys/mingw64/share/qt5/mkspecs/features/spec_post.prf E:/Working/Development/Tools/msys/mingw64/share/qt5/mkspecs/features/exclusive_builds.prf E:/Working/Development/Tools/msys/mingw64/share/qt5/mkspecs/features/default_pre.prf E:/Working/Development/Tools/msys/mingw64/share/qt5/mkspecs/features/win32/default_pre.prf ../deployment.pri E:/Working/Development/Tools/msys/mingw64/share/qt5/mkspecs/features/resolve_config.prf E:/Working/Development/Tools/msys/mingw64/share/qt5/mkspecs/features/exclusive_builds_post.prf E:/Working/Development/Tools/msys/mingw64/share/qt5/mkspecs/features/default_post.prf E:/Working/Development/Tools/msys/mingw64/share/qt5/mkspecs/features/build_pass.prf E:/Working/Development/Tools/msys/mingw64/share/qt5/mkspecs/features/win32/console.prf E:/Working/Development/Tools/msys/mingw64/share/qt5/mkspecs/features/win32/rtti.prf E:/Working/Development/Tools/msys/mingw64/share/qt5/mkspecs/features/precompile_header.prf E:/Working/Development/Tools/msys/mingw64/share/qt5/mkspecs/features/warn_on.prf E:/Working/Development/Tools/msys/mingw64/share/qt5/mkspecs/features/qt.prf E:/Working/Development/Tools/msys/mingw64/share/qt5/mkspecs/features/resources.prf E:/Working/Development/Tools/msys/mingw64/share/qt5/mkspecs/features/moc.prf E:/Working/Development/Tools/msys/mingw64/share/qt5/mkspecs/features/win32/opengl.prf E:/Working/Development/Tools/msys/mingw64/share/qt5/mkspecs/features/uic.prf E:/Working/Development/Tools/msys/mingw64/share/qt5/mkspecs/features/testcase_targets.prf E:/Working/Development/Tools/msys/mingw64/share/qt5/mkspecs/features/exceptions.prf E:/Working/Development/Tools/msys/mingw64/share/qt5/mkspecs/features/yacc.prf E:/Working/Development/Tools/msys/mingw64/share/qt5/mkspecs/features/lex.prf ../wrapper.pro NO_PCH_SOURCES RESOURCES HEADERS SOURCES OBJECTIVE_SOURCES FORMS YACCSOURCES YACCSOURCES LEXSOURCES + $(ZIP) wrapper.zip $(SOURCES) $(DIST) ../../wrapper.pro E:/Working/Development/Tools/msys/mingw64/share/qt5/mkspecs/features/spec_pre.prf E:/Working/Development/Tools/msys/mingw64/share/qt5/mkspecs/qdevice.pri E:/Working/Development/Tools/msys/mingw64/share/qt5/mkspecs/features/device_config.prf E:/Working/Development/Tools/msys/mingw64/share/qt5/mkspecs/qconfig.pri E:/Working/Development/Tools/msys/mingw64/share/qt5/mkspecs/modules/qt_lib_3dcore.pri E:/Working/Development/Tools/msys/mingw64/share/qt5/mkspecs/modules/qt_lib_3dcore_private.pri E:/Working/Development/Tools/msys/mingw64/share/qt5/mkspecs/modules/qt_lib_3dinput.pri E:/Working/Development/Tools/msys/mingw64/share/qt5/mkspecs/modules/qt_lib_3dinput_private.pri E:/Working/Development/Tools/msys/mingw64/share/qt5/mkspecs/modules/qt_lib_3dquick.pri E:/Working/Development/Tools/msys/mingw64/share/qt5/mkspecs/modules/qt_lib_3dquick_private.pri E:/Working/Development/Tools/msys/mingw64/share/qt5/mkspecs/modules/qt_lib_3dquickrenderer.pri E:/Working/Development/Tools/msys/mingw64/share/qt5/mkspecs/modules/qt_lib_3dquickrenderer_private.pri E:/Working/Development/Tools/msys/mingw64/share/qt5/mkspecs/modules/qt_lib_3drenderer.pri E:/Working/Development/Tools/msys/mingw64/share/qt5/mkspecs/modules/qt_lib_3drenderer_private.pri E:/Working/Development/Tools/msys/mingw64/share/qt5/mkspecs/modules/qt_lib_axbase.pri E:/Working/Development/Tools/msys/mingw64/share/qt5/mkspecs/modules/qt_lib_axbase_private.pri E:/Working/Development/Tools/msys/mingw64/share/qt5/mkspecs/modules/qt_lib_axcontainer.pri E:/Working/Development/Tools/msys/mingw64/share/qt5/mkspecs/modules/qt_lib_axcontainer_private.pri E:/Working/Development/Tools/msys/mingw64/share/qt5/mkspecs/modules/qt_lib_axserver.pri E:/Working/Development/Tools/msys/mingw64/share/qt5/mkspecs/modules/qt_lib_axserver_private.pri E:/Working/Development/Tools/msys/mingw64/share/qt5/mkspecs/modules/qt_lib_bluetooth.pri E:/Working/Development/Tools/msys/mingw64/share/qt5/mkspecs/modules/qt_lib_bluetooth_private.pri E:/Working/Development/Tools/msys/mingw64/share/qt5/mkspecs/modules/qt_lib_bootstrap_private.pri E:/Working/Development/Tools/msys/mingw64/share/qt5/mkspecs/modules/qt_lib_clucene_private.pri E:/Working/Development/Tools/msys/mingw64/share/qt5/mkspecs/modules/qt_lib_concurrent.pri E:/Working/Development/Tools/msys/mingw64/share/qt5/mkspecs/modules/qt_lib_concurrent_private.pri E:/Working/Development/Tools/msys/mingw64/share/qt5/mkspecs/modules/qt_lib_core.pri E:/Working/Development/Tools/msys/mingw64/share/qt5/mkspecs/modules/qt_lib_core_private.pri E:/Working/Development/Tools/msys/mingw64/share/qt5/mkspecs/modules/qt_lib_dbus.pri E:/Working/Development/Tools/msys/mingw64/share/qt5/mkspecs/modules/qt_lib_dbus_private.pri E:/Working/Development/Tools/msys/mingw64/share/qt5/mkspecs/modules/qt_lib_declarative.pri E:/Working/Development/Tools/msys/mingw64/share/qt5/mkspecs/modules/qt_lib_declarative_private.pri E:/Working/Development/Tools/msys/mingw64/share/qt5/mkspecs/modules/qt_lib_designer.pri E:/Working/Development/Tools/msys/mingw64/share/qt5/mkspecs/modules/qt_lib_designer_private.pri E:/Working/Development/Tools/msys/mingw64/share/qt5/mkspecs/modules/qt_lib_designercomponents_private.pri E:/Working/Development/Tools/msys/mingw64/share/qt5/mkspecs/modules/qt_lib_enginio.pri E:/Working/Development/Tools/msys/mingw64/share/qt5/mkspecs/modules/qt_lib_enginio_private.pri E:/Working/Development/Tools/msys/mingw64/share/qt5/mkspecs/modules/qt_lib_gui.pri E:/Working/Development/Tools/msys/mingw64/share/qt5/mkspecs/modules/qt_lib_gui_private.pri E:/Working/Development/Tools/msys/mingw64/share/qt5/mkspecs/modules/qt_lib_help.pri E:/Working/Development/Tools/msys/mingw64/share/qt5/mkspecs/modules/qt_lib_help_private.pri E:/Working/Development/Tools/msys/mingw64/share/qt5/mkspecs/modules/qt_lib_location.pri E:/Working/Development/Tools/msys/mingw64/share/qt5/mkspecs/modules/qt_lib_location_private.pri E:/Working/Development/Tools/msys/mingw64/share/qt5/mkspecs/modules/qt_lib_multimedia.pri E:/Working/Development/Tools/msys/mingw64/share/qt5/mkspecs/modules/qt_lib_multimedia_private.pri E:/Working/Development/Tools/msys/mingw64/share/qt5/mkspecs/modules/qt_lib_multimediawidgets.pri E:/Working/Development/Tools/msys/mingw64/share/qt5/mkspecs/modules/qt_lib_multimediawidgets_private.pri E:/Working/Development/Tools/msys/mingw64/share/qt5/mkspecs/modules/qt_lib_network.pri E:/Working/Development/Tools/msys/mingw64/share/qt5/mkspecs/modules/qt_lib_network_private.pri E:/Working/Development/Tools/msys/mingw64/share/qt5/mkspecs/modules/qt_lib_nfc.pri E:/Working/Development/Tools/msys/mingw64/share/qt5/mkspecs/modules/qt_lib_nfc_private.pri E:/Working/Development/Tools/msys/mingw64/share/qt5/mkspecs/modules/qt_lib_opengl.pri E:/Working/Development/Tools/msys/mingw64/share/qt5/mkspecs/modules/qt_lib_opengl_private.pri E:/Working/Development/Tools/msys/mingw64/share/qt5/mkspecs/modules/qt_lib_openglextensions.pri E:/Working/Development/Tools/msys/mingw64/share/qt5/mkspecs/modules/qt_lib_openglextensions_private.pri E:/Working/Development/Tools/msys/mingw64/share/qt5/mkspecs/modules/qt_lib_platformsupport_private.pri E:/Working/Development/Tools/msys/mingw64/share/qt5/mkspecs/modules/qt_lib_positioning.pri E:/Working/Development/Tools/msys/mingw64/share/qt5/mkspecs/modules/qt_lib_positioning_private.pri E:/Working/Development/Tools/msys/mingw64/share/qt5/mkspecs/modules/qt_lib_printsupport.pri E:/Working/Development/Tools/msys/mingw64/share/qt5/mkspecs/modules/qt_lib_printsupport_private.pri E:/Working/Development/Tools/msys/mingw64/share/qt5/mkspecs/modules/qt_lib_qml.pri E:/Working/Development/Tools/msys/mingw64/share/qt5/mkspecs/modules/qt_lib_qml_private.pri E:/Working/Development/Tools/msys/mingw64/share/qt5/mkspecs/modules/qt_lib_qmldevtools_private.pri E:/Working/Development/Tools/msys/mingw64/share/qt5/mkspecs/modules/qt_lib_qmltest.pri E:/Working/Development/Tools/msys/mingw64/share/qt5/mkspecs/modules/qt_lib_qmltest_private.pri E:/Working/Development/Tools/msys/mingw64/share/qt5/mkspecs/modules/qt_lib_qtmultimediaquicktools_private.pri E:/Working/Development/Tools/msys/mingw64/share/qt5/mkspecs/modules/qt_lib_quick.pri E:/Working/Development/Tools/msys/mingw64/share/qt5/mkspecs/modules/qt_lib_quick_private.pri E:/Working/Development/Tools/msys/mingw64/share/qt5/mkspecs/modules/qt_lib_quickparticles_private.pri E:/Working/Development/Tools/msys/mingw64/share/qt5/mkspecs/modules/qt_lib_quickwidgets.pri E:/Working/Development/Tools/msys/mingw64/share/qt5/mkspecs/modules/qt_lib_quickwidgets_private.pri E:/Working/Development/Tools/msys/mingw64/share/qt5/mkspecs/modules/qt_lib_script.pri E:/Working/Development/Tools/msys/mingw64/share/qt5/mkspecs/modules/qt_lib_script_private.pri E:/Working/Development/Tools/msys/mingw64/share/qt5/mkspecs/modules/qt_lib_scripttools.pri E:/Working/Development/Tools/msys/mingw64/share/qt5/mkspecs/modules/qt_lib_scripttools_private.pri E:/Working/Development/Tools/msys/mingw64/share/qt5/mkspecs/modules/qt_lib_sensors.pri E:/Working/Development/Tools/msys/mingw64/share/qt5/mkspecs/modules/qt_lib_sensors_private.pri E:/Working/Development/Tools/msys/mingw64/share/qt5/mkspecs/modules/qt_lib_serialport.pri E:/Working/Development/Tools/msys/mingw64/share/qt5/mkspecs/modules/qt_lib_serialport_private.pri E:/Working/Development/Tools/msys/mingw64/share/qt5/mkspecs/modules/qt_lib_sql.pri E:/Working/Development/Tools/msys/mingw64/share/qt5/mkspecs/modules/qt_lib_sql_private.pri E:/Working/Development/Tools/msys/mingw64/share/qt5/mkspecs/modules/qt_lib_svg.pri E:/Working/Development/Tools/msys/mingw64/share/qt5/mkspecs/modules/qt_lib_svg_private.pri E:/Working/Development/Tools/msys/mingw64/share/qt5/mkspecs/modules/qt_lib_testlib.pri E:/Working/Development/Tools/msys/mingw64/share/qt5/mkspecs/modules/qt_lib_testlib_private.pri E:/Working/Development/Tools/msys/mingw64/share/qt5/mkspecs/modules/qt_lib_uiplugin.pri E:/Working/Development/Tools/msys/mingw64/share/qt5/mkspecs/modules/qt_lib_uitools.pri E:/Working/Development/Tools/msys/mingw64/share/qt5/mkspecs/modules/qt_lib_uitools_private.pri E:/Working/Development/Tools/msys/mingw64/share/qt5/mkspecs/modules/qt_lib_webchannel.pri E:/Working/Development/Tools/msys/mingw64/share/qt5/mkspecs/modules/qt_lib_webchannel_private.pri E:/Working/Development/Tools/msys/mingw64/share/qt5/mkspecs/modules/qt_lib_webkit.pri E:/Working/Development/Tools/msys/mingw64/share/qt5/mkspecs/modules/qt_lib_webkit_private.pri E:/Working/Development/Tools/msys/mingw64/share/qt5/mkspecs/modules/qt_lib_webkitwidgets.pri E:/Working/Development/Tools/msys/mingw64/share/qt5/mkspecs/modules/qt_lib_webkitwidgets_private.pri E:/Working/Development/Tools/msys/mingw64/share/qt5/mkspecs/modules/qt_lib_websockets.pri E:/Working/Development/Tools/msys/mingw64/share/qt5/mkspecs/modules/qt_lib_websockets_private.pri E:/Working/Development/Tools/msys/mingw64/share/qt5/mkspecs/modules/qt_lib_widgets.pri E:/Working/Development/Tools/msys/mingw64/share/qt5/mkspecs/modules/qt_lib_widgets_private.pri E:/Working/Development/Tools/msys/mingw64/share/qt5/mkspecs/modules/qt_lib_winextras.pri E:/Working/Development/Tools/msys/mingw64/share/qt5/mkspecs/modules/qt_lib_winextras_private.pri E:/Working/Development/Tools/msys/mingw64/share/qt5/mkspecs/modules/qt_lib_xml.pri E:/Working/Development/Tools/msys/mingw64/share/qt5/mkspecs/modules/qt_lib_xml_private.pri E:/Working/Development/Tools/msys/mingw64/share/qt5/mkspecs/modules/qt_lib_xmlpatterns.pri E:/Working/Development/Tools/msys/mingw64/share/qt5/mkspecs/modules/qt_lib_xmlpatterns_private.pri E:/Working/Development/Tools/msys/mingw64/share/qt5/mkspecs/features/qt_functions.prf E:/Working/Development/Tools/msys/mingw64/share/qt5/mkspecs/features/qt_config.prf E:/Working/Development/Tools/msys/mingw64/share/qt5/mkspecs/features/win32/qt_config.prf E:/Working/Development/Tools/msys/mingw64/share/qt5/mkspecs/win32-g++/qmake.conf E:/Working/Development/Tools/msys/mingw64/share/qt5/mkspecs/features/spec_post.prf E:/Working/Development/Tools/msys/mingw64/share/qt5/mkspecs/features/exclusive_builds.prf E:/Working/Development/Tools/msys/mingw64/share/qt5/mkspecs/features/default_pre.prf E:/Working/Development/Tools/msys/mingw64/share/qt5/mkspecs/features/win32/default_pre.prf ../deployment.pri E:/Working/Development/Tools/msys/mingw64/share/qt5/mkspecs/features/resolve_config.prf E:/Working/Development/Tools/msys/mingw64/share/qt5/mkspecs/features/exclusive_builds_post.prf E:/Working/Development/Tools/msys/mingw64/share/qt5/mkspecs/features/default_post.prf E:/Working/Development/Tools/msys/mingw64/share/qt5/mkspecs/features/build_pass.prf E:/Working/Development/Tools/msys/mingw64/share/qt5/mkspecs/features/win32/console.prf E:/Working/Development/Tools/msys/mingw64/share/qt5/mkspecs/features/win32/rtti.prf E:/Working/Development/Tools/msys/mingw64/share/qt5/mkspecs/features/precompile_header.prf E:/Working/Development/Tools/msys/mingw64/share/qt5/mkspecs/features/warn_on.prf E:/Working/Development/Tools/msys/mingw64/share/qt5/mkspecs/features/qt.prf E:/Working/Development/Tools/msys/mingw64/share/qt5/mkspecs/features/resources.prf E:/Working/Development/Tools/msys/mingw64/share/qt5/mkspecs/features/moc.prf E:/Working/Development/Tools/msys/mingw64/share/qt5/mkspecs/features/win32/opengl.prf E:/Working/Development/Tools/msys/mingw64/share/qt5/mkspecs/features/uic.prf E:/Working/Development/Tools/msys/mingw64/share/qt5/mkspecs/features/testcase_targets.prf E:/Working/Development/Tools/msys/mingw64/share/qt5/mkspecs/features/exceptions.prf E:/Working/Development/Tools/msys/mingw64/share/qt5/mkspecs/features/yacc.prf E:/Working/Development/Tools/msys/mingw64/share/qt5/mkspecs/features/lex.prf ../wrapper.pro NO_PCH_SOURCES RESOURCES HEADERS SOURCES OBJECTIVE_SOURCES FORMS YACCSOURCES YACCSOURCES LEXSOURCES clean: compiler_clean -$(DEL_FILE) release/wrapper.o @@ -122,6 +122,56 @@ compiler_clean: release/wrapper.o: ../wrapper.cpp ../../wimp/wimp.h \ ../../wimp/wimp_global.h \ + D:/PortableData/CloudServices/Data/Home/Andres/repositories/retroarch/configuration.h \ + D:/PortableData/CloudServices/Data/Home/Andres/repositories/retroarch/libretro-common/include/retro_miscellaneous.h \ + D:/PortableData/CloudServices/Data/Home/Andres/repositories/retroarch/libretro-common/include/compat/msvc.h \ + D:/PortableData/CloudServices/Data/Home/Andres/repositories/retroarch/libretro-common/include/retro_log.h \ + D:/PortableData/CloudServices/Data/Home/Andres/repositories/retroarch/libretro-common/include/retro_inline.h \ + D:/PortableData/CloudServices/Data/Home/Andres/repositories/retroarch/libretro-common/include/boolean.h \ + D:/PortableData/CloudServices/Data/Home/Andres/repositories/retroarch/libretro-common/include/compat/posix_string.h \ + D:/PortableData/CloudServices/Data/Home/Andres/repositories/retroarch/libretro-common/include/compat/strl.h \ + D:/PortableData/CloudServices/Data/Home/Andres/repositories/retroarch/config.h \ + D:/PortableData/CloudServices/Data/Home/Andres/repositories/retroarch/libretro-common/include/retro_endianness.h \ + D:/PortableData/CloudServices/Data/Home/Andres/repositories/retroarch/driver.h \ + D:/PortableData/CloudServices/Data/Home/Andres/repositories/retroarch/libretro_private.h \ + D:/PortableData/CloudServices/Data/Home/Andres/repositories/retroarch/libretro.h \ + D:/PortableData/CloudServices/Data/Home/Andres/repositories/retroarch/frontend/frontend_driver.h \ + ../../../../ui_companion_driver.h \ + D:/PortableData/CloudServices/Data/Home/Andres/repositories/retroarch/libretro-common/include/file/file_list.h \ + D:/PortableData/CloudServices/Data/Home/Andres/repositories/retroarch/command_event.h \ + D:/PortableData/CloudServices/Data/Home/Andres/repositories/retroarch/gfx/video_driver.h \ + D:/PortableData/CloudServices/Data/Home/Andres/repositories/retroarch/libretro-common/include/gfx/scaler/scaler.h \ + D:/PortableData/CloudServices/Data/Home/Andres/repositories/retroarch/libretro-common/include/clamping.h \ + D:/PortableData/CloudServices/Data/Home/Andres/repositories/retroarch/gfx/video_filter.h \ + D:/PortableData/CloudServices/Data/Home/Andres/repositories/retroarch/gfx/video_shader_parse.h \ + D:/PortableData/CloudServices/Data/Home/Andres/repositories/retroarch/libretro-common/include/file/config_file.h \ + D:/PortableData/CloudServices/Data/Home/Andres/repositories/retroarch/gfx/video_state_tracker.h \ + D:/PortableData/CloudServices/Data/Home/Andres/repositories/retroarch/gfx/video_viewport.h \ + D:/PortableData/CloudServices/Data/Home/Andres/repositories/retroarch/input/input_driver.h \ + D:/PortableData/CloudServices/Data/Home/Andres/repositories/retroarch/input/input_joypad_driver.h \ + D:/PortableData/CloudServices/Data/Home/Andres/repositories/retroarch/input/input_overlay.h \ + D:/PortableData/CloudServices/Data/Home/Andres/repositories/retroarch/gfx/font_renderer_driver.h \ + D:/PortableData/CloudServices/Data/Home/Andres/repositories/retroarch/audio/audio_driver.h \ + D:/PortableData/CloudServices/Data/Home/Andres/repositories/retroarch/audio/audio_dsp_filter.h \ + D:/PortableData/CloudServices/Data/Home/Andres/repositories/retroarch/camera/camera_driver.h \ + D:/PortableData/CloudServices/Data/Home/Andres/repositories/retroarch/location/location_driver.h \ + D:/PortableData/CloudServices/Data/Home/Andres/repositories/retroarch/audio/audio_resampler_driver.h \ + D:/PortableData/CloudServices/Data/Home/Andres/repositories/retroarch/record/record_driver.h \ + D:/PortableData/CloudServices/Data/Home/Andres/repositories/retroarch/libretro_version_1.h \ + D:/PortableData/CloudServices/Data/Home/Andres/repositories/retroarch/menu/menu_driver.h \ + D:/PortableData/CloudServices/Data/Home/Andres/repositories/retroarch/menu/menu_animation.h \ + D:/PortableData/CloudServices/Data/Home/Andres/repositories/retroarch/menu/menu_display.h \ + D:/PortableData/CloudServices/Data/Home/Andres/repositories/retroarch/libretro-common/include/queues/message_queue.h \ + D:/PortableData/CloudServices/Data/Home/Andres/repositories/retroarch/menu/menu_displaylist.h \ + D:/PortableData/CloudServices/Data/Home/Andres/repositories/retroarch/menu/menu_setting.h \ + D:/PortableData/CloudServices/Data/Home/Andres/repositories/retroarch/menu/menu_entries.h \ + D:/PortableData/CloudServices/Data/Home/Andres/repositories/retroarch/menu/menu_navigation.h \ + D:/PortableData/CloudServices/Data/Home/Andres/repositories/retroarch/menu/menu_list.h \ + D:/PortableData/CloudServices/Data/Home/Andres/repositories/retroarch/menu/menu_entry.h \ + D:/PortableData/CloudServices/Data/Home/Andres/repositories/retroarch/menu/menu_input.h \ + D:/PortableData/CloudServices/Data/Home/Andres/repositories/retroarch/input/keyboard_line.h \ + D:/PortableData/CloudServices/Data/Home/Andres/repositories/retroarch/playlist.h \ + D:/PortableData/CloudServices/Data/Home/Andres/repositories/retroarch/command.h \ ../wrapper.h $(CXX) -c $(CXXFLAGS) $(INCPATH) -o release/wrapper.o ../wrapper.cpp diff --git a/ui/drivers/qt/wrapper/wrapper.cpp b/ui/drivers/qt/wrapper/wrapper.cpp index 38fa6a17dc..e67d6aa027 100644 --- a/ui/drivers/qt/wrapper/wrapper.cpp +++ b/ui/drivers/qt/wrapper/wrapper.cpp @@ -39,6 +39,11 @@ void SetTitle(Wimp*p, char* title) return p->SetTitle(title); } +void ConfigGetPtr(Wimp*p, settings_t *settings) +{ + return p->ConfigGetPtr(settings); +} + #ifdef __cplusplus } #endif diff --git a/ui/drivers/qt/wrapper/wrapper.h b/ui/drivers/qt/wrapper/wrapper.h index 603434790d..67502d4afc 100644 --- a/ui/drivers/qt/wrapper/wrapper.h +++ b/ui/drivers/qt/wrapper/wrapper.h @@ -13,6 +13,7 @@ * If not, see . */ +#include "configuration.h" #ifndef WRAPPER_H #define WRAPPER_H @@ -27,6 +28,7 @@ Wimp* ctrWimp(int argc, char *argv[]); int CreateMainWindow(Wimp* p); void SetTitle(Wimp* p, char* title); +void ConfigGetPtr(Wimp*p, settings_t *settings); #ifdef __cplusplus } diff --git a/ui/drivers/qt/wrapper/wrapper.pro b/ui/drivers/qt/wrapper/wrapper.pro index 3a298ef180..f03fbb4dbd 100644 --- a/ui/drivers/qt/wrapper/wrapper.pro +++ b/ui/drivers/qt/wrapper/wrapper.pro @@ -20,3 +20,6 @@ else:unix: LIBS += -L$$PWD/../wimp/build/ -lwimp.dll INCLUDEPATH += $$PWD/../wimp/build/release DEPENDPATH += $$PWD/../wimp/build/release + +INCLUDEPATH += $$PWD/../../../../ +INCLUDEPATH += $$PWD/../../../../libretro-common/include/ diff --git a/ui/drivers/ui_qt.c b/ui/drivers/ui_qt.c index acefd4e660..b22491c526 100644 --- a/ui/drivers/ui_qt.c +++ b/ui/drivers/ui_qt.c @@ -39,12 +39,12 @@ typedef struct ui_companion_qt static void qt_thread(void *data) { ui_companion_qt_t *handle = (ui_companion_qt_t*)data; - wimp = ctrWimp(0, NULL); + ConfigGetPtr(wimp,config_get_ptr()); if(wimp) CreateMainWindow(wimp); - return; + return; } static void ui_companion_qt_deinit(void *data) @@ -63,7 +63,6 @@ static void ui_companion_qt_deinit(void *data) static void *ui_companion_qt_init(void) { ui_companion_qt_t *handle = (ui_companion_qt_t*)calloc(1, sizeof(*handle)); - fflush(stdout); @@ -72,7 +71,7 @@ static void *ui_companion_qt_init(void) handle->lock = slock_new(); handle->thread = sthread_create(qt_thread, handle); - + if (!handle->thread) { slock_free(handle->lock); @@ -87,8 +86,8 @@ static int ui_companion_qt_iterate(void *data, unsigned action) { (void)data; (void)action; - printf("Test"); fflush(stdout); + return 0; }