Changes between Version 274 and Version 275 of BuildInstructions

Timestamp:

Apr 27, 2015, 11:04:16 AM (9 years ago)

Author:

fabio

Comment:

update for sdl2 enabled by default

BuildInstructions

@@ -105 +105 @@
  * OpenAL
  * OpenGL
- * SDL (2.0 version is also experimental supported when passing `--sdl2` to `update-workspaces.sh`)
+ * SDL2 (at least 2.0.2) - (1.2 version is still supported when passing `--sdl1` to `update-workspaces.sh`)
  * Subversion (or git if you want to use the Git mirror; see below)
  * zlib
@@ -123 +123 @@
     libcurl4-gnutls-dev libenet-dev libgloox-dev libicu-dev libjpeg-dev     \
     libminiupnpc-dev libnspr4-dev libnvtt-dev libogg-dev libopenal-dev   \
-    libpng-dev libsdl-dev libvorbis-dev libwxgtk3.0-dev libxcursor-dev      \
+    libpng-dev libsdl2-dev libvorbis-dev libwxgtk3.0-dev libxcursor-dev      \
     libxml2-dev subversion zlib1g-dev
 }}}
@@ -153 +153 @@
 su -c 'yum -y install gcc-c++ python subversion zip cmake boost-devel       \
     libcurl-devel enet-devel libjpeg-devel libpng-devel libvorbis-devel     \
-    libxml2-devel openal-soft-devel pkgconfig SDL-devel wxGTK-devel         \
+    libxml2-devel openal-soft-devel pkgconfig SDL2-devel wxGTK-devel         \
     gloox-devel libicu-devel miniupnpc-devel'
 }}}
@@ -164 +164 @@
 sudo zypper install gcc-c++ python subversion zip cmake boost-devel         \
     libcurl-devel libenet-devel libjpeg-devel libpng-devel libvorbis-devel  \
-    libxml2-devel openal-soft-devel pkg-config wxGTK-devel libSDL-devel     \
+    libxml2-devel openal-soft-devel pkg-config wxGTK-devel libSDL2-devel     \
     gloox-devel libicu-devel miniupnpc-devel
 }}}
@@ -173 +173 @@
 {{{
 #!sh
-pacman -S libgl boost cmake gcc curl enet gloox libogg libpng libvorbis libxcursor libxml2 miniupnpc patch sdl subversion zip zlib icu
+pacman -S libgl boost cmake gcc curl enet gloox libogg libpng libvorbis libxcursor libxml2 miniupnpc patch sdl2 subversion zip zlib icu
 
 }}}
@@ -368 +368 @@
    * openal
    * png
-   * sdl
+   * sdl2
    * subversion
    * wxWidgets-gtk2 (unicode) - required to build the Atlas editor
@@ -384 +384 @@
 #!sh
 pkg install boost-libs cmake curl enet gloox gmake iconv libGL libogg          \
-     libvorbis libxml2 miniupnpc nspr openal pkgconf png sdl subversion        \
+     libvorbis libxml2 miniupnpc nspr openal pkgconf png sdl2 subversion        \
      wx30-gtk2 zip
 }}}
@@ -411 +411 @@
 #!sh
 pkg_add -i boost cmake curl enet g++ gcc gloox gmake icu4c libexecinfo libogg  \
-    libxml miniupnpc nspr openal png sdl subversion zip
+    libxml miniupnpc nspr openal png sdl2 subversion zip
 }}}
  * As OpenBSD's packaged libxml isn't build with threading support, building Atlas is not possible so you should run `update-workspaces.sh` with the `--disable-atlas` option.