From fc89c9128e675f4a5cfa12df16c45b0993790b3b Mon Sep 17 00:00:00 2001 From: AnonymusRaccoon Date: Fri, 28 Feb 2020 11:04:55 +0100 Subject: [PATCH 1/3] Fixing CI --- .github/workflows/build.yml | 4 +++- sources/Renderer/QtRenderer/QtWidgetSFML.cpp | 2 +- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 2b7548f..494bef1 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -11,9 +11,11 @@ jobs: steps: - uses: actions/checkout@v1 - - name: Install Qt5 and the dependencies of the SFML. + - name: Install the dependencies of the SFML. run: sudo apt-get update && sudo apt-get install --yes qt5-default libfreetype6-dev libxrandr-dev libudev-dev libogg-dev libflac-dev libvorbis-dev libopenal-dev freeglut3-dev + - name: Install Qt + uses: ouuan/install-qt-action@v2.3.1 - name: Install the SFML. run: | git clone https://github.com/SFML/SFML -b 2.5.x /tmp/sfml diff --git a/sources/Renderer/QtRenderer/QtWidgetSFML.cpp b/sources/Renderer/QtRenderer/QtWidgetSFML.cpp index e65076a..8cdfe10 100644 --- a/sources/Renderer/QtRenderer/QtWidgetSFML.cpp +++ b/sources/Renderer/QtRenderer/QtWidgetSFML.cpp @@ -29,7 +29,7 @@ namespace ComSquare::Renderer #ifdef Q_WS_X11 XFlush(QX11Info::display()); #endif - this->_window.create(this->winId()); + this->_window.create((sf::WindowHandle)this->winId()); this->_onInit(); connect(&_timer, SIGNAL(timeout()), this, SLOT(repaint())); From 40659a37084dd9c2bdc90f11d883803a539d51e0 Mon Sep 17 00:00:00 2001 From: AnonymusRaccoon Date: Fri, 28 Feb 2020 11:16:28 +0100 Subject: [PATCH 2/3] Cleaning the CI --- .github/workflows/build.yml | 2 +- .github/workflows/buildwin.yml | 1 + 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 494bef1..3f9e69a 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -13,7 +13,7 @@ jobs: - uses: actions/checkout@v1 - name: Install the dependencies of the SFML. run: sudo apt-get update && - sudo apt-get install --yes qt5-default libfreetype6-dev libxrandr-dev libudev-dev libogg-dev libflac-dev libvorbis-dev libopenal-dev freeglut3-dev + sudo apt-get install --yes libfreetype6-dev libxrandr-dev libudev-dev libogg-dev libflac-dev libvorbis-dev libopenal-dev freeglut3-dev - name: Install Qt uses: ouuan/install-qt-action@v2.3.1 - name: Install the SFML. diff --git a/.github/workflows/buildwin.yml b/.github/workflows/buildwin.yml index 4ded1cf..14a7687 100644 --- a/.github/workflows/buildwin.yml +++ b/.github/workflows/buildwin.yml @@ -13,6 +13,7 @@ jobs: - uses: actions/checkout@v1 - name: Install Qt uses: ouuan/install-qt-action@v2.3.1 + arch: win64_mingw73 - name: Install the SFML. run: | Invoke-WebRequest -Uri https://www.sfml-dev.org/files/SFML-2.5.1-windows-gcc-7.3.0-mingw-64-bit.zip -OutFile sfml.zip From 9aabd7756c489bef3bcd4fdfc2d5fa45596d3bf5 Mon Sep 17 00:00:00 2001 From: AnonymusRaccoon Date: Fri, 28 Feb 2020 11:17:29 +0100 Subject: [PATCH 3/3] Oups --- .github/workflows/buildwin.yml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/.github/workflows/buildwin.yml b/.github/workflows/buildwin.yml index 14a7687..0957504 100644 --- a/.github/workflows/buildwin.yml +++ b/.github/workflows/buildwin.yml @@ -13,7 +13,8 @@ jobs: - uses: actions/checkout@v1 - name: Install Qt uses: ouuan/install-qt-action@v2.3.1 - arch: win64_mingw73 + with: + arch: win64_mingw73 - name: Install the SFML. run: | Invoke-WebRequest -Uri https://www.sfml-dev.org/files/SFML-2.5.1-windows-gcc-7.3.0-mingw-64-bit.zip -OutFile sfml.zip