Changes between Version 223 and Version 224 of BuildInstructions


Ignore:
Timestamp:
Dec 13, 2013, 4:35:53 AM (10 years ago)
Author:
Josh
Comment:

Mostly revert my previous edit due to changes.

Legend:

Unmodified
Added
Removed
Modified
  • BuildInstructions

    v223 v224  
    106106 * libogg
    107107 * libpng
    108  * libminiupnpc
    109108 * libvorbis
    110109 * libxcursor
     
    124123 * [https://developer.mozilla.org/en/SpiderMonkey/1.8.5 SpiderMonkey 1.8.5] (`--with-system-mozjs185`)
    125124 * [http://code.google.com/p/nvidia-texture-tools NVTT] (`--with-system-nvtt`)
     125 * --with-system-miniupnpc
    126126For a list of all options to `update-workspaces.sh` see [wiki:premake premake].
    127127
     
    137137    libxml2-dev subversion zlib1g-dev libminiupnpc-dev
    138138}}}
    139  * With that dependencies you have to run `update-workspaces.sh` with `--with-system-enet --with-system-nvtt --with-system-mozjs185` flags.
     139 * With that dependencies you have to run `update-workspaces.sh` with `--with-system-enet --with-system-nvtt --with-system-mozjs185 --with-system-miniupnpc` flags.
    140140 * On Debian jessie/8 and Ubuntu trusty/14.04 or later you should replace `libwxgtk2.8-dev` with `libwxgtk3.0-dev`.
    141141 * When not using system libraries, `libenet-dev`, `libmozjs185-dev` and `libnvtt-dev` can be omitted, but `cmake` is needed to build the bundled NVTT and `zip` is needed to build the bundled mozjs185.
     
    159159su -c 'yum -y install gcc-c++ python  subversion zip cmake boost-devel      \
    160160    libcurl-devel libjpeg-devel libpng-devel libvorbis-devel libxml2-devel  \
    161     openal-soft-devel pkgconfig SDL-devel wxGTK-devel gloox-devel miniupnpc'
     161    openal-soft-devel pkgconfig SDL-devel wxGTK-devel gloox-devel'
    162162}}}
    163163
     
    169169sudo zypper install gcc-c++ python  subversion zip cmake boost-devel        \
    170170    libcurl-devel libjpeg-devel libpng-devel libvorbis-devel libxml2-devel  \
    171     openal-soft-devel pkg-config wxGTK-devel libSDL-devel gloox-devel       \
    172     miniupnpc
     171    openal-soft-devel pkg-config wxGTK-devel libSDL-devel gloox-devel
    173172}}}
    174173
     
    332331   * libvorbis
    333332   * libxml2
    334    * libminiupnpc
    335333   * openal
    336334   * png