Skip to content

Commit 95ab902

Browse files
authored
Merge pull request #4 from PapeCoding/fix/workflow
Fixing workflow and warnings
2 parents 734e181 + 52b8855 commit 95ab902

File tree

6 files changed

+17
-5
lines changed

6 files changed

+17
-5
lines changed

.github/workflows/cmake-multi-platform.yml

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -55,6 +55,11 @@ jobs:
5555
run: |
5656
echo "build-output-dir=${{ github.workspace }}/build" >> "$GITHUB_OUTPUT"
5757
58+
- name: Install dependencies on ubuntu
59+
# Install thirdparty dependiencies on ubuntu
60+
if: matrix.os == 'ubuntu-latest'
61+
run: sudo apt install -y libgl1-mesa-dev libxrandr-dev libxinerama-dev libxkbfile-dev libxcursor-dev libxi-dev libgtk-3-dev
62+
5863
- name: Configure CMake
5964
# Configure CMake in a 'build' subdirectory. `CMAKE_BUILD_TYPE` is only required if you are using a single-configuration generator such as make.
6065
# See https://cmake.org/cmake/help/latest/variable/CMAKE_BUILD_TYPE.html?highlight=cmake_build_type

DasherCore

src/DasherController.cpp

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
11
#include "DasherController.h"
2+
#include <iostream>
23

34
class XmlServerStore;
45

src/DasherUIScreen.cpp

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -60,7 +60,7 @@ void DasherUIScreen::Polyline(point* Points, int Number, int iWidth, const Dashe
6060

6161
std::vector<ImVec2> points;
6262

63-
for(unsigned int i = 0; i < Number; i++)
63+
for(int i = 0; i < Number; i++)
6464
{
6565
points.push_back(CanvasPos + ImVec2(static_cast<float>(Points[i].x), static_cast<float>(Points[i].y)));
6666
}
@@ -74,7 +74,7 @@ void DasherUIScreen::Polygon(point* Points, int Number, const Dasher::ColorPalet
7474

7575
std::vector<ImVec2> points;
7676

77-
for (unsigned int i = 0; i < Number; i++)
77+
for (int i = 0; i < Number; i++)
7878
{
7979
points.push_back(CanvasPos + ImVec2(static_cast<float>(Points[i].x), static_cast<float>(Points[i].y)));
8080
}

src/SocketInput.cpp

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,10 @@
11
#include "SocketInput.h"
22

33
#include <I18n.h>
4+
#include <cmath>
45
#include <thread>
6+
#include <algorithm>
7+
#include <iostream>
58

69
#include "DasherInterfaceBase.h"
710
#include "DasherModel.h"

src/SocketInput.h

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,12 @@
11
#pragma once
22

33
#include "DasherInput.h"
4+
#include "DefaultFilter.h"
5+
6+
#ifdef _WIN32
7+
#include <SDKDDKVer.h> //Selects version for ASIO on Windows
8+
#endif
49
#include "asio.hpp"
5-
#include "DashIntfSettings.h"
6-
#include "PressFilter.h"
710

811
class SocketInput : public Dasher::CScreenCoordInput, public Dasher::CDefaultFilter
912
{

0 commit comments

Comments
 (0)