• [^] # Re: solutions ...mais

    Posté par . En réponse au message [Résolu] Compiler wesnoth-1.2. Évalué à 4.

    Finalement je te mets le patch ici, ne me crédite pas tu peux mettre ton nom ça me va, (il est en licence "BCET" : Balec Complet Et Total)
    c'est un patch git sur le tag 1.2.8
    Si tu as d'autres soucis de compilation après ça, je compilerai freetype2 pour alle rau bout du build et les fixer aussi. Quand j'aurais la motiv...

    From fecd2c59ddf91d47901a90ecc7d81d353374cef8 Mon Sep 17 00:00:00 2001
    From: plop <plop>
    Date: Tue, 1 Nov 2022 19:04:04 +0100
    Subject: [PATCH] Fix unit/unit_map include circular dependency
    ---
     src/actions.hpp | 1 +
     src/ai_dfool.hpp | 1 +
     src/config_adapter.cpp | 1 +
     src/game_events.hpp | 1 +
     src/pathfind.cpp | 1 +
     src/preferences.cpp | 1 +
     src/unit.hpp | 13 ++-----------
     src/unit_abilities.cpp | 1 +
     src/unit_map.hpp | 11 +++++++++++
     src/upload_log.cpp | 1 +
     10 files changed, 21 insertions(+), 11 deletions(-)
    diff --git a/src/actions.hpp b/src/actions.hpp
    index 0191f8b05f6..0a9a287a3ef 100644
    --- a/src/actions.hpp
    +++ b/src/actions.hpp
    @@ -23,6 +23,7 @@ struct combatant;
     #include "map.hpp"
     #include "unit.hpp"
    +#include "unit_map.hpp"
     #include <deque>
    diff --git a/src/ai_dfool.hpp b/src/ai_dfool.hpp
    index ec043c470ca..d0f407669b3 100644
    --- a/src/ai_dfool.hpp
    +++ b/src/ai_dfool.hpp
    @@ -5,6 +5,7 @@
     #include "ai_interface.hpp"
     #include "map.hpp"
    +#include "unit_map.hpp"
     #include <vector>
     #include <map>
     #include <string>
    diff --git a/src/config_adapter.cpp b/src/config_adapter.cpp
    index 9fd56aef144..2726804948b 100644
    --- a/src/config_adapter.cpp
    +++ b/src/config_adapter.cpp
    @@ -12,6 +12,7 @@
     */
     #include "global.hpp"
    +#include "unit_map.hpp"
     #include <sstream>
     #include "config_adapter.hpp"
    diff --git a/src/game_events.hpp b/src/game_events.hpp
    index 4e0280d57a4..dd2b8cc38cb 100644
    --- a/src/game_events.hpp
    +++ b/src/game_events.hpp
    @@ -21,6 +21,7 @@ class display;
     #include "map.hpp"
     #include "team.hpp"
     #include "unit.hpp"
    +#include "unit_map.hpp"
     #include "variable.hpp"
     #include <vector>
    diff --git a/src/pathfind.cpp b/src/pathfind.cpp
    index 6a61b4b5483..4f2c841ccbf 100644
    --- a/src/pathfind.cpp
    +++ b/src/pathfind.cpp
    @@ -19,6 +19,7 @@ See the COPYING file for more details.
     #include "log.hpp"
     #include "pathfind.hpp"
     #include "util.hpp"
    +#include "unit_map.hpp"
     #include "wassert.hpp"
     class gamestatus;
    diff --git a/src/preferences.cpp b/src/preferences.cpp
    index c71ffeffc32..e3f8d8515ed 100644
    --- a/src/preferences.cpp
    +++ b/src/preferences.cpp
    @@ -24,6 +24,7 @@
     #include "preferences.hpp"
     #include "sound.hpp"
     #include "util.hpp"
    +#include "unit_map.hpp"
     #include "video.hpp" // non_interactive()
     #include "wassert.hpp"
     #include "wesconfig.h"
    diff --git a/src/unit.hpp b/src/unit.hpp
    index c23006d32d0..dbc31cf7fe7 100644
    --- a/src/unit.hpp
    +++ b/src/unit.hpp
    @@ -19,9 +19,9 @@
     #include "team.hpp"
     #include "unit_types.hpp"
     #include "image.hpp"
    -#include "unit_map.hpp"
     class unit;
    +class unit_map;
     class display;
     class gamestatus;
    @@ -396,16 +396,7 @@ void sort_units(std::vector< unit > &);
     int team_units(const unit_map& units, unsigned int team_num);
     int team_upkeep(const unit_map& units, unsigned int team_num);
    -unit_map::const_iterator team_leader(unsigned int side, const unit_map& units);
    -std::string team_name(int side, const unit_map& units);
    -unit_map::iterator find_visible_unit(unit_map& units,
    - const gamemap::location loc,
    - const gamemap& map,
    - const std::vector<team>& teams, const team& current_team);
    -unit_map::const_iterator find_visible_unit(const unit_map& units,
    - const gamemap::location loc,
    - const gamemap& map,
    - const std::vector<team>& teams, const team& current_team);
    +
     struct team_data
     {
    diff --git a/src/unit_abilities.cpp b/src/unit_abilities.cpp
    index 4fa0f6a12ef..8bd4460a056 100644
    --- a/src/unit_abilities.cpp
    +++ b/src/unit_abilities.cpp
    @@ -12,6 +12,7 @@
     */
     #include "unit.hpp"
    +#include "unit_map.hpp"
     #include "unit_abilities.hpp"
     #include "wassert.hpp"
    diff --git a/src/unit_map.hpp b/src/unit_map.hpp
    index e71203af275..555271fd0f0 100644
    --- a/src/unit_map.hpp
    +++ b/src/unit_map.hpp
    @@ -149,4 +149,15 @@ private:
     std::map<gamemap::location,std::pair<gamemap::location,unit>*> map_;
     };
    +unit_map::const_iterator team_leader(unsigned int side, const unit_map& units);
    +std::string team_name(int side, const unit_map& units);
    +unit_map::iterator find_visible_unit(unit_map& units,
    + const gamemap::location loc,
    + const gamemap& map,
    + const std::vector<team>& teams, const team& current_team);
    +unit_map::const_iterator find_visible_unit(const unit_map& units,
    + const gamemap::location loc,
    + const gamemap& map,
    + const std::vector<team>& teams, const team& current_team);
    +
     #endif // UNIT_MAP_H_INCLUDED
    diff --git a/src/upload_log.cpp b/src/upload_log.cpp
    index 0718249e9e9..bcf38fcc0d2 100644
    --- a/src/upload_log.cpp
    +++ b/src/upload_log.cpp
    @@ -23,6 +23,7 @@
     #include "upload_log.hpp"
     #include "wesconfig.h"
     #include "wml_separators.hpp"
    +#include "unit_map.hpp"
     #include "SDL_net.h"
    -- 
    2.37.2