diff options
| author | Dmitry Marakasov <amdmi3@FreeBSD.org> | 2013-09-18 02:36:27 +0000 |
|---|---|---|
| committer | Dmitry Marakasov <amdmi3@FreeBSD.org> | 2013-09-18 02:36:27 +0000 |
| commit | c22ba52bd0563af33f5336b79822aa8d5139e75e (patch) | |
| tree | 65e62a1c1885feecd8f0a7be59a75a749a4fafe2 /games | |
| parent | Make sure that the buffers defined as global variables are aligned (diff) | |
Fix build with clang/libc++
Notes
Notes:
svn path=/head/; revision=327508
Diffstat (limited to 'games')
4 files changed, 33 insertions, 1 deletions
diff --git a/games/plee-the-bear/Makefile b/games/plee-the-bear/Makefile index 3b9723604a82..63f4e1c3a9dc 100644 --- a/games/plee-the-bear/Makefile +++ b/games/plee-the-bear/Makefile @@ -25,7 +25,6 @@ USE_GL= gl glu WANT_GNOME= yes INSTALLS_ICONS= yes USE_LDCONFIG= yes -USE_GCC= yes USES= cmake CMAKE_ARGS= -Dlibclaw_DIR="${LOCALBASE}/share/libclaw/cmake" \ diff --git a/games/plee-the-bear/files/patch-bear-engine-core-src-engine-model-code-model__action.cpp b/games/plee-the-bear/files/patch-bear-engine-core-src-engine-model-code-model__action.cpp new file mode 100644 index 000000000000..fff2d9666eb4 --- /dev/null +++ b/games/plee-the-bear/files/patch-bear-engine-core-src-engine-model-code-model__action.cpp @@ -0,0 +1,11 @@ +--- bear-engine/core/src/engine/model/code/model_action.cpp.orig 2011-07-17 23:01:25.000000000 +0400 ++++ bear-engine/core/src/engine/model/code/model_action.cpp 2013-09-14 03:46:40.203322514 +0400 +@@ -396,7 +396,7 @@ + bear::engine::model_action::get_snapshot_const_iterator_at + ( universe::time_type t ) const + { +- if ( claw::real_number<universe::time_type>(t) > get_duration() ) ++ if ( (double)claw::real_number<universe::time_type>(t) > get_duration() ) + return m_snapshot.end(); + else if ( m_snapshot.empty() ) + return m_snapshot.end(); diff --git a/games/plee-the-bear/files/patch-bear-engine-core-src-engine-script-code-script__runner.cpp b/games/plee-the-bear/files/patch-bear-engine-core-src-engine-script-code-script__runner.cpp new file mode 100644 index 000000000000..1cdd9d32fbaf --- /dev/null +++ b/games/plee-the-bear/files/patch-bear-engine-core-src-engine-script-code-script__runner.cpp @@ -0,0 +1,11 @@ +--- bear-engine/core/src/engine/script/code/script_runner.cpp.orig 2011-07-17 23:01:25.000000000 +0400 ++++ bear-engine/core/src/engine/script/code/script_runner.cpp 2013-09-17 23:44:12.620520919 +0400 +@@ -108,7 +108,7 @@ + bool done(false); + + while ( !done && (m_current_call != m_sequence.end()) ) +- if ( claw::real_number<universe::time_type>(m_current_call->date) > m_date ) ++ if ( claw::real_number<universe::time_type>(m_current_call->date) > claw::real_number<universe::time_type>(m_date) ) + done = true; + else + { diff --git a/games/plee-the-bear/files/patch-plee-the-bear-src-ptb-expr-impl-boolean__player__function.tpp b/games/plee-the-bear/files/patch-plee-the-bear-src-ptb-expr-impl-boolean__player__function.tpp new file mode 100644 index 000000000000..92be3e21aaf5 --- /dev/null +++ b/games/plee-the-bear/files/patch-plee-the-bear-src-ptb-expr-impl-boolean__player__function.tpp @@ -0,0 +1,11 @@ +--- plee-the-bear/src/ptb/expr/impl/boolean_player_function.tpp.orig 2011-07-17 23:01:25.000000000 +0400 ++++ plee-the-bear/src/ptb/expr/impl/boolean_player_function.tpp 2013-09-18 00:33:39.358695760 +0400 +@@ -37,7 +37,7 @@ + template<typename FunctionType> + ptb::boolean_player_function<FunctionType>::boolean_player_function + ( unsigned int player_index, const bear::engine::level_globals* g ) +- : m_player_index(player_index), m_player(NULL), m_level_globals(g) ++ : m_player_index(player_index), m_player(), m_level_globals(g) + { + search_player(); + } // boolean_player_function::boolean_player_function() |