Changes between Version 241 and Version 242 of BuildInstructions

Timestamp:

Jun 28, 2014, 7:59:42 AM (10 years ago)

Author:

historic_bruno

Comment:

Updates for removed ENet source in r15457

BuildInstructions

@@ -105 +105 @@
  * GCC (at least 4.0, preferably 4.3 or later)
  * libcurl
+ * libenet (1.3, the older 1.2 is not compatible)
  * libgloox (needed for the lobby; pass `--without-lobby` to `update-workspaces.sh` to exclude the lobby)
  * libicu
@@ -122 +123 @@
  * wxWidgets (packages are probably called wxgtk)
 To use shared system libraries instead of bundled copies (default) of libraries (pass the flag `--with-system-$COMPONENT` to `update-workspaces.sh` to use the non-bundled copy):
- * [http://enet.bespin.org/ ENet 1.3] (`--with-system-enet`)
  * [https://developer.mozilla.org/docs/SpiderMonkey/24 SpiderMonkey 24] (`--with-system-mozjs24`)
  * [http://code.google.com/p/nvidia-texture-tools NVTT] (`--with-system-nvtt`)
@@ -140 +140 @@
  * `libboost-signals-dev` is '''not''' needed if you use a post-alpha16 SVN version.
  * With these dependencies you have to run:
-  * `update-workspaces.sh --with-system-enet --with-system-miniupnpc --with-system-nvtt --with-system-mozjs24`
+  * `update-workspaces.sh --with-system-miniupnpc --with-system-nvtt --with-system-mozjs24`
  * To avoid useless warnings when using system mozjs24 you could fix mozjs24 headers with:
 {{{
@@ -148 +148 @@
   * you should replace `libwxgtk3.0-dev` with `libwxgtk2.8-dev`;
   * you should replace `libmozjs-24-dev` with `libnspr4-dev` and run `update-workspace.sh` without `--with-system-mozjs24`.
- * When not using system libraries, `libenet-dev` and `libnvtt-dev` can be omitted, but `cmake` is needed to build the bundled NVTT.
+ * When not using system libraries, `libnvtt-dev` can be omitted, but `cmake` is needed to build the bundled NVTT.
  * 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].
 
@@ -157 +157 @@
 #!sh
 urpmi gcc-c++ python subversion zip cmake  boost-devel libcurl-devel        \
-    libgloox-devel libjpeg-devel libpng-devel libvorbis-devel libxml2-devel \
-    libwxgtku2.8-devel openal-soft-devel libicu-devel
+    libenet-devel libgloox-devel libjpeg-devel libpng-devel libvorbis-devel \
+    libxml2-devel libwxgtku2.8-devel openal-soft-devel libicu-devel
 }}}
 
@@ -167 +167 @@
 #!sh
 su -c 'yum -y install gcc-c++ python  subversion zip cmake boost-devel      \
-    libcurl-devel libjpeg-devel libpng-devel libvorbis-devel libxml2-devel  \
-    openal-soft-devel pkgconfig SDL-devel wxGTK-devel gloox-devel libicu-devel'
+    libcurl-devel libenet-devel libjpeg-devel libpng-devel libvorbis-devel  \
+    libxml2-devel openal-soft-devel pkgconfig SDL-devel wxGTK-devel         \
+    gloox-devel libicu-devel'
 }}}
 
@@ -177 +178 @@
 #!sh
 sudo zypper install gcc-c++ python  subversion zip cmake boost-devel        \
-    libcurl-devel libjpeg-devel libpng-devel libvorbis-devel libxml2-devel  \
-    openal-soft-devel pkg-config wxGTK-devel libSDL-devel gloox-devel libicu-devel
+    libcurl-devel libenet-devel libjpeg-devel libpng-devel libvorbis-devel  \
+    libxml2-devel openal-soft-devel pkg-config wxGTK-devel libSDL-devel     \
+    gloox-devel libicu-devel
 }}}
 
@@ -186 +188 @@
 {{{
 #!sh
-pacman -S libgl boost cmake gcc curl gloox libogg libpng libvorbis libxcursor libxml2 patch sdl subversion zip zlib icu
+pacman -S libgl boost cmake gcc curl enet gloox libogg libpng libvorbis libxcursor libxml2 patch sdl subversion zip zlib icu
 
 }}}