zoriya/ComSquare
1
0
Fork 0
mirror of https://github.com/zoriya/ComSquare.git synced 2026-06-03 02:23:49 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' of https://github.com/AnonymusRaccoon/ComSquare into APU

Browse Source
This commit is contained in:
Melefo
2020-03-02 17:58:54 +01:00
parent 74eb559543 9aabd7756c
commit 2b5575590a
3 changed files with 7 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
.github/workflows/build.yml
+4 -2
View File
@@ -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
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.
run: |
git clone https://github.com/SFML/SFML -b 2.5.x /tmp/sfml
.github/workflows/buildwin.yml
+2
View File
@@ -13,6 +13,8 @@ jobs:
- uses: actions/checkout@v1
- name: Install Qt
uses: ouuan/install-qt-action@v2.3.1
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
sources/Renderer/QtRenderer/QtWidgetSFML.cpp
+1 -1
View File
@@ -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()));