Skip to content

Commit 53f1163

Browse files
committed
- updated installer to include libssl and libcrypto
1 parent aea1643 commit 53f1163

File tree

3 files changed

+8
-3
lines changed

3 files changed

+8
-3
lines changed

mk/linux/makedeps_folder.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ sync_support_libs(){
2222
local _cp="/bin/cp"
2323
#local skip_deps="libm.so libpthread.so libstdc++.so libgcc_s.so libc.so libdl.so libX11.so libpulse libfusion libdirect libnvidia libXext librt libxcb libICE libSM libXtst libwrap libdbus libXau libXdmcp libnsl libFLAC libGL"
2424
local skip_deps=""
25-
local keep_deps="libcurl libgnu libicu liblua libjpeg libpng libwx libgtk libgdk libftgl libfreetype libvlc libssl"
25+
local keep_deps="libcurl libgnu libicu liblua libjpeg libpng libwx libgtk libgdk libftgl libfreetype libvlc libssl libcrypto"
2626

2727
local scan_via_skiplist=1
2828

mk/linux/mojosetup/megaglest-installer/makedeps_folder.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ sync_support_libs(){
2222
local _cp="/bin/cp"
2323
#local skip_deps="libm.so libpthread.so libstdc++.so libgcc_s.so libc.so libdl.so libX11.so libpulse libfusion libdirect libnvidia libXext librt libxcb libICE libSM libXtst libwrap libdbus libXau libXdmcp libnsl libFLAC libGL"
2424
local skip_deps=""
25-
local keep_deps="libcurl libgnu libicu liblua libjpeg libpng libwx libgtk libgdk libftgl libfreetype libvlc libssl"
25+
local keep_deps="libcurl libgnu libicu liblua libjpeg libpng libwx libgtk libgdk libftgl libfreetype libvlc libssl libcrypto"
2626

2727
local scan_via_skiplist=1
2828

mk/linux/start_megaglest

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -202,6 +202,10 @@ SSL_LINKEDLIBNAME='libssl.so.0.9.8'
202202
SSL_LIBLOOKUP1=${SSL_LINKEDLIBNAME}
203203
SSL_LIBLOOKUP2='libssl.so.'
204204

205+
CRYPTO_LINKEDLIBNAME='libcrypto.so.0.9.8'
206+
CRYPTO_LIBLOOKUP1=${CRYPTO_LINKEDLIBNAME}
207+
CRYPTO_LIBLOOKUP2='libcrypto.so.'
208+
205209
if [ "$OS_TYPE"'_' = 'x86_64_' ]; then
206210
DIRECTFB_LINKEDLIBNAME='libdirectfb-1.2.so.0'
207211
DIRECTFB_LIBLOOKUP1=${DIRECTFB_LINKEDLIBNAME}
@@ -273,7 +277,8 @@ findMissingSO "$LDCONFIG" "$GAMEDIR/$LIBDIR/${IRC_LINKEDLIBNAME}" "$IRC_LIBLOOKU
273277
findMissingSO "$LDCONFIG" "$GAMEDIR/$LIBDIR/${DL_LINKEDLIBNAME}" "$DL_LIBLOOKUP1" "$DL_LIBLOOKUP2"
274278
findMissingSO "$LDCONFIG" "$GAMEDIR/$LIBDIR/${VLCCORE_LINKEDLIBNAME}" "$VLCCORE_LIBLOOKUP1" "$VLCCORE_LIBLOOKUP2"
275279
findMissingSO "$LDCONFIG" "$GAMEDIR/$LIBDIR/${VLC_LINKEDLIBNAME}" "$VLC_LIBLOOKUP1" "$VLC_LIBLOOKUP2"
276-
findMissingSO "$LDCONFIG" "$GAMEDIR/$LIBDIR/${SSL_LINKEDLIBNAME}" "$SSL_LIBLOOKUP1" "$SSL_LIBLOOKUP2"
280+
#findMissingSO "$LDCONFIG" "$GAMEDIR/$LIBDIR/${SSL_LINKEDLIBNAME}" "$SSL_LIBLOOKUP1" "$SSL_LIBLOOKUP2"
281+
#findMissingSO "$LDCONFIG" "$GAMEDIR/$LIBDIR/${CRYPTO_LINKEDLIBNAME}" "$CRYPTO_LIBLOOKUP1" "$CRYPTO_LIBLOOKUP2"
277282

278283
./megaglest $@
279284

0 commit comments

Comments
 (0)