Changes between Version 376 and Version 377 of BuildInstructions

Timestamp:

Jun 26, 2020, 9:20:19 PM (4 years ago)

Author:

FeXoR

Comment:

Changed Debuan/Ubuntu section to be for Ubuntu 18.04 or later simplifying things

BuildInstructions

@@ -128 +128 @@
 
 ==== Debian / Ubuntu ====
- * On **Debian 8/jessie or Ubuntu 14.04/trusty or later** install the required dependencies with:
+ * On **Debian 10 (Buster) or Ubuntu 18.04 LTS (Bionic Beaver) or later** install the required dependencies with:
 {{{
 #!sh
@@ -136 +136 @@
     libpng-dev libsdl2-dev libvorbis-dev libxcursor-dev  \
     libxml2-dev python subversion zlib1g-dev libenet-dev \
-    libboost-system-dev
+    libboost-system-dev libsodium-dev
 }}}
    * With these dependencies you have to run:
      * `./update-workspaces.sh --with-system-nvtt`
      * If the game crashes at startup (#5757), you might need to use the bundled NVTT instead of the system-provided one: see below.
- * On all versions **except Ubuntu 16.04, 18.04, and Debian Sid**, you will need to [https://download.libsodium.org/doc/installation/ install libsodium manually].
-   * On **Ubuntu 16.04 and Debian Sid** and higher, you can `sudo apt-get install libsodium-dev`.
  * If you want to use a packaged **mozjs45**, which will be made available for example in [https://launchpad.net/~wfg/+archive/ubuntu/0ad.dev/+packages 0ad.dev PPA]:
    * you should add `libmozjs-45-dev` and run `update-workspace.sh` with `--with-system-mozjs45`.
@@ -148 +146 @@
  * You can also use `libcurl4-openssl-dev` instead of `libcurl4-gnutls-dev` (it's not possible to install both at once), but [http://lintian.debian.org/tags/possible-gpl-code-linked-with-openssl.html note that openssl is not GPL compatible and the resulting binaries could not be redistributed].
 
- * Finally you need to install the WX libraries.
-{{{
-#!sh
-sudo apt install wx3.0-headers libwxbase3.0-dev libwxgtk3.0-dev libwxbase3.0-0v5 libwxgtk3.0-0v5
-}}}
-
-   With Ubuntu 20.04 some package names changed getting an additional "-gtk3" so install e.g. `libwxgtk3.0-gtk3-dev` instead of `libwxgtk3.0-dev`. (You can use "Tab" auto completion to see what packages are available for your distribution)
+ * Finally you need to install the WX libraries for Atlas:
+{{{
+#!sh
+sudo apt install wx3.0-headers libwxbase3.0-dev libwxgtk3.0-gtk3-dev libwxbase3.0-0v5 libwxgtk3.0-gtk3-0v5
+}}}
 
 ==== Mandriva ====