Skip to content

Commit

Permalink
#2: Removed PDCurses and switch main project in solution
Browse files Browse the repository at this point in the history
  • Loading branch information
OOPMan committed Aug 13, 2019
1 parent 1dda464 commit e10ce54
Show file tree
Hide file tree
Showing 11 changed files with 117 additions and 170 deletions.
3 changes: 0 additions & 3 deletions .gitmodules
Original file line number Diff line number Diff line change
@@ -1,6 +1,3 @@
[submodule "ViGEmClient"]
path = ViGEmClient
url = https://github.com/ViGEm/ViGEmClient
[submodule "PDCurses"]
path = PDCurses
url = https://github.com/wmcbrine/PDCurses
1 change: 0 additions & 1 deletion PDCurses
Submodule PDCurses deleted from 2467ab
46 changes: 46 additions & 0 deletions XBOFS.win.qt5/GeneratedFiles/qrc_XBOFSWinQT5GUI.cpp
Original file line number Diff line number Diff line change
@@ -0,0 +1,46 @@
/****************************************************************************
** Resource object code
**
** Created by: The Resource Compiler for Qt version 5.13.0
**
** WARNING! All changes made in this file will be lost!
*****************************************************************************/

#ifdef QT_NAMESPACE
# define QT_RCC_PREPEND_NAMESPACE(name) ::QT_NAMESPACE::name
# define QT_RCC_MANGLE_NAMESPACE0(x) x
# define QT_RCC_MANGLE_NAMESPACE1(a, b) a##_##b
# define QT_RCC_MANGLE_NAMESPACE2(a, b) QT_RCC_MANGLE_NAMESPACE1(a,b)
# define QT_RCC_MANGLE_NAMESPACE(name) QT_RCC_MANGLE_NAMESPACE2( \
QT_RCC_MANGLE_NAMESPACE0(name), QT_RCC_MANGLE_NAMESPACE0(QT_NAMESPACE))
#else
# define QT_RCC_PREPEND_NAMESPACE(name) name
# define QT_RCC_MANGLE_NAMESPACE(name) name
#endif

#ifdef QT_NAMESPACE
namespace QT_NAMESPACE {
#endif

#ifdef QT_NAMESPACE
}
#endif

int QT_RCC_MANGLE_NAMESPACE(qInitResources_XBOFSWinQT5GUI)();
int QT_RCC_MANGLE_NAMESPACE(qInitResources_XBOFSWinQT5GUI)()
{
return 1;
}

int QT_RCC_MANGLE_NAMESPACE(qCleanupResources_XBOFSWinQT5GUI)();
int QT_RCC_MANGLE_NAMESPACE(qCleanupResources_XBOFSWinQT5GUI)()
{
return 1;
}

namespace {
struct initializer {
initializer() { QT_RCC_MANGLE_NAMESPACE(qInitResources_XBOFSWinQT5GUI)(); }
~initializer() { QT_RCC_MANGLE_NAMESPACE(qCleanupResources_XBOFSWinQT5GUI)(); }
} dummy;
}
66 changes: 66 additions & 0 deletions XBOFS.win.qt5/GeneratedFiles/ui_XBOFSWinQT5GUI.h
Original file line number Diff line number Diff line change
@@ -0,0 +1,66 @@
/********************************************************************************
** Form generated from reading UI file 'XBOFSWinQT5GUI.ui'
**
** Created by: Qt User Interface Compiler version 5.13.0
**
** WARNING! All changes made in this file will be lost when recompiling UI file!
********************************************************************************/

#ifndef UI_XBOFSWINQT5GUI_H
#define UI_XBOFSWINQT5GUI_H

#include <QtCore/QVariant>
#include <QtWidgets/QApplication>
#include <QtWidgets/QMainWindow>
#include <QtWidgets/QMenuBar>
#include <QtWidgets/QStatusBar>
#include <QtWidgets/QToolBar>
#include <QtWidgets/QWidget>

QT_BEGIN_NAMESPACE

class Ui_XBOFSWinQT5GUIClass
{
public:
QMenuBar *menuBar;
QToolBar *mainToolBar;
QWidget *centralWidget;
QStatusBar *statusBar;

void setupUi(QMainWindow *XBOFSWinQT5GUIClass)
{
if (XBOFSWinQT5GUIClass->objectName().isEmpty())
XBOFSWinQT5GUIClass->setObjectName(QString::fromUtf8("XBOFSWinQT5GUIClass"));
XBOFSWinQT5GUIClass->resize(600, 400);
menuBar = new QMenuBar(XBOFSWinQT5GUIClass);
menuBar->setObjectName(QString::fromUtf8("menuBar"));
XBOFSWinQT5GUIClass->setMenuBar(menuBar);
mainToolBar = new QToolBar(XBOFSWinQT5GUIClass);
mainToolBar->setObjectName(QString::fromUtf8("mainToolBar"));
XBOFSWinQT5GUIClass->addToolBar(mainToolBar);
centralWidget = new QWidget(XBOFSWinQT5GUIClass);
centralWidget->setObjectName(QString::fromUtf8("centralWidget"));
XBOFSWinQT5GUIClass->setCentralWidget(centralWidget);
statusBar = new QStatusBar(XBOFSWinQT5GUIClass);
statusBar->setObjectName(QString::fromUtf8("statusBar"));
XBOFSWinQT5GUIClass->setStatusBar(statusBar);

retranslateUi(XBOFSWinQT5GUIClass);

QMetaObject::connectSlotsByName(XBOFSWinQT5GUIClass);
} // setupUi

void retranslateUi(QMainWindow *XBOFSWinQT5GUIClass)
{
XBOFSWinQT5GUIClass->setWindowTitle(QCoreApplication::translate("XBOFSWinQT5GUIClass", "XBOFSWinQT5GUI", nullptr));
} // retranslateUi

};

namespace Ui {
class XBOFSWinQT5GUIClass: public Ui_XBOFSWinQT5GUIClass {};
} // namespace Ui

QT_END_NAMESPACE

#endif // UI_XBOFSWINQT5GUI_H
4 changes: 4 additions & 0 deletions XBOFS.win.sln
Original file line number Diff line number Diff line change
Expand Up @@ -33,6 +33,10 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "presets", "presets", "{98CB
EndProjectSection
EndProject
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "XBOFS.win.qt5", "XBOFS.win.qt5\XBOFS.win.qt5.vcxproj", "{B12702AD-ABFB-343A-A199-8E24837244A3}"
ProjectSection(ProjectDependencies) = postProject
{F6104731-5815-4BBA-A558-E859DD039413} = {F6104731-5815-4BBA-A558-E859DD039413}
{7DB06674-1F4F-464B-8E1C-172E9587F9DC} = {7DB06674-1F4F-464B-8E1C-172E9587F9DC}
EndProjectSection
EndProject
Global
GlobalSection(SolutionConfigurationPlatforms) = preSolution
Expand Down
103 changes: 0 additions & 103 deletions XBOFS.win/PDCursesUIManager.cpp

This file was deleted.

27 changes: 0 additions & 27 deletions XBOFS.win/PDCursesUIManager.h

This file was deleted.

3 changes: 0 additions & 3 deletions XBOFS.win/XBOFS.win.vcxproj
Original file line number Diff line number Diff line change
Expand Up @@ -41,8 +41,6 @@
<ItemGroup>
<ClCompile Include="device.cpp" />
<ClCompile Include="easylogging++.cc" />
<ClCompile Include="main.cpp" />
<ClCompile Include="PDCursesUIManager.cpp" />
<ClCompile Include="Thread.cpp" />
<ClCompile Include="utils.cpp" />
<ClCompile Include="WinUsbDevice.cpp" />
Expand All @@ -52,7 +50,6 @@
<ClInclude Include="device.h" />
<ClInclude Include="easylogging++.h" />
<ClInclude Include="pch.h" />
<ClInclude Include="PDCursesUIManager.h" />
<ClInclude Include="Thread.h" />
<ClInclude Include="utils.h" />
<ClInclude Include="WinUsbDevice.h" />
Expand Down
9 changes: 0 additions & 9 deletions XBOFS.win/XBOFS.win.vcxproj.filters
Original file line number Diff line number Diff line change
Expand Up @@ -34,9 +34,6 @@
<ClInclude Include="WinUsbDevice.h">
<Filter>Header Files</Filter>
</ClInclude>
<ClInclude Include="PDCursesUIManager.h">
<Filter>Header Files</Filter>
</ClInclude>
<ClInclude Include="Thread.h">
<Filter>Header Files</Filter>
</ClInclude>
Expand All @@ -45,9 +42,6 @@
</ClInclude>
</ItemGroup>
<ItemGroup>
<ClCompile Include="main.cpp">
<Filter>Source Files</Filter>
</ClCompile>
<ClCompile Include="WinUsbDeviceManager.cpp">
<Filter>Source Files</Filter>
</ClCompile>
Expand All @@ -57,9 +51,6 @@
<ClCompile Include="WinUsbDevice.cpp">
<Filter>Source Files</Filter>
</ClCompile>
<ClCompile Include="PDCursesUIManager.cpp">
<Filter>Source Files</Filter>
</ClCompile>
<ClCompile Include="Thread.cpp">
<Filter>Source Files</Filter>
</ClCompile>
Expand Down
20 changes: 0 additions & 20 deletions XBOFS.win/main.cpp

This file was deleted.

5 changes: 1 addition & 4 deletions pre-build.cmd
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,4 @@ git submodule update
ECHO Patching VigEmClient
CD VigEmClient
git apply ..\VigEmClient.patch 2>nul & exit 0
CD ..
ECHO Building pdcurses
CD PDCurses\wincon
nmake -f Makefile.vc WIDE=Y UTF8=Y
CD ..

0 comments on commit e10ce54

Please sign in to comment.