Merge pull request Wargus#558 from Wargus/fix-linux-compilation

Fix linuxdeploy and compilation
ipochto · Nov 10, 2023 · 6da5e26 · 6da5e26
2 parents 519c1cc + db23af5
commit 6da5e26
Show file tree

Hide file tree

Showing 4 changed files with 5 additions and 5 deletions.
diff --git a/src/action/actions.cpp b/src/action/actions.cpp
@@ -475,7 +475,7 @@ static void UnitActionsEachSecond(const std::vector<CUnit *> &units)
 static const char* toCStr(UnitAction action)
 {
 	switch (action) {
-		case UnitAction::None: return "None";
+		case UnitAction::NoAction: return "None";
 		case UnitAction::Still: return "Still";
 		case UnitAction::StandGround: return "StandGround";
 		case UnitAction::Follow: return "Follow";

diff --git a/src/include/actions.h b/src/include/actions.h
@@ -47,7 +47,7 @@
 **  @see HandleActionTable
 */
 enum class UnitAction : char {
-	None,         /// No valid action
+	NoAction,     /// No valid action
 
 	Still,        /// unit stand still, does nothing
 	StandGround,  /// unit stands ground

diff --git a/src/ui/botpanel.cpp b/src/ui/botpanel.cpp
@@ -222,7 +222,7 @@ static int GetButtonStatus(const ButtonAction &button, int UnderCursor)
 		}
 	}
 
-	UnitAction action = UnitAction::None;
+	UnitAction action = UnitAction::NoAction;
 	switch (button.Action) {
 		case ButtonCmd::Stop:
 			action = UnitAction::Still;
@@ -250,7 +250,7 @@ static int GetButtonStatus(const ButtonAction &button, int UnderCursor)
 			break;
 	}
 	// Simple case.
-	if (action != UnitAction::None) {
+	if (action != UnitAction::NoAction) {
 		if (ranges::all_of(Selected, [&](const CUnit *unit) { return unit->CurrentAction() == action; })) {
 			res |= IconSelected;
 		}

diff --git a/tools/build_appimage.sh b/tools/build_appimage.sh
@@ -103,7 +103,7 @@ pushd ${GAME_ID}
             -DCMAKE_INSTALL_PREFIX=/usr                                 \
             -DDATA_PATH=../../share/games/stratagus/${GAME_ID}/         \
             -DGAMEDIR=/usr/bin                                          \
-            -DICONDIR=/usr/share/icons/default/64x64/                   \
+            -DICONDIR=/usr/share/pixmaps/                               \
             -DGAMEDIRABS=""
         make -j$(nproc) install DESTDIR=../../AppDir
         popd