2021-08-06 18:52:33 +09:00
|
|
|
#!/bin/sh
|
|
|
|
#
|
|
|
|
# Because git subtree doesn't provide an easy way to automatically merge changes
|
|
|
|
# from upstream, this shell script will do the job instead.
|
|
|
|
# If you don't have a POSIX-compatible shell on your system, feel free to use
|
|
|
|
# this as a reference for what commands to run, rather than running it directly.
|
|
|
|
|
2022-09-23 19:25:24 +09:00
|
|
|
# Change to the root directory, or exit with failure
|
2021-08-06 18:52:33 +09:00
|
|
|
# to prevent git subtree scrawling over some other repo.
|
2022-09-23 19:25:24 +09:00
|
|
|
cd "$(dirname "$0")"/.. || exit 1
|
2021-08-06 18:52:33 +09:00
|
|
|
|
|
|
|
# Merge changes from the upstream parallel-rdp repository.
|
|
|
|
git subtree pull --prefix=ares/n64/vulkan/parallel-rdp https://github.com/Themaister/parallel-rdp-standalone.git master --squash
|
2021-12-12 16:45:37 +09:00
|
|
|
git subtree pull --prefix=thirdparty/sljit https://github.com/zherczeg/sljit.git master --squash
|
2022-04-16 09:09:02 +09:00
|
|
|
git subtree pull --prefix=thirdparty/libchdr https://github.com/rtissera/libchdr master --squash
|
2024-02-13 18:23:47 +09:00
|
|
|
git subtree pull --prefix=thirdparty/librashader https://github.com/SnowflakePowered/librashader master --squash
|
|
|
|
git subtree pull --prefix=thirdparty/slang-shaders https://github.com/libretro/slang-shaders master --squash
|