Skip to content

Commit 39aa820

Browse files
committed
Add Linux client supporting libcurl4 without libcurl3
Previously added package supports libcurl4, which depends on libcurl3. tux_mono.png bases on https://commons.wikimedia.org/wiki/File:Tux_Mono.svg
1 parent 4e7bd1f commit 39aa820

File tree

4 files changed

+40
-18
lines changed

4 files changed

+40
-18
lines changed

htdocs/docs/css/download.css

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -10,24 +10,24 @@
1010
#donate {
1111
margin-top : 15px;
1212
}
13-
#dllinks {
13+
.dllinks {
1414
padding : 15px 0;
1515
margin : auto auto;
1616
text-align : center;
1717
font-size : 14px;
1818
}
19-
#dllinks td {
19+
.dllinks td {
2020
padding : 0 30px;
2121
vertical-align : text-bottom;
2222
}
23-
#dllinks td a:link, #dllinks td a:visited {
23+
.dllinks td a:link, #dllinks td a:visited {
2424
text-decoration : none;
2525
}
26-
#dllinks td a:hover, #dllinks td a:active {
26+
.dllinks td a:hover, #dllinks td a:active {
2727
text-decoration : underline;
2828
}
2929
.dlstats {
3030
float : right;
3131
padding : 5px;
3232
font-size : 16px;
33-
}
33+
}

htdocs/docs/getstarted.html

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -75,13 +75,14 @@ <h4 id="requirements">System requirements</h4>
7575
<li>libogg</li>
7676
<li>libvorbis</li>
7777
<li>OpenAL Soft</li>
78+
<li>libcurl</li>
7879
</ul>
7980
For RedHat based systems, type this at the command line:<br>
8081
<span class="code" style="margin-left : 50px;">
81-
sudo yum install SDL SDL_image zlib libogg libvorbis openal-soft<br></span>
82+
sudo yum install SDL SDL_image zlib libogg libvorbis openal-soft libcurl<br></span>
8283
For Debian based systems (for example Ubuntu), type this at the command line:<br>
8384
<span class="code" style="margin-left : 50px;">
84-
sudo apt-get install libsdl1.2debian libsdl-image1.2 zlib1g libogg0 libvorbis0a libopenal1</span>
85+
sudo apt-get install libsdl1.2debian libsdl-image1.2 zlib1g libogg0 libvorbis0a libopenal1 libcurl4</span>
8586
</td>
8687
</tr>
8788
<tr>

htdocs/docs/images/tux_mono.png

1.79 KB
Loading

htdocs/download.html

Lines changed: 32 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -57,46 +57,67 @@ <h2>Download AssaultCube</h2>
5757
Any questions, please consult the <a href="docs">README</a> contained with your installation first!
5858
</p>
5959
<h3>Download Now:</h3>
60-
<table id="dllinks">
60+
<table class="dllinks">
6161
<tr>
6262
<td>
6363
<a href="https://github.com/assaultcube/AC/releases/download/v1.2.0.2/AssaultCube_v1.2.0.2.exe">
6464
<img src="docs/images/windows.png" alt="Windows" width="40px" height="40px" title="Supports Windows 2000/XP/Vista/7/8/10">
65-
<br>
65+
<br>
6666
Microsoft<br>Windows
6767
</a>
6868
</td>
6969
<td>
7070
<a href="https://github.com/assaultcube/AC/releases/download/v1.2.0.2/AssaultCube_v1.2.0.2.tar.bz2">
7171
<img src="docs/images/linux.png" alt="Linux" width="40px"height="40px" title="Linux">
72-
<br>
72+
<br>
7373
Linux
7474
</a>
7575
</td>
7676
<td>
7777
<a href="https://github.com/assaultcube/AC/releases/download/v1.2.0.2/AssaultCube_v1.2.0.2.dmg">
7878
<img src="docs/images/apple.png" alt="Mac OS X" width="40px" height="40px" title="Supports Mac OS X 10.6 - macOS 10.14">
79-
<br>
79+
<br>
8080
Apple<br>Mac OS X 10.6<br>- macOS 10.14
8181
</a>
8282
</td>
8383
<td>
8484
<a href="https://github.com/assaultcube/AC/releases/download/v1.2.0.2/AssaultCube_v1.2.0.2_experimental_macOS10.15_hotfix_1.dmg">
8585
<img src="docs/images/macos.png" alt="macOS" width="40px" height="40px" title="Supports macOS 10.15 (or higher)">
86-
<br>
86+
<br>
8787
Apple<br>macOS 10.15+ only,<br>experimental 64-bit
8888
</a>
8989
</td>
9090
</tr>
9191
</table>
92-
<table id="downloadlink">
92+
<p>
93+
<b>Note for Linux users:</b>
94+
<br>
95+
On older Linux systems with old libcurl3 library above default Linux package may not work. In such case please download below packages supporting libcurl3
96+
(on the newest Linux systems with only libcurl4 library below clients won't run, with the error:
97+
<span class="code">libcurl.so.4: version `CURL_OPENSSL_3' not found</span> - see more in release information on
98+
<a href="https://github.com/assaultcube/AC/releases/tag/v1.2.0.2">GitHub</a> ).
99+
First try
100+
<a href="https://github.com/assaultcube/AC/releases/download/v1.2.0.2/AssaultCube_v1.2.0.2_libcurl4_depended_on_libcurl3.tar.bz2">Older but not the oldest Linux</a>
101+
package,
102+
and if it won't work, then
103+
<a href="https://github.com/assaultcube/AC/releases/download/v1.2.0.2/AssaultCube_v1.2.0.2_libcurl3.tar.bz2">The oldest Linux</a>
104+
package:
105+
</p>
106+
<table class="dllinks">
93107
<tr>
94108
<td>
95-
<br>
96-
<b>Note:</b> on older Linux systems with old libcurl3 and without newer libcurl4 library please download this
97-
<a href="https://github.com/assaultcube/AC/releases/download/v1.2.0.2/AssaultCube_v1.2.0.2_libcurl3.tar.bz2">Linux client</a>,
98-
supporting libcurl3 (it doesn't support libcurl4, so on newer Linux systems this client won't run, with the error:
99-
<span class="code">libcurl.so.4: version `CURL_OPENSSL_3' not found</span> ).
109+
<a href="https://github.com/assaultcube/AC/releases/download/v1.2.0.2/AssaultCube_v1.2.0.2_libcurl4_depended_on_libcurl3.tar.bz2">
110+
<img src="docs/images/linux.png" alt="Older Linux" width="40px"height="40px" title="Older Linux">
111+
<br>
112+
Older but not the oldest Linux
113+
</a>
114+
</td>
115+
<td>
116+
<a href="https://github.com/assaultcube/AC/releases/download/v1.2.0.2/AssaultCube_v1.2.0.2_libcurl3.tar.bz2">
117+
<img src="docs/images/tux_mono.png" alt="Oldest Linux" width="33px"height="40px" title="Oldest Linux">
118+
<br>
119+
The oldest Linux
120+
</a>
100121
</td>
101122
</tr>
102123
</table>

0 commit comments

Comments
 (0)