Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Add Windows workflow #39

Merged
merged 11 commits into from
Mar 4, 2024
Merged

Add Windows workflow #39

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
11 commits
Select commit Hold shift + click to select a range
59183e6
Update on pull request trigger in the Linux workflow
adazem009 Mar 1, 2024
50ff07e
Remove qtshadertools module from the Linux workflow
adazem009 Mar 1, 2024
f2379db
Add initial Windows workflow
adazem009 Mar 1, 2024
96371d2
Update scratchcpp-render to latest master
adazem009 Mar 2, 2024
44680b2
Fix file moving in Windows workflow
adazem009 Mar 2, 2024
60f173d
Do not deploy libraries using windeployqt
adazem009 Mar 2, 2024
7499f16
Do not copy all executables in Windows workflow
adazem009 Mar 2, 2024
30b2ede
Force dependency on Qt OpenGL Widgets on Windows
adazem009 Mar 2, 2024
2e8b444
Temporarily disable audio on Windows
adazem009 Mar 2, 2024
1cf5342
Update scratchcpp-render to latest master
adazem009 Mar 2, 2024
b21299c
Add Windows installer configuration
adazem009 Mar 4, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
Force dependency on Qt OpenGL Widgets on Windows
  • Loading branch information
@adazem009
adazem009 committed Mar 2, 2024
commit 30b2edea4a806ecb7a47e059b765767993502c58
4 changes: 2 additions & 2 deletions CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,8 +7,8 @@ set(CMAKE_CXX_STANDARD_REQUIRED ON)

option(SCRATCHCPP_PLAYER_BUILD_UNIT_TESTS "Build unit tests" ON)

find_package(Qt6 6.6 COMPONENTS Quick QuickControls2 Widgets REQUIRED)
set(QT_LIBS Qt6::Quick Qt6::QuickControls2 Qt6::Widgets)
find_package(Qt6 6.6 COMPONENTS Quick QuickControls2 Widgets OpenGLWidgets REQUIRED)
set(QT_LIBS Qt6::Quick Qt6::QuickControls2 Qt6::Widgets Qt6::OpenGLWidgets)

if (SCRATCHCPP_PLAYER_BUILD_UNIT_TESTS)
set(GTEST_DIR thirdparty/googletest)
Expand Down
8 changes: 8 additions & 0 deletions src/app/app.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,10 @@
#include "modularity/ioc.h"
#include "ui/internal/uiengine.h"

#ifdef Q_OS_WINDOWS
#include <QOpenGLWidget>
#endif

using namespace scratchcpp;
using namespace scratchcpp::modularity;

Expand Down Expand Up @@ -82,6 +86,10 @@ int App::run(int argc, char **argv)

ui::UiEngine::instance()->setQmlEngine(&engine);

#ifdef Q_OS_WINDOWS
QOpenGLWidget glWidget; // force dependency on OpenGL widgets
#endif

// Run the event loop
int exitCode = app.exec();

Expand Down
Loading