[wesnoth-commits] [wesnoth/wesnoth] 2bc7cc: scons: workaround for msys2's build's of sdl "#def...

GitHub noreply at github.com
Sat Jun 2 08:56:34 UTC 2018


  Branch: refs/heads/master
  Home:   https://github.com/wesnoth/wesnoth
  Commit: 2bc7cc3e6106d089f168510a2a12cc53bfd48007
      https://github.com/wesnoth/wesnoth/commit/2bc7cc3e6106d089f168510a2a12cc53bfd48007
  Author: loonycyborg <loonycyborg at gmail.com>
  Date:   2018-06-02 (Sat, 02 Jun 2018)

  Changed paths:
    M scons/boost.py

  Log Message:
  -----------
  scons: workaround for msys2's build's of sdl "#define main" breaking non-sdl checks


  Commit: d8743f8e6e51a30f0b039d40dc053b8e4dbf34b3
      https://github.com/wesnoth/wesnoth/commit/d8743f8e6e51a30f0b039d40dc053b8e4dbf34b3
  Author: loonycyborg <loonycyborg at gmail.com>
  Date:   2018-06-02 (Sat, 02 Jun 2018)

  Changed paths:
    M scons/cross_compile.py

  Log Message:
  -----------
  scons: set env["PLATFORM"] to "win32" on msys


  Commit: aa925e1fc6f64266b66fe63f16c19ef08a34362c
      https://github.com/wesnoth/wesnoth/commit/aa925e1fc6f64266b66fe63f16c19ef08a34362c
  Author: loonycyborg <loonycyborg at gmail.com>
  Date:   2018-06-02 (Sat, 02 Jun 2018)

  Changed paths:
    M scons/sdl.py

  Log Message:
  -----------
  scons: use pkg-config on msys platform for sdl


  Commit: b347bc70b163a572751b7ac72f23e472c3ac9238
      https://github.com/wesnoth/wesnoth/commit/b347bc70b163a572751b7ac72f23e472c3ac9238
  Author: loonycyborg <loonycyborg at gmail.com>
  Date:   2018-06-02 (Sat, 02 Jun 2018)

  Changed paths:
    M SConstruct
    M scons/cairo.py
    M scons/pango.py
    M scons/pkgconfig.py
    M scons/sdl.py

  Log Message:
  -----------
  scons: don't let pkg-config to add prefix on msys2

This is workaround for windows style path confusing scons if they appear
in CPPATH etc. Paths without prefix still happen to be valid and they
start with "/", not "c:".


  Commit: d96d5c506c2d8c8f47984b2e1d4bf13111e195a2
      https://github.com/wesnoth/wesnoth/commit/d96d5c506c2d8c8f47984b2e1d4bf13111e195a2
  Author: loonycyborg <loonycyborg at gmail.com>
  Date:   2018-06-02 (Sat, 02 Jun 2018)

  Changed paths:
    M SConstruct

  Log Message:
  -----------
  scons: add missing winapi lib dependencies to mingw build


Compare: https://github.com/wesnoth/wesnoth/compare/5adb931b2aaf...d96d5c506c2d
      **NOTE:** This service been marked for deprecation: https://developer.github.com/changes/2018-04-25-github-services-deprecation/

      Functionality will be removed from GitHub.com on January 31st, 2019.


More information about the Commits mailing list