This project is mirrored from https://*****@github.com/libretro/flycast.git. Pull mirroring updated .
  1. 22 Nov, 2018 5 commits
    • 6alileo's avatar
      Update Makefile · 451eb758
      6alileo authored
      451eb758
    • 6alileo's avatar
      Update Makefile · f184dfd3
      6alileo authored
      f184dfd3
    • 6alileo's avatar
      Update Makefile · f405df98
      6alileo authored
      f405df98
    • Libretro-Admin's avatar
      Merge pull request #420 from mrfixit2001/patch-1 · 6e732ea4
      Libretro-Admin authored
      Fix compile fail from math with conflicting types
      6e732ea4
    • mrfixit2001's avatar
      Fix compile fail from math with conflicting types · ad3a2be2
      mrfixit2001 authored
      This commit includes math that calls std::min but can pass two different parameter types (in my case, double and int). 
      https://github.com/6alileo/reicast-emulator/commit/500393a02d3ecad934065cf0a8219ed9e7016bca
      
      The std::min function does not support comparing variables of different types. Since the author of this commit already cast one of the parameters, this PR just adds the matching cast on the other parameter. There's a few different ways to resolve but this seemed like the best option.
      
      For reference, this fixes the following compile error: 
      In file included from /usr/include/c++/6/vector:60:0,
                       from ./core/types.h:342,
                       from core/libretro/libretro.cpp:4:
      /usr/include/c++/6/bits/stl_algobase.h:243:5: note: candidate: template<class _Tp, class _Compare> const _Tp& std::min(const _Tp&, const _Tp&, _Compare)
           min(const _Tp& __a, const _Tp& __b, _Compare __comp)
           ^~~
      /usr/include/c++/6/bits/stl_algobase.h:243:5: note:   template argument deduction/substitution failed:
      core/libretro/libretro.cpp:2415:123: note:   deduced conflicting types for parameter 'const _Tp' ('double' and 'int')
          vib_stop_time[port] = get_time_ms() + min(1000 * (INC ? abs(INC) * max(POW_POS, POW_NEG) : 1) / FREQ, (int)max_duration);
                                                                                                                                 ^
      Makefile:751: recipe for target 'core/libretro/libretro.o' failed
      ad3a2be2
  2. 20 Nov, 2018 2 commits
  3. 19 Nov, 2018 3 commits
  4. 17 Nov, 2018 4 commits
  5. 16 Nov, 2018 7 commits
  6. 15 Nov, 2018 4 commits
  7. 14 Nov, 2018 5 commits
  8. 13 Nov, 2018 3 commits
  9. 12 Nov, 2018 2 commits
  10. 11 Nov, 2018 2 commits
  11. 10 Nov, 2018 1 commit
  12. 09 Nov, 2018 2 commits