Changes between Version 254 and Version 255 of BuildInstructions

Timestamp:

Oct 15, 2014, 6:03:16 AM (10 years ago)

Author:

historic_bruno

Comment:

Updates for new miniupnpc requirement as sytem lib; removes confusing and broken rebuild.sh

BuildInstructions

@@ -114 +114 @@
  * libxcursor
  * libxml2
+ * miniupnpc
  * OpenAL
  * OpenGL
@@ -125 +126 @@
  * [https://developer.mozilla.org/docs/SpiderMonkey/24 SpiderMonkey 24] (`--with-system-mozjs24`)
  * [http://code.google.com/p/nvidia-texture-tools NVTT] (`--with-system-nvtt`)
- * [http://miniupnp.free.fr/ MiniUPnP client] (`--with-system-miniupnpc`)
 For a list of all options to `update-workspaces.sh` see [wiki:premake premake].
 
@@ -139 +139 @@
 }}}
   * With these dependencies you have to run:
-   * `./update-workspaces.sh --with-system-miniupnpc --with-system-nvtt --with-system-mozjs24`
+   * `./update-workspaces.sh --with-system-nvtt --with-system-mozjs24`
   * To avoid useless warnings when using system mozjs24 you could fix mozjs24 headers with:
 {{{
@@ -168 +168 @@
     libcurl-devel enet-devel libjpeg-devel libpng-devel libvorbis-devel     \
     libxml2-devel openal-soft-devel pkgconfig SDL-devel wxGTK-devel         \
-    gloox-devel libicu-devel'
+    gloox-devel libicu-devel miniupnpc-devel'
 }}}
 
@@ -179 +179 @@
     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
+    gloox-devel libicu-devel miniupnpc-devel
 }}}
 
@@ -187 +187 @@
 {{{
 #!sh
-pacman -S libgl boost cmake gcc curl enet 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 miniupnpc patch sdl subversion zip zlib icu
 
 }}}
@@ -247 +247 @@
 
 === Keeping up to date ===
-If you already checked out the code and only want to update and rebuild it, you may find it helpful to save the lines below to a script called e.g. `rebuild.sh`, place it in your 0ad directory, make it executable and run it.
-
-{{{
-#!sh
-#!/bin/sh
-set -e
-svn up
-cd build/workspaces
-./clean-workspaces.sh
-./update-workspaces.sh
-cd gcc
-make clean
-make -j3
-}}}
-
-If you just edited one source code file and want to rebuild, you can usually get away with:
-
-{{{
-make -j3
-}}}
-
 If you want to rebuild quickly after updating from SVN, you can usually get away with: