Skip to content

Fixing workflow and warnings #4

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

Merged
PapeCoding merged 6 commits into from
Mar 31, 2025
Merged

Fixing workflow and warnings #4

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
183c0e0
Pushing more little changes related to changes in DasherCore
PapeCoding Mar 31, 2025
31ddd60
Adding install step for ubuntu-latest
PapeCoding Mar 31, 2025
c5bdb3f
Adding more glfw dependencies
PapeCoding Mar 31, 2025
5c46424
adding libgtk-3-dev for native file dialog
PapeCoding Mar 31, 2025
d90d9c4
Adding headers
PapeCoding Mar 31, 2025
52b8855
Fixing warning and removing c++fs flag from DasherCore
PapeCoding Mar 31, 2025
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
5 changes: 5 additions & 0 deletions .github/workflows/cmake-multi-platform.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -55,6 +55,11 @@ jobs:
run: |
echo "build-output-dir=${{ github.workspace }}/build" >> "$GITHUB_OUTPUT"

- name: Install dependencies on ubuntu
# Install thirdparty dependiencies on ubuntu
if: matrix.os == 'ubuntu-latest'
run: sudo apt install -y libgl1-mesa-dev libxrandr-dev libxinerama-dev libxkbfile-dev libxcursor-dev libxi-dev libgtk-3-dev

- name: Configure CMake
# Configure CMake in a 'build' subdirectory. `CMAKE_BUILD_TYPE` is only required if you are using a single-configuration generator such as make.
# See https://cmake.org/cmake/help/latest/variable/CMAKE_BUILD_TYPE.html?highlight=cmake_build_type
Expand Down
2 changes: 1 addition & 1 deletion DasherCore
Open in desktop
Submodule DasherCore updated from b79ce0 to 8997ff
1 change: 1 addition & 0 deletions src/DasherController.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
#include "DasherController.h"
#include <iostream>

class XmlServerStore;

Expand Down
4 changes: 2 additions & 2 deletions src/DasherUIScreen.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -60,7 +60,7 @@ void DasherUIScreen::Polyline(point* Points, int Number, int iWidth, const Dashe

std::vector<ImVec2> points;

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

std::vector<ImVec2> points;

for (unsigned int i = 0; i < Number; i++)
for (int i = 0; i < Number; i++)
{
points.push_back(CanvasPos + ImVec2(static_cast<float>(Points[i].x), static_cast<float>(Points[i].y)));
}
Expand Down
3 changes: 3 additions & 0 deletions src/SocketInput.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,10 @@
#include "SocketInput.h"

#include <I18n.h>
#include <cmath>
#include <thread>
#include <algorithm>
#include <iostream>

#include "DasherInterfaceBase.h"
#include "DasherModel.h"
Expand Down
7 changes: 5 additions & 2 deletions src/SocketInput.h
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,9 +1,12 @@
#pragma once

#include "DasherInput.h"
#include "DefaultFilter.h"

#ifdef _WIN32
#include <SDKDDKVer.h> //Selects version for ASIO on Windows
#endif
#include "asio.hpp"
#include "DashIntfSettings.h"
#include "PressFilter.h"

class SocketInput : public Dasher::CScreenCoordInput, public Dasher::CDefaultFilter
{
Expand Down