From 5e5da4d1a8331a0f646f639627aed959d36bc676 Mon Sep 17 00:00:00 2001 From: Robin Jones Date: Wed, 28 Dec 2016 00:39:32 +0000 Subject: [PATCH] using updated version of libmikmod --- tools/setup-linux.sh | 25 ++++--------------------- 1 file changed, 4 insertions(+), 21 deletions(-) diff --git a/tools/setup-linux.sh b/tools/setup-linux.sh index a4d6ee5..2248cda 100644 --- a/tools/setup-linux.sh +++ b/tools/setup-linux.sh @@ -41,25 +41,12 @@ make tools make tools-install cd .. -# install libmikmod -git clone https://github.com/parasyte/libmikmod-n64.git -cd libmikmod-n64 -mkdir build -make -make install - -cd .. -# install libmad-64 -git clone https://github.com/parasyte/libmad-n64.git -cd libmad-n64 -#$(N64_INST) converterd to $N64_INST below otherwise it will not run on WSFL -export PATH=$PATH:$N64_INST/bin -CFLAGS="-march=vr4300 -mtune=vr4300 -mno-extern-sdata" \ -LDFLAGS="-L$N64_INST/lib" LIBS="-lc -lnosys" \ -./configure --host=mips64-elf --disable-shared \ ---prefix=$N64_INST --enable-speed --enable-fpm=mips +# install libmikmod (custom version) +git clone https://github.com/networkfusion/libmikmod +cd libmikmod/n64 make make install +cd .. # we have are in a subfolder, this is not a duplicate... cd .. # install libyaml @@ -76,10 +63,6 @@ make make install cd .. -# Install menu code (perhaps this script should be called from it instead? -# git clone https://github.com/networkfusion/alt64.git -# cd alt64 -# make # Perform cleanup apt-get -y autoremove