Skip to content

Commit 6d44a35

Browse files
committed
Update premake used by travis
The compiled binary is based upon https://github.com/multitheftauto/premake-core (Branch: release/travis) Also fix linux-build.sh to use the correct premake path
1 parent c6e6046 commit 6d44a35

File tree

3 files changed

+6
-11
lines changed

3 files changed

+6
-11
lines changed

.travis.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@ matrix:
2929
NIGHTLY_UPLOAD=0
3030

3131
before_script:
32-
- wget https://github.com/sbx320/premake5-travis/blob/master/premake5?raw=true -O ./premake5 &&
32+
- wget https://mirror.mtasa.com/bdata/premake5-travis -O ./premake5 &&
3333
chmod +x ./premake5 &&
3434
./premake5 gmake &&
3535
cd Build

linux-build.sh

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,10 @@
11
#!/bin/bash
22

3-
if [[ "$(uname -m)" == 'x86_64' ]]; then
4-
PREMAKE5=utils/premake5_x64
5-
CONFIG=release_x64
6-
else
7-
PREMAKE5=utils/premake5_x86
3+
PREMAKE5=utils/premake5
4+
if [ "$1" -eq "32" ]; then
85
CONFIG=release_x86
6+
else
7+
CONFIG=release_x64
98
fi
109

1110
# Clean old build files

linux-install-data.sh

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,6 @@
11
#!/bin/bash
22

3-
if [[ "$(uname -m)" == 'x86_64' ]]; then
4-
PREMAKE5=utils/premake5_x64
5-
else
6-
PREMAKE5=utils/premake5_x86
7-
fi
3+
PREMAKE5=utils/premake5
84

95
# Install data files
106
$PREMAKE5 install_data

0 commit comments

Comments
 (0)