Skip to content

Commit ec2aa3c

Browse files
committed
Updated Linux shell scripts
1 parent 0e742ef commit ec2aa3c

File tree

2 files changed

+5
-24
lines changed

2 files changed

+5
-24
lines changed

initial-install.sh

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -16,12 +16,12 @@ autoreconf -fiv
1616
if [ $1 = "-g" ]; then
1717
./configure --with-pic --disable-system-pcre --enable-utf8 \
1818
CFLAGS='-g -O2 -fPIC -DPIC' \
19-
CXXFLAGS='-g -O2 -fPIC -DPIC -std=gnu++0x' \
19+
CXXFLAGS='-g -O2 -fPIC -DPIC -std=c++0x' \
2020
CPPFLAGS='-g -O2 -fPIC -DPIC'
2121
else
2222
./configure --with-pic --disable-system-pcre --enable-utf8 \
2323
CFLAGS='-O2 -fPIC -DPIC' \
24-
CXXFLAGS='-O2 -fPIC -DPIC -std=gnu++0x' \
24+
CXXFLAGS='-O2 -fPIC -DPIC -std=c++0x' \
2525
CPPFLAGS='-O2 -fPIC -DPIC'
2626
fi
2727

@@ -36,7 +36,7 @@ rm ./MTA10_Server/net/net.la
3636
# Build breakpad
3737
cd ./vendor/google-breakpad
3838
./configure
39-
make
39+
make CXXFLAGS='-Wno-sign-compare'
4040
cd ../..
4141

4242
# then you have makefiles and the source can be compiled :)

mta-install.sh

Lines changed: 2 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -17,25 +17,6 @@ for i in $data_files ; do
1717
fi
1818
done
1919

20-
cd MTA10_Server/output
21-
if [ ! -d "mods/deathmatch/resources" ]; then
22-
svn export http://mtasa-resources.googlecode.com/svn/trunk/required mods/deathmatch/resources
23-
else
24-
echo "Info: MTA10_Server/output/mods/deathmatch/resources already exists, delete it and call ./install.sh again if you want to grab the latest version of the default resources."
25-
fi
26-
27-
if [ -f "mtasa-1.1-custom-net-linux.tar.gz" ]; then
28-
rm -f mtasa-1.1-custom-net-linux.tar.gz
29-
fi
30-
31-
if [ "$(which wget)" ]; then
32-
wget http://nightly.mtasa.com/?multitheftauto_linux-1.1-latest -O multitheftauto_linux-1.1-latest.tar.gz
33-
tar -xzf multitheftauto_linux-1.1-latest.tar.gz --transform 's:[^/]*:latest_nightly:'
34-
mv latest_nightly/net.so .
35-
rm -rf latest_nightly multitheftauto_linux-1.1-latest.tar.gz
36-
else
37-
echo "Warning: Please download net.so from http://mtasa-blue.googlecode.com/files/mtasa-1.1-custom-net-linux.tar.gz"
38-
fi
39-
4020
echo "Server ready in MTA10_Server/output"
41-
21+
echo "Additional step 1: Manually install resources into MTA10_Server/output/mods/deathmatch/resources from http://mirror.mtasa.com/mtasa/resources/"
22+
echo "Additional step 2: Manually install MTA10_Server/output/net.so by extracting net.so from matching archive at https://nightly.mtasa.com/"

0 commit comments

Comments
 (0)