Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

[Fix uwp toolchain|world rebuild] make ninja work for uwp #22831

Merged
merged 74 commits into from
Apr 28, 2022
Merged

[Fix uwp toolchain|world rebuild] make ninja work for uwp #22831

merged 74 commits into from
Apr 28, 2022

Commits on Jan 27, 2022

  1. uwp magic with ninja

    @Neumann-A
    Neumann-A committed Jan 27, 2022
    Configuration menu
    Copy the full SHA
    07f768b View commit details
    Browse the repository at this point in the history

Commits on Jan 31, 2022

  1. fine tuning

    @Neumann-A
    Neumann-A committed Jan 31, 2022
    Configuration menu
    Copy the full SHA
    10fddd0 View commit details
    Browse the repository at this point in the history

  2. more fine tuning 

    also fix bug in build_make
    @Neumann-A
    Neumann-A committed Jan 31, 2022
    Configuration menu
    Copy the full SHA
    12c87a6 View commit details
    Browse the repository at this point in the history

  3. more fixes

    @Neumann-A
    Neumann-A committed Jan 31, 2022
    Configuration menu
    Copy the full SHA
    20e35ae View commit details
    Browse the repository at this point in the history

  4. more fixes

    @Neumann-A
    Neumann-A committed Jan 31, 2022
    Configuration menu
    Copy the full SHA
    e7de7d7 View commit details
    Browse the repository at this point in the history

Commits on Mar 30, 2022

  1. Merge remote-tracking branch 'upstream/master' into fix_ninja_uwp 

    # Conflicts:
#	scripts/cmake/vcpkg_build_make.cmake
    @Neumann-A
    Neumann-A committed Mar 30, 2022
    Configuration menu
    Copy the full SHA
    13b6145 View commit details
    Browse the repository at this point in the history

  2. adjust uwp build in boost

    @Neumann-A
    Neumann-A committed Mar 30, 2022
    Configuration menu
    Copy the full SHA
    396ce94 View commit details
    Browse the repository at this point in the history

Commits on Mar 31, 2022

  1. fix blas

    Alexander Neumann committed Mar 31, 2022
    Configuration menu
    Copy the full SHA
    449726e View commit details
    Browse the repository at this point in the history

  2. version stuff

    Alexander Neumann committed Mar 31, 2022
    Configuration menu
    Copy the full SHA
    db86cd3 View commit details
    Browse the repository at this point in the history

  3. more version stuff

    Alexander Neumann committed Mar 31, 2022
    Configuration menu
    Copy the full SHA
    fe05c1f View commit details
    Browse the repository at this point in the history

  4. fix some regressions

    Alexander Neumann committed Mar 31, 2022
    Configuration menu
    Copy the full SHA
    3991cb7 View commit details
    Browse the repository at this point in the history

  5. format stuff

    Alexander Neumann committed Mar 31, 2022
    Configuration menu
    Copy the full SHA
    a9ae1ef View commit details
    Browse the repository at this point in the history

  6. cleanup baseline

    @Neumann-A
    Neumann-A committed Mar 31, 2022
    Configuration menu
    Copy the full SHA
    f2fb380 View commit details
    Browse the repository at this point in the history

  7. fix physx

    @Neumann-A
    Neumann-A committed Mar 31, 2022
    Configuration menu
    Copy the full SHA
    5135de2 View commit details
    Browse the repository at this point in the history

Commits on Apr 1, 2022

  1. fine tuning

    Alexander Neumann committed Apr 1, 2022
    Configuration menu
    Copy the full SHA
    1665365 View commit details
    Browse the repository at this point in the history

  2. add /DNDEBUG

    Alexander Neumann committed Apr 1, 2022
    Configuration menu
    Copy the full SHA
    26a2500 View commit details
    Browse the repository at this point in the history

  3. setup versioning stuff

    Alexander Neumann committed Apr 1, 2022
    Configuration menu
    Copy the full SHA
    f63f516 View commit details
    Browse the repository at this point in the history

  4. version stuff

    Alexander Neumann committed Apr 1, 2022
    Configuration menu
    Copy the full SHA
    7619df2 View commit details
    Browse the repository at this point in the history

  5. version stuff

    Alexander Neumann committed Apr 1, 2022
    Configuration menu
    Copy the full SHA
    c79dea1 View commit details
    Browse the repository at this point in the history

  6. Merge branch 'fix_ninja_uwp' of https://github.com/Neumann-A/vcpkg in… 

    …to fix_ninja_uwp

# Conflicts:
#	scripts/ci.baseline.txt
    @Neumann-A
    Neumann-A committed Apr 1, 2022
    Configuration menu
    Copy the full SHA
    11f4170 View commit details
    Browse the repository at this point in the history

  7. fix physfs

    @Neumann-A
    Neumann-A committed Apr 1, 2022
    Configuration menu
    Copy the full SHA
    ef54a0b View commit details
    Browse the repository at this point in the history

  8. bump physx

    @Neumann-A
    Neumann-A committed Apr 1, 2022
    Configuration menu
    Copy the full SHA
    3aef0da View commit details
    Browse the repository at this point in the history

  9. fix orc

    @Neumann-A
    Neumann-A committed Apr 1, 2022
    Configuration menu
    Copy the full SHA
    b73af0c View commit details
    Browse the repository at this point in the history

  10. fix ffmpeg ?

    @Neumann-A
    Neumann-A committed Apr 1, 2022
    Configuration menu
    Copy the full SHA
    813b310 View commit details
    Browse the repository at this point in the history

Commits on Apr 2, 2022

  1. loadlibrary is not available in uwp

    @Neumann-A
    Neumann-A committed Apr 2, 2022
    Configuration menu
    Copy the full SHA
    bbd9f17 View commit details
    Browse the repository at this point in the history

  2. fix issues

    @Neumann-A
    Neumann-A committed Apr 2, 2022
    Configuration menu
    Copy the full SHA
    14e61ae View commit details
    Browse the repository at this point in the history

  3. Merge remote-tracking branch 'upstream/master' into fix_ninja_uwp

    @Neumann-A
    Neumann-A committed Apr 2, 2022
    Configuration menu
    Copy the full SHA
    5231853 View commit details
    Browse the repository at this point in the history

  4. fix version stuff

    @Neumann-A
    Neumann-A committed Apr 2, 2022
    Configuration menu
    Copy the full SHA
    6c599ae View commit details
    Browse the repository at this point in the history

  5. version stuff

    @Neumann-A
    Neumann-A committed Apr 2, 2022
    Configuration menu
    Copy the full SHA
    89e140c View commit details
    Browse the repository at this point in the history

Commits on Apr 4, 2022

  1. CI retrigger

    Alexander Neumann committed Apr 4, 2022
    Configuration menu
    Copy the full SHA
    e60be2f View commit details
    Browse the repository at this point in the history

Commits on Apr 7, 2022

  1. Merge remote-tracking branch 'upstream/master' into fix_ninja_uwp 

    # Conflicts:
#	ports/vcpkg-cmake/vcpkg.json
#	versions/baseline.json
#	versions/v-/vcpkg-cmake.json
    @Neumann-A
    Neumann-A committed Apr 7, 2022
    Configuration menu
    Copy the full SHA
    68791e9 View commit details
    Browse the repository at this point in the history

  2. version stuff

    @Neumann-A
    Neumann-A committed Apr 7, 2022
    Configuration menu
    Copy the full SHA
    0915931 View commit details
    Browse the repository at this point in the history

  3. Merge branch 'fix_ninja_uwp' of https://github.com/Neumann-A/vcpkg in… 

    …to fix_ninja_uwp
    @Neumann-A
    Neumann-A committed Apr 7, 2022
    Configuration menu
    Copy the full SHA
    c7f3266 View commit details
    Browse the repository at this point in the history

  4. Merge branch 'master' into fix_ninja_uwp

    @Neumann-A
    Neumann-A authored Apr 7, 2022
    Configuration menu
    Copy the full SHA
    81edf22 View commit details
    Browse the repository at this point in the history

Commits on Apr 8, 2022

  1. version stuff

    Alexander Neumann committed Apr 8, 2022
    Configuration menu
    Copy the full SHA
    1fb644a View commit details
    Browse the repository at this point in the history

  2. Use vcpkg_cmake_configure

    @Thomas1664
    Thomas1664 authored Apr 8, 2022
    Configuration menu
    Copy the full SHA
    c47b8b3 View commit details
    Browse the repository at this point in the history

  3. [orc] use vcpkg_cmake_config

    @Thomas1664
    Thomas1664 committed Apr 8, 2022
    Configuration menu
    Copy the full SHA
    7aa40af View commit details
    Browse the repository at this point in the history

  4. [physx] Fix version

    @Thomas1664
    Thomas1664 committed Apr 8, 2022
    Configuration menu
    Copy the full SHA
    688eae5 View commit details
    Browse the repository at this point in the history

  5. [orc] update port-version

    @Thomas1664
    Thomas1664 committed Apr 8, 2022
    Configuration menu
    Copy the full SHA
    c01600a View commit details
    Browse the repository at this point in the history

  6. version

    @Thomas1664
    Thomas1664 committed Apr 8, 2022
    Configuration menu
    Copy the full SHA
    7b6fa6c View commit details
    Browse the repository at this point in the history

  7. Merge branch 'patch-2' into physx-cmake

    @Thomas1664
    Thomas1664 authored Apr 8, 2022
    Configuration menu
    Copy the full SHA
    0818c99 View commit details
    Browse the repository at this point in the history

  8. Physx cmake (#8) 

    * [orc] use vcpkg_cmake_config

* [physx] Fix version

* [orc] update port-version

* version
    @Thomas1664
    Thomas1664 authored Apr 8, 2022
    Configuration menu
    Copy the full SHA
    2527586 View commit details
    Browse the repository at this point in the history

  9. update version db

    @Neumann-A
    Neumann-A committed Apr 8, 2022
    Configuration menu
    Copy the full SHA
    63f3335 View commit details
    Browse the repository at this point in the history

  10. fix port version

    @Neumann-A
    Neumann-A committed Apr 8, 2022
    Configuration menu
    Copy the full SHA
    7653f89 View commit details
    Browse the repository at this point in the history

  11. version db stuff

    @Neumann-A
    Neumann-A committed Apr 8, 2022
    Configuration menu
    Copy the full SHA
    276ad89 View commit details
    Browse the repository at this point in the history

  12. Fixes

    @Thomas1664
    Thomas1664 committed Apr 8, 2022
    Configuration menu
    Copy the full SHA
    347d9f4 View commit details
    Browse the repository at this point in the history

  13. version

    @Thomas1664
    Thomas1664 committed Apr 8, 2022
    Configuration menu
    Copy the full SHA
    f28f767 View commit details
    Browse the repository at this point in the history

  14. Merge branch 'fix_ninja_uwp' into physx-cmake

    @Thomas1664
    Thomas1664 authored Apr 8, 2022
    Configuration menu
    Copy the full SHA
    6e020dd View commit details
    Browse the repository at this point in the history

  15. fix orc

    @Neumann-A
    Neumann-A committed Apr 8, 2022
    Configuration menu
    Copy the full SHA
    ae26d88 View commit details
    Browse the repository at this point in the history

  16. version db

    @Neumann-A
    Neumann-A committed Apr 8, 2022
    Configuration menu
    Copy the full SHA
    2564740 View commit details
    Browse the repository at this point in the history

Commits on Apr 12, 2022

  1. Preparing for merge with upstream

    @Neumann-A
    Neumann-A authored Apr 12, 2022
    Configuration menu
    Copy the full SHA
    60bbdea View commit details
    Browse the repository at this point in the history

  2. Merge remote-tracking branch 'upstream/master' into fix_ninja_uwp 

    # Conflicts:
#	ports/igraph/vcpkg.json
#	ports/vcpkg-cmake/vcpkg.json
#	ports/vcpkg-cmake/vcpkg_cmake_configure.cmake
#	versions/baseline.json
#	versions/i-/igraph.json
#	versions/v-/vcpkg-cmake.json
    Alexander Neumann committed Apr 12, 2022
    Configuration menu
    Copy the full SHA
    500de7b View commit details
    Browse the repository at this point in the history

  3. version stuff

    Alexander Neumann committed Apr 12, 2022
    Configuration menu
    Copy the full SHA
    68212d8 View commit details
    Browse the repository at this point in the history

  4. Update scripts/cmake/vcpkg_build_make.cmake

    @Neumann-A
    Neumann-A authored Apr 12, 2022
    Configuration menu
    Copy the full SHA
    491e75f View commit details
    Browse the repository at this point in the history

  5. Merge remote-tracking branch 'upstream/master' into fix_ninja_uwp 

    # Conflicts:
#	ports/ffmpeg/portfile.cmake
#	versions/f-/ffmpeg.json
    @Neumann-A
    Neumann-A committed Apr 12, 2022
    Configuration menu
    Copy the full SHA
    0b71377 View commit details
    Browse the repository at this point in the history

Commits on Apr 14, 2022

  1. fix foreach vs if

    Alexander Neumann committed Apr 14, 2022
    Configuration menu
    Copy the full SHA
    509bb44 View commit details
    Browse the repository at this point in the history

  2. add -ZW:nostdlib to output flags of cmake_get_vars in vcpkg-cmake

    Alexander Neumann committed Apr 14, 2022
    Configuration menu
    Copy the full SHA
    cfc5c8b View commit details
    Browse the repository at this point in the history

  3. version stuff

    Alexander Neumann committed Apr 14, 2022
    Configuration menu
    Copy the full SHA
    363e633 View commit details
    Browse the repository at this point in the history

  4. Fix if again

    Alexander Neumann committed Apr 14, 2022
    Configuration menu
    Copy the full SHA
    63d2a0d View commit details
    Browse the repository at this point in the history

  5. version stuff

    Alexander Neumann committed Apr 14, 2022
    Configuration menu
    Copy the full SHA
    777973d View commit details
    Browse the repository at this point in the history

  6. forgot to save

    Alexander Neumann committed Apr 14, 2022
    Configuration menu
    Copy the full SHA
    61427e0 View commit details
    Browse the repository at this point in the history

  7. only add ZW to CXX flags

    @Neumann-A
    Neumann-A authored Apr 14, 2022
    Configuration menu
    Copy the full SHA
    59c68b3 View commit details
    Browse the repository at this point in the history

Commits on Apr 17, 2022

  1. Merge remote-tracking branch 'upstream/master' into fix_ninja_uwp 

    # Conflicts:
#	versions/s-/sdl2.json
    @Neumann-A
    Neumann-A committed Apr 17, 2022
    Configuration menu
    Copy the full SHA
    a1fd40c View commit details
    Browse the repository at this point in the history

  2. bump version due to merge

    @Neumann-A
    Neumann-A committed Apr 17, 2022
    Configuration menu
    Copy the full SHA
    f193009 View commit details
    Browse the repository at this point in the history

  3. version stuff

    @Neumann-A
    Neumann-A committed Apr 17, 2022
    Configuration menu
    Copy the full SHA
    cef8bb3 View commit details
    Browse the repository at this point in the history

Commits on Apr 18, 2022

  1. Merge remote-tracking branch 'upstream/master' into fix_ninja_uwp

    @Neumann-A
    Neumann-A committed Apr 18, 2022
    Configuration menu
    Copy the full SHA
    cba12df View commit details
    Browse the repository at this point in the history

  2. update version

    @Neumann-A
    Neumann-A committed Apr 18, 2022
    Configuration menu
    Copy the full SHA
    f21e944 View commit details
    Browse the repository at this point in the history

Commits on Apr 20, 2022

  1. Merge remote-tracking branch 'upstream/master' into fix_ninja_uwp 

    # Conflicts:
#	ports/physx/vcpkg.json
#	ports/vcpkg-cmake/vcpkg.json
#	scripts/ci.baseline.txt
#	versions/baseline.json
#	versions/p-/physx.json
#	versions/v-/vcpkg-cmake.json
    Alexander Neumann committed Apr 20, 2022
    Configuration menu
    Copy the full SHA
    261ed4c View commit details
    Browse the repository at this point in the history

  2. version stuff

    Alexander Neumann committed Apr 20, 2022
    Configuration menu
    Copy the full SHA
    a334bc6 View commit details
    Browse the repository at this point in the history

Commits on Apr 21, 2022

  1. Merge remote-tracking branch 'upstream/master' into fix_ninja_uwp 

    # Conflicts:
#	ports/boost-modular-build-helper/vcpkg.json
#	versions/b-/boost-modular-build-helper.json
#	versions/baseline.json
    @Neumann-A
    Neumann-A committed Apr 21, 2022
    Configuration menu
    Copy the full SHA
    221a787 View commit details
    Browse the repository at this point in the history

  2. version stuff

    @Neumann-A
    Neumann-A committed Apr 21, 2022
    Configuration menu
    Copy the full SHA
    fc27223 View commit details
    Browse the repository at this point in the history

Commits on Apr 23, 2022

  1. Merge remote-tracking branch 'upstream/master' into fix_ninja_uwp 

    # Conflicts:
#	versions/i-/igraph.json
    @Neumann-A
    Neumann-A committed Apr 23, 2022
    Configuration menu
    Copy the full SHA
    51461b7 View commit details
    Browse the repository at this point in the history

  2. reset stuff

    @Neumann-A
    Neumann-A committed Apr 23, 2022
    Configuration menu
    Copy the full SHA
    59cbf87 View commit details
    Browse the repository at this point in the history

  3. version stuff

    @Neumann-A
    Neumann-A committed Apr 23, 2022
    Configuration menu
    Copy the full SHA
    b0633b0 View commit details
    Browse the repository at this point in the history