Add sw gui stub.

egorpugin · egorpugin · commit 39343b9e525d · 2019-09-23T00:37:35.000+03:00
diff --git a/src/sw/driver/build_self.cpp b/src/sw/driver/build_self.cpp
@@ -22,6 +22,7 @@ DECLARE_STATIC_LOGGER(logger, "build.self");
 
 using TargetEntryPointMap = std::unordered_map<sw::PackageId, std::shared_ptr<sw::NativeBuiltinTargetEntryPoint>>;
 
+#define SW_DRIVER_ADD_SELF
 #include <build_self.generated.h>
 
 namespace sw
diff --git a/src/sw/gui/main.cpp b/src/sw/gui/main.cpp
@@ -0,0 +1,39 @@
+#include "mainwindow.h"
+
+#include <qapplication.h>
+#include <qglobal.h>
+#include <qthread.h>
+
+#ifdef QT_STATIC
+#include <QtPlugin>
+Q_IMPORT_PLUGIN(QWindowsIntegrationPlugin)
+Q_IMPORT_PLUGIN(QWindowsVistaStylePlugin)
+#endif
+
+#include <time.h>
+
+#ifdef WIN32
+#include <Windows.h>
+#endif
+
+void win32_hacks();
+
+int main(int argc, char *argv[])
+{
+    win32_hacks();
+    qsrand(time(0));
+
+    QThread t(0);
+    QApplication a(argc, argv);
+    MainWindow w;
+    w.show();
+
+    return a.exec();
+}
+
+void win32_hacks()
+{
+#ifdef WIN32
+    SetErrorMode(SEM_FAILCRITICALERRORS | SEM_NOGPFAULTERRORBOX);
+#endif
+}
diff --git a/src/sw/gui/mainwindow.cpp b/src/sw/gui/mainwindow.cpp
@@ -0,0 +1,6 @@
+#include "mainwindow.h"
+
+MainWindow::MainWindow(QWidget *parent)
+    : QMainWindow(parent)
+{
+}
diff --git a/src/sw/gui/mainwindow.h b/src/sw/gui/mainwindow.h
@@ -0,0 +1,10 @@
+#pragma once
+
+#include <qmainwindow.h>
+
+class MainWindow : public QMainWindow
+{
+    Q_OBJECT
+public:
+    MainWindow(QWidget *parent = 0);
+};
diff --git a/sw.cpp b/sw.cpp
@@ -232,6 +232,7 @@ void build(Solution &s)
         }
     }
 
+#ifndef SW_DRIVER_ADD_SELF
     auto &client = p.addTarget<ExecutableTarget>("sw");
     {
         client.PackageDefinitions = true;
@@ -280,7 +281,7 @@ void build(Solution &s)
         }
     }
 
-    /*auto &gui = client.addTarget<ExecutableTarget>("gui");
+    auto &gui = client.addTarget<ExecutableTarget>("gui");
     {
         gui.PackageDefinitions = true;
         gui.SwDefinitions = true;
@@ -290,11 +291,16 @@ void build(Solution &s)
         gui += "org.sw.demo.qtproject.qt.base.winmain-*"_dep;
         gui += "org.sw.demo.qtproject.qt.base.plugins.platforms.windows-*"_dep;
         gui += "org.sw.demo.qtproject.qt.base.plugins.styles.windowsvista-*"_dep;
-
-        if (auto L = gui.getSelectedTool()->as<VisualStudioLinker>(); L)
+
+#ifdef SW_CPP_DRIVER_API_VERSION
+        if (auto L = gui.getSelectedTool()->as<VisualStudioLinker*>(); L)
+#else
+        if (auto L = gui.getSelectedTool()->as<VisualStudioLinker>(); L)
+#endif
             L->Subsystem = vs::Subsystem::Windows;
 
         qt_moc_rcc_uic("org.sw.demo.qtproject.qt-*"_dep, gui);
         qt_tr("org.sw.demo.qtproject.qt-*"_dep, gui);
-    }*/
+    }
+#endif
 }

Original file line number	Diff line number	Diff line change
`@@ -232,6 +232,7 @@ void build(Solution &s)`
`232`	`232`	`}`
`233`	`233`	`}`
`234`	`234`
	`235`	`+#ifndef SW_DRIVER_ADD_SELF`
`235`	`236`	`auto &client = p.addTarget<ExecutableTarget>("sw");`
`236`	`237`	`{`
`237`	`238`	`client.PackageDefinitions = true;`
`@@ -280,7 +281,7 @@ void build(Solution &s)`
`280`	`281`	`}`
`281`	`282`	`}`
`282`	`283`
`283`		`- /*auto &gui = client.addTarget<ExecutableTarget>("gui");`
	`284`	`+ auto &gui = client.addTarget<ExecutableTarget>("gui");`
`284`	`285`	`{`
`285`	`286`	`gui.PackageDefinitions = true;`
`286`	`287`	`gui.SwDefinitions = true;`
`@@ -290,11 +291,16 @@ void build(Solution &s)`
`290`	`291`	`gui += "org.sw.demo.qtproject.qt.base.winmain-*"_dep;`
`291`	`292`	`gui += "org.sw.demo.qtproject.qt.base.plugins.platforms.windows-*"_dep;`
`292`	`293`	`gui += "org.sw.demo.qtproject.qt.base.plugins.styles.windowsvista-*"_dep;`
`293`		`-`
`294`		`- if (auto L = gui.getSelectedTool()->as<VisualStudioLinker>(); L)`
	`294`	`+`
	`295`	`+#ifdef SW_CPP_DRIVER_API_VERSION`
	`296`	`+ if (auto L = gui.getSelectedTool()->as<VisualStudioLinker*>(); L)`
	`297`	`+#else`
	`298`	`+ if (auto L = gui.getSelectedTool()->as<VisualStudioLinker>(); L)`
	`299`	`+#endif`
`295`	`300`	`L->Subsystem = vs::Subsystem::Windows;`
`296`	`301`
`297`	`302`	`qt_moc_rcc_uic("org.sw.demo.qtproject.qt-*"_dep, gui);`
`298`	`303`	`qt_tr("org.sw.demo.qtproject.qt-*"_dep, gui);`
`299`		`- }*/`
	`304`	`+ }`
	`305`	`+#endif`
`300`	`306`	`}`