epic/OpenRA
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge pull request #8082 from Mailaender/more-dependency-fixes

Browse Source 
Moved configure native dependencies
This commit is contained in:
Oliver Brakmann
2015-05-03 16:07:08 +02:00
parent 4818efe036 2682dc4228
commit b9f2caa0cf
2 changed files with 22 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
Makefile
View File

@@ -271,7 +271,7 @@ $(foreach prog,$(PROGRAMS),$(eval $(call BUILD_ASSEMBLY,$(prog))))
########################## MAKE/INSTALL RULES ##########################
#
default: cli-dependencies core
default: dependencies core
core: game renderers mods utility
@@ -302,7 +302,7 @@ cli-dependencies:
@ $(CP_R) thirdparty/*.dll.config .
native-dependencies:
@./configure
@./thirdparty/configure-native-deps.sh
version: mods/ra/mod.yaml mods/cnc/mod.yaml mods/d2k/mod.yaml mods/modchooser/mod.yaml
@for i in $? ; do \

25
configure → thirdparty/configure-native-deps.sh vendored
View File

@@ -5,6 +5,11 @@ os=`uname`
if [ "$os" == 'Linux' ]; then
locations=(/lib /lib64 /usr/lib /usr/lib64 /usr/lib/i386-linux-gnu /usr/lib/x86_64-linux-gnu /usr/local/lib /opt/lib)
sonames=(liblua.so.5.1.5 liblua5.1.so.5.1 liblua5.1.so.0 liblua.so.5.1 liblua-5.1.so liblua5.1.so)
if [ -f Eluant.dll.config ]; then
exit 0
fi
for location in "${locations[@]}" ; do
for soname in ${sonames[@]} ; do
if [ -f $location/$soname ]; then
@@ -14,6 +19,7 @@ if [ "$os" == 'Linux' ]; then
fi
done
done
if [ -z "$liblua51" ]; then
echo "Lua 5.1 library detection failed."
exit 1
@@ -22,9 +28,18 @@ if [ "$os" == 'Linux' ]; then
echo "Eluant.dll.config has been created successfully."
fi
elif [ "$os" == 'Darwin' ]; then
echo "Downloading pre-compiled lua and SDL2 libraries"
curl -Os https://raw.githubusercontent.com/OpenRA/OpenRALauncherOSX/master/dependencies/Eluant.dll.config
curl -Os https://raw.githubusercontent.com/OpenRA/OpenRALauncherOSX/master/dependencies/liblua.5.1.dylib
curl -Os https://raw.githubusercontent.com/OpenRA/OpenRALauncherOSX/master/dependencies/libSDL2.dylib
echo "Downloaded Lua 5.1 and SDL2 libraries successfully."
if [ ! -f libSDL2.dylib ]; then
echo "Fetching OS X SDL2 library from GitHub."
curl -LOs https://raw.githubusercontent.com/OpenRA/OpenRALauncherOSX/master/dependencies/libSDL2.dylib
fi
if [ ! -f liblua.5.1.dylib ]; then
echo "Fetching OS X Lua 5.1 library from GitHub."
curl -LOs https://raw.githubusercontent.com/OpenRA/OpenRALauncherOSX/master/dependencies/liblua.5.1.dylib
fi
if [ ! -f Eluant.dll.config ]; then
echo "Fetching OS X Lua configuration file from GitHub."
curl -LOs https://raw.githubusercontent.com/OpenRA/OpenRALauncherOSX/master/dependencies/Eluant.dll.config
fi
fi