From 9c27709bb9dbf3f0457963c202e2791fc067f5a2 Mon Sep 17 00:00:00 2001 From: nordsoft Date: Tue, 6 Sep 2022 12:06:05 +0400 Subject: [PATCH 1/6] Maybe this can fix build --- .travis.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index 7fabdc1f0..492820a41 100644 --- a/.travis.yml +++ b/.travis.yml @@ -41,7 +41,7 @@ addons: notification_email: coverity@arseniyshestakov.com build_command_prepend: cov-configure --compiler clang-3.6 --comptype clangcc && cov-configure --comptype clangcxx --compiler clang++-3.6 && cmake -G Ninja .. - -DCMAKE_BUILD_TYPE=DEBUG -DENABLE_LAUNCHER=0 + -DCMAKE_BUILD_TYPE=DEBUG -DENABLE_LAUNCHER=0 -DENABLE_EDITOR=0 build_command: ninja -j 3 branch_pattern: coverity_scan From fc75c7a97eea6d935133b443c4b78a3319bd8062 Mon Sep 17 00:00:00 2001 From: nordsoft Date: Tue, 6 Sep 2022 12:08:22 +0400 Subject: [PATCH 2/6] add branch for actions --- .github/workflows/github.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.github/workflows/github.yml b/.github/workflows/github.yml index 2c3114e25..6cee492d7 100644 --- a/.github/workflows/github.yml +++ b/.github/workflows/github.yml @@ -5,6 +5,7 @@ on: branches: - features/* - develop + - cpp-map-editor pull_request: env: # Customize the CMake build type here (Release, Debug, RelWithDebInfo, etc.) From e06f8ab0d353a2bcba32b1b354ba3b79c2efaff3 Mon Sep 17 00:00:00 2001 From: nordsoft Date: Tue, 6 Sep 2022 12:36:52 +0400 Subject: [PATCH 3/6] Fix build --- lib/mapping/CMap.cpp | 3 --- 1 file changed, 3 deletions(-) diff --git a/lib/mapping/CMap.cpp b/lib/mapping/CMap.cpp index 1c43f32e9..abf169695 100644 --- a/lib/mapping/CMap.cpp +++ b/lib/mapping/CMap.cpp @@ -645,9 +645,6 @@ void CMap::removeObject(CGObjectInstance * obj) auto iterTown = std::find(towns.begin(), towns.end(), obj); if(iterTown != towns.end()) towns.erase(iterTown); - auto iterArt = std::find(artInstances.begin(), artInstances.end(), obj); - if(iterArt != artInstances.end()) - artInstances.erase(iterArt); auto iterHero = std::find(allHeroes.begin(), allHeroes.end(), obj); if(iterHero != allHeroes.end()) allHeroes.erase(iterHero); From 65b168c53b21f4bccffa559bffe3f1ec4b45f81d Mon Sep 17 00:00:00 2001 From: nordsoft Date: Tue, 6 Sep 2022 13:26:20 +0400 Subject: [PATCH 4/6] Fix build --- mapeditor/mainwindow.cpp | 1 - 1 file changed, 1 deletion(-) diff --git a/mapeditor/mainwindow.cpp b/mapeditor/mainwindow.cpp index ae62fbf6c..7f8c2315e 100644 --- a/mapeditor/mainwindow.cpp +++ b/mapeditor/mainwindow.cpp @@ -2,7 +2,6 @@ #include "mainwindow.h" #include "ui_mainwindow.h" -#include #include #include #include From e716ef3f3aff1cef6483237414fbe95703c2a4fb Mon Sep 17 00:00:00 2001 From: nordsoft Date: Tue, 6 Sep 2022 14:13:01 +0400 Subject: [PATCH 5/6] Fix build --- mapeditor/spoiler.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/mapeditor/spoiler.cpp b/mapeditor/spoiler.cpp index 64fb6182d..5d8535694 100644 --- a/mapeditor/spoiler.cpp +++ b/mapeditor/spoiler.cpp @@ -1,7 +1,7 @@ #include "StdInc.h" #include -#include "Spoiler.h" +#include "spoiler.h" Spoiler::Spoiler(const QString & title, const int animationDuration, QWidget *parent) : QWidget(parent), animationDuration(animationDuration) { From 7ad2282b641f00d1916c26ab65ba89b3632ea553 Mon Sep 17 00:00:00 2001 From: nordsoft Date: Tue, 6 Sep 2022 18:56:43 +0400 Subject: [PATCH 6/6] Trt to disable editor for mxe --- .github/workflows/github.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/github.yml b/.github/workflows/github.yml index 6cee492d7..53e91f4d1 100644 --- a/.github/workflows/github.yml +++ b/.github/workflows/github.yml @@ -47,7 +47,7 @@ jobs: pack: 1 cpack_args: -D CPACK_NSIS_EXECUTABLE=`which makensis` extension: exe - cmake_args: -G Ninja + cmake_args: -G Ninja -DENABLE_EDITOR=0 - platform: msvc os: windows-latest test: 0