Skip to content

Commit

Permalink
Replace wget with curl & fix sed command for OSX
Browse files Browse the repository at this point in the history
  • Loading branch information
andwn committed Jan 4, 2018
1 parent 7c61c2a commit 26cf0f6
Show file tree
Hide file tree
Showing 3 changed files with 14 additions and 9 deletions.
17 changes: 11 additions & 6 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -4,18 +4,23 @@ Personal MegaDrive toolchain I put too much effort into.
You probably shouldn't try using this for 32X dev,
I don't have any examples yet and am still learning how that thing works.

### Dependencies: Windows Users
### Dependencies: Windows

* Install [MSYS2](http://www.msys2.org/) and follow the instructions on the site to make sure it is up to date
* From MinGW 64-bit terminal: `pacman -S mingw-w64-x86_64-toolchain texinfo wget tar diffutils`
* From MinGW 64-bit terminal: `pacman -S mingw-w64-x86_64-toolchain texinfo tar diffutils`
* (It should work with the 32-bit terminal too, just replace `x86_64` with `i686`)


### Dependencies: GNU/Linux Users
### Dependencies: GNU/Linux

* Arch: `pacman -S base-devel texinfo wget`
* Debian: `apt install build-essential texinfo wget`
* RedHat: `yum install gcc gcc-c++ texinfo-tex wget`
* Arch: `pacman -S base-devel texinfo`
* Debian: `apt install build-essential texinfo`
* RedHat: `yum install gcc gcc-c++ texinfo-tex`


### Dependencies: OSX

* Xcode with clang seems to work fine


### Optional Dependencies
Expand Down
2 changes: 1 addition & 1 deletion sgdk/Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ tools: $(BINTOS) $(RESCOMP) $(XGMTOOL) $(WAVTORAW) $(PCMTORAW) $(SIZEBND) $(LZ4W

$(LIBMD):
# Compress resources with lz4w instead of aplib
sed -i 's/-1/2/g' SGDK/res/libres.res
sed -i '' 's/-1/2/g' SGDK/res/libres.res
cp -f Makefile.libmd SGDK/Makefile
make -C SGDK
cp -f SGDK/libmd.a $@
Expand Down
4 changes: 2 additions & 2 deletions toolchain/Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -65,10 +65,10 @@ $(GCC_DIR): $(GCC_PKG)
tar xf $(GCC_PKG)

$(BINUTILS_PKG):
@wget https://mirrors.tripadvisor.com/gnu/binutils/$(BINUTILS_PKG)
@curl -O https://mirrors.tripadvisor.com/gnu/binutils/$(BINUTILS_PKG)

$(GCC_PKG):
@wget https://mirrors.tripadvisor.com/gnu/gcc/gcc-$(GCC_VER)/$(GCC_PKG)
@curl -O https://mirrors.tripadvisor.com/gnu/gcc/gcc-$(GCC_VER)/$(GCC_PKG)

$(LDSCRIPTS):
cp -rf ldscripts/ $(LDSCRIPTS)
Expand Down

0 comments on commit 26cf0f6

Please sign in to comment.