Skip to content

Commit

Permalink
- fix clang errors
Browse files Browse the repository at this point in the history
  • Loading branch information
dgengin committed Oct 3, 2019
1 parent 9374028 commit 6c499d9
Show file tree
Hide file tree
Showing 4 changed files with 5 additions and 2 deletions.
1 change: 1 addition & 0 deletions DGEngine.vcxproj
Original file line number Diff line number Diff line change
Expand Up @@ -673,6 +673,7 @@
</ClCompile>
<Link>
<GenerateDebugInformation>true</GenerateDebugInformation>
<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>
</Link>
</ItemDefinitionGroup>
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
Expand Down
2 changes: 1 addition & 1 deletion src/Game/LevelMap.h
Original file line number Diff line number Diff line change
Expand Up @@ -184,7 +184,7 @@ class LevelMap
}

template <class T>
constexpr static sf::Vector2f toDrawCoord(const T& mapPos,
static sf::Vector2f toDrawCoord(const T& mapPos,
int32_t blockWidth, int32_t blockHeight)
{
return sf::Vector2f(
Expand Down
2 changes: 1 addition & 1 deletion src/Game/stlastar.h
Original file line number Diff line number Diff line change
Expand Up @@ -820,7 +820,7 @@ template <class UserState> class AStarSearch
template <class T> class AStarState
{
public:
~AStarState() override {}
virtual ~AStarState() {}
virtual float GoalDistanceEstimate( T &nodeGoal ) = 0; // Heuristic function which computes the estimated cost to the goal node
virtual bool IsGoal( T &nodeGoal ) = 0; // Returns true if this node is the goal node
virtual bool GetSuccessors( AStarSearch<T> *astarsearch, T *parent_node ) = 0; // Retrieves all successors to this node and adds them via astarsearch.addSuccessor()
Expand Down
2 changes: 2 additions & 0 deletions src/sfeMovie/Demuxer.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -40,11 +40,13 @@ namespace sfe
// Load all the decoders
static void loadFFmpeg()
{
#if LIBAVFORMAT_VERSION_MAJOR < 58
static std::once_flag flag1;
static std::once_flag flag2;

std::call_once(flag1, []() {av_register_all(); });
std::call_once(flag2, []() {avcodec_register_all(); });
#endif
}

Demuxer::Demuxer(const std::string_view sourceFile, Timer* timer,
Expand Down

0 comments on commit 6c499d9

Please sign in to comment.