Skip to content

Commit 6c499d9

Browse files
author
dgengin
committed
- fix clang errors
1 parent 9374028 commit 6c499d9

4 files changed

Lines changed: 5 additions & 2 deletions

File tree

DGEngine.vcxproj

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -673,6 +673,7 @@
673673
</ClCompile>
674674
<Link>
675675
<GenerateDebugInformation>true</GenerateDebugInformation>
676+
<AdditionalDependencies>sfml-audio-d.lib;sfml-graphics-d.lib;sfml-main-d.lib;sfml-network-d.lib;sfml-system-d.lib;sfml-window-d.lib;physfs.lib;avcodec.lib;avdevice.lib;avfilter.lib;avformat.lib;avutil.lib;swresample.lib;swscale.lib;%(AdditionalDependencies)</AdditionalDependencies>
676677
</Link>
677678
</ItemDefinitionGroup>
678679
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">

src/Game/LevelMap.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -184,7 +184,7 @@ class LevelMap
184184
}
185185

186186
template <class T>
187-
constexpr static sf::Vector2f toDrawCoord(const T& mapPos,
187+
static sf::Vector2f toDrawCoord(const T& mapPos,
188188
int32_t blockWidth, int32_t blockHeight)
189189
{
190190
return sf::Vector2f(

src/Game/stlastar.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -820,7 +820,7 @@ template <class UserState> class AStarSearch
820820
template <class T> class AStarState
821821
{
822822
public:
823-
~AStarState() override {}
823+
virtual ~AStarState() {}
824824
virtual float GoalDistanceEstimate( T &nodeGoal ) = 0; // Heuristic function which computes the estimated cost to the goal node
825825
virtual bool IsGoal( T &nodeGoal ) = 0; // Returns true if this node is the goal node
826826
virtual bool GetSuccessors( AStarSearch<T> *astarsearch, T *parent_node ) = 0; // Retrieves all successors to this node and adds them via astarsearch.addSuccessor()

src/sfeMovie/Demuxer.cpp

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -40,11 +40,13 @@ namespace sfe
4040
// Load all the decoders
4141
static void loadFFmpeg()
4242
{
43+
#if LIBAVFORMAT_VERSION_MAJOR < 58
4344
static std::once_flag flag1;
4445
static std::once_flag flag2;
4546

4647
std::call_once(flag1, []() {av_register_all(); });
4748
std::call_once(flag2, []() {avcodec_register_all(); });
49+
#endif
4850
}
4951

5052
Demuxer::Demuxer(const std::string_view sourceFile, Timer* timer,

0 commit comments

Comments
 (0)