[colobot] 11/377: Updated install instructions for SDL2

[Didier Raboud]

This is an automated email from the git hooks/post-receive script.

odyx pushed a commit to branch debian/master
in repository colobot.

commit 24c16744340e660b7b8e380fba2fec0b4174d9a8
Author: krzys-h <krzys_h at interia.pl>
Date:   Sat Sep 26 14:46:26 2015 +0200

    Updated install instructions for SDL2
---
 INSTALL-MXE.md | 34 +++++++++++++++++++++++-----------
 INSTALL.md     |  8 ++++----
 README.md      |  2 +-
 3 files changed, 28 insertions(+), 16 deletions(-)

diff --git a/INSTALL-MXE.md b/INSTALL-MXE.md
index d4b0bff..addbbaa 100644
--- a/INSTALL-MXE.md
+++ b/INSTALL-MXE.md
@@ -18,40 +18,52 @@ To cross-compile Colobot using MXE:
    It already contains a universal Makefile for everything.
    Usage is simply `make name_of_package`.
    It will automatically check for dependencies, etc.
-   The packages will be installed in the MXE directory under `usr/`.
+   The packages will be installed in the MXE directory under `usr/i686-w64-mingw32.static`.
 
    You need to `make gcc` first for basic compiler and then do the same
    for some additional libraries. In the end, you should have the following
-   packages installed (this is the final listing of `usr/installed/`):
+   packages installed (this is the final listing of `usr/i686-w64-mingw32.static/installed/`):
     * binutils
     * boost
     * bzip2
-    * check-requirements
+    * cairo
+    * dbus
     * expat
     * flac
+    * fontconfig
     * freetype
+    * freetype-bootstrap
     * gcc
     * gcc-gmp
+    * gcc-isl
     * gcc-mpc
     * gcc-mpfr
     * gettext
     * glew
+    * glib
+    * harfbuzz
+    * icu4c
     * jpeg
+    * libffi
     * libiconv
     * libpng
     * libsndfile
-    * libtool
-    * mingwrt
+    * libwebp
+    * lzo
+    * mingw-w64
+    * mxe-conf
     * ogg
     * openal
+    * pcre
     * physfs
+    * pixman
+    * pkgconf
     * portaudio
-    * sdl
-    * sdl_image
-    * sdl_ttf
+    * sdl2
+    * sdl2_image
+    * sdl2_ttf
     * tiff
     * vorbis
-    * w32api
     * xz
     * zlib
 
@@ -60,7 +72,7 @@ To cross-compile Colobot using MXE:
    `mkdir build-mxe && cd build-mxe`
 
    In order to cross-compile a CMake project, you have to specify a CMake toolchain file.
-   MXE has such file in MXE's directory: `usr/i686-pc-mingw32/share/cmake/mxe-conf.cmake`
+   MXE has such file in MXE's directory: `usr/i686-w64-mingw32.static/share/cmake/mxe-conf.cmake`
    So you should use the following cmake command: `cmake -DCMAKE_TOOLCHAIN_FILE=/path/to/mxe-conf.cmake ..`
    CMake files in Colobot should detect that MXE is being used and they will
    modify flags, paths, etc. as required. You should not run into any problems.
@@ -74,6 +86,6 @@ To cross-compile Colobot using MXE:
    in MXE. Then you can create the NSIS installer that way:
    `PATH=/path/to/mxe/binaries:$PATH make package`
    where `/path/to/mxe/binaries` is path to cross-compiled MXE binaries available
-   in MXE's directory under `usr/i686-pc-mingw32/bin`.
+   in MXE's directory under `usr/i686-w64-mingw32.static/bin`.
    This will create a versioned colobot-$version.exe installer that will install Colobot
    in system directories, add a shortcut in the start menu and setup an uninstaller.
diff --git a/INSTALL.md b/INSTALL.md
index fed781d..47c7997 100644
--- a/INSTALL.md
+++ b/INSTALL.md
@@ -56,9 +56,9 @@ You will need:
  * recent compiler (GCC >= 4.7, or Clang >= 3.1) since we are using some features of C++11
  * CMake >= 2.8
  * Boost >= 1.51 (header files + components: filesystem and regex)
- * SDL >= 1.2.10
- * SDL_image >= 1.2
- * SDL_ttf >= 2.0
+ * SDL2
+ * SDL2_image
+ * SDL2_ttf
  * GLEW >= 1.8.0
  * libpng >= 1.2
  * gettext >= 0.18
@@ -72,7 +72,7 @@ You will need:
 
 On Ubuntu (and probably any other Debian-based system), you can use the following command to install all required packages:
 ```
-  $ apt-get install build-essential cmake libsdl1.2debian libsdl1.2-dev libsdl-image1.2 libsdl-image1.2-dev libsdl-ttf2.0-0 libsdl-ttf2.0-dev libsdl-mixer1.2 libsdl-mixer1.2-dev libsndfile1-dev libvorbis-dev libogg-dev libpng12-dev libglew-dev libopenal-dev libboost-dev libboost-system-dev libboost-filesystem-dev libboost-regex-dev libphysfs-dev gettext git po4a vorbis-tools
+  $ apt-get install build-essential cmake libsdl2-dev libsdl2-image-dev libsdl2-ttf-dev libsndfile1-dev libvorbis-dev libogg-dev libpng12-dev libglew-dev libopenal-dev libboost-dev libboost-system-dev libboost-filesystem-dev libboost-regex-dev libphysfs-dev gettext git po4a vorbis-tools
 ```
 
 Make sure you install the packages along with header files (often distributed in separate *-dev packages). If you miss any requirements,
diff --git a/README.md b/README.md
index 3ec5194..be44f54 100644
--- a/README.md
+++ b/README.md
@@ -1,4 +1,4 @@
-# English
+# Colobot: Gold Edition
 
 Welcome to the Colobot: Gold Edition project code repository
 

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-games/colobot.git