- updated installer to include libssl and libcrypto

MegaGlest · Nov 12, 2012 · 53f1163 · 53f1163
1 parent aea1643
commit 53f1163
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 3 deletions.
diff --git a/mk/linux/makedeps_folder.sh b/mk/linux/makedeps_folder.sh
@@ -22,7 +22,7 @@ sync_support_libs(){
 	local _cp="/bin/cp"
 	#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"
 	local skip_deps=""
-	local keep_deps="libcurl libgnu libicu liblua libjpeg libpng libwx libgtk libgdk libftgl libfreetype libvlc libssl" 
+	local keep_deps="libcurl libgnu libicu liblua libjpeg libpng libwx libgtk libgdk libftgl libfreetype libvlc libssl libcrypto" 
 
 	local scan_via_skiplist=1 
 

diff --git a/mk/linux/mojosetup/megaglest-installer/makedeps_folder.sh b/mk/linux/mojosetup/megaglest-installer/makedeps_folder.sh
@@ -22,7 +22,7 @@ sync_support_libs(){
 	local _cp="/bin/cp"
 	#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"
 	local skip_deps=""
-	local keep_deps="libcurl libgnu libicu liblua libjpeg libpng libwx libgtk libgdk libftgl libfreetype libvlc libssl" 
+	local keep_deps="libcurl libgnu libicu liblua libjpeg libpng libwx libgtk libgdk libftgl libfreetype libvlc libssl libcrypto" 
 
 	local scan_via_skiplist=1 
 

diff --git a/mk/linux/start_megaglest b/mk/linux/start_megaglest
@@ -202,6 +202,10 @@ SSL_LINKEDLIBNAME='libssl.so.0.9.8'
 SSL_LIBLOOKUP1=${SSL_LINKEDLIBNAME}
 SSL_LIBLOOKUP2='libssl.so.'
 
+CRYPTO_LINKEDLIBNAME='libcrypto.so.0.9.8'
+CRYPTO_LIBLOOKUP1=${CRYPTO_LINKEDLIBNAME}
+CRYPTO_LIBLOOKUP2='libcrypto.so.'
+
 if [ "$OS_TYPE"'_' = 'x86_64_' ]; then
   DIRECTFB_LINKEDLIBNAME='libdirectfb-1.2.so.0'
   DIRECTFB_LIBLOOKUP1=${DIRECTFB_LINKEDLIBNAME}
@@ -273,7 +277,8 @@ findMissingSO "$LDCONFIG" "$GAMEDIR/$LIBDIR/${IRC_LINKEDLIBNAME}" "$IRC_LIBLOOKU
 findMissingSO "$LDCONFIG" "$GAMEDIR/$LIBDIR/${DL_LINKEDLIBNAME}" "$DL_LIBLOOKUP1" "$DL_LIBLOOKUP2"
 findMissingSO "$LDCONFIG" "$GAMEDIR/$LIBDIR/${VLCCORE_LINKEDLIBNAME}" "$VLCCORE_LIBLOOKUP1" "$VLCCORE_LIBLOOKUP2"
 findMissingSO "$LDCONFIG" "$GAMEDIR/$LIBDIR/${VLC_LINKEDLIBNAME}" "$VLC_LIBLOOKUP1" "$VLC_LIBLOOKUP2"
-findMissingSO "$LDCONFIG" "$GAMEDIR/$LIBDIR/${SSL_LINKEDLIBNAME}" "$SSL_LIBLOOKUP1" "$SSL_LIBLOOKUP2"
+#findMissingSO "$LDCONFIG" "$GAMEDIR/$LIBDIR/${SSL_LINKEDLIBNAME}" "$SSL_LIBLOOKUP1" "$SSL_LIBLOOKUP2"
+#findMissingSO "$LDCONFIG" "$GAMEDIR/$LIBDIR/${CRYPTO_LINKEDLIBNAME}" "$CRYPTO_LIBLOOKUP1" "$CRYPTO_LIBLOOKUP2"
 
 ./megaglest $@