mirror of
https://github.com/bsnes-emu/bsnes.git
synced 2024-05-16 11:20:21 -04:00
e866a909dc
This includes changes to SameBoy (updating the README to be clear about provenance, and adding a GNUmakefile to integrate with bsnes' build system), updates the SameBoy version number in the about box, and adds SameBoy to the list of subtrees updated by update-subtrees.sh.
20 lines
832 B
Bash
Executable file
20 lines
832 B
Bash
Executable file
#!/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.
|
|
|
|
# Change to the directory containing this script, or exit with failure
|
|
# to prevent git subtree scrawling over some other repo.
|
|
cd "$(dirname "$0")" || exit 1
|
|
|
|
# Merge changes from the libco repository.
|
|
git subtree pull --prefix=libco https://github.com/higan-emu/libco.git master
|
|
|
|
# Merge changes from SameBoy
|
|
git subtree pull --prefix=bsnes/gb https://github.com/LIJI32/SameBoy.git master
|
|
echo "If SameBoy updated, remember to update the SameBoy version"
|
|
echo "in bsnes/target-bsnes/presentation/presentation.cpp !"
|
|
|