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

GitHub noreply at github.com
Fri Jun 1 20:17:28 UTC 2018


  Branch: refs/heads/1.14
  Home:   https://github.com/wesnoth/wesnoth
  Commit: 9e4a76096bfdb29ea758c89a541c3be024d9bf75
      https://github.com/wesnoth/wesnoth/commit/9e4a76096bfdb29ea758c89a541c3be024d9bf75
  Author: loonycyborg <loonycyborg at gmail.com>
  Date:   2018-06-01 (Fri, 01 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: 8111db9c67ff95546b66141e0a63aee58e4dd3b1
      https://github.com/wesnoth/wesnoth/commit/8111db9c67ff95546b66141e0a63aee58e4dd3b1
  Author: loonycyborg <loonycyborg at gmail.com>
  Date:   2018-06-01 (Fri, 01 Jun 2018)

  Changed paths:
    M scons/cross_compile.py

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


  Commit: 9cd29260b432af34c2f387a9435f81c2e0542652
      https://github.com/wesnoth/wesnoth/commit/9cd29260b432af34c2f387a9435f81c2e0542652
  Author: loonycyborg <loonycyborg at gmail.com>
  Date:   2018-06-01 (Fri, 01 Jun 2018)

  Changed paths:
    M scons/sdl.py

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


  Commit: 8ff65117c5ef0d50be50d04618c88c2e83fbd0f7
      https://github.com/wesnoth/wesnoth/commit/8ff65117c5ef0d50be50d04618c88c2e83fbd0f7
  Author: loonycyborg <loonycyborg at gmail.com>
  Date:   2018-06-01 (Fri, 01 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:".


Compare: https://github.com/wesnoth/wesnoth/compare/1a18d698aea4...8ff65117c5ef
      **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