Droog71
/
colobot
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Updated install instructions for SDL2

master
krzys-h 2015-09-26 14:46:26 +02:00
parent 27758dacad
commit 24c1674434
3 changed files with 28 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

34
INSTALL-MXE.md
View File

@ -18,40 +18,52 @@ To cross-compile Colobot using MXE:
It already contains a universal Makefile for everything. It already contains a universal Makefile for everything.
Usage is simply `make name_of_package`. Usage is simply `make name_of_package`.
It will automatically check for dependencies, etc. 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 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 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 * binutils
* boost * boost
* bzip2 * bzip2
* check-requirements * cairo
* dbus
* expat * expat
* flac * flac
* fontconfig
* freetype * freetype
* freetype-bootstrap
* gcc * gcc
* gcc-gmp * gcc-gmp
* gcc-isl
* gcc-mpc * gcc-mpc
* gcc-mpfr * gcc-mpfr
* gettext * gettext
* glew * glew
* glib
* harfbuzz
* icu4c
* jpeg * jpeg
* libffi
* libiconv * libiconv
* libpng * libpng
* libsndfile * libsndfile
* libtool * libwebp
* mingwrt * lzo
* mingw-w64
* mxe-conf
* ogg * ogg
* openal * openal
* pcre
* physfs * physfs
* pixman
* pkgconf
* portaudio * portaudio
* sdl * sdl2
* sdl_image * sdl2_image
* sdl_ttf * sdl2_ttf
* tiff * tiff
* vorbis * vorbis
* w32api
* xz * xz
* zlib * zlib
@ -60,7 +72,7 @@ To cross-compile Colobot using MXE:
`mkdir build-mxe && cd build-mxe` `mkdir build-mxe && cd build-mxe`
In order to cross-compile a CMake project, you have to specify a CMake toolchain file. 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 ..` 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 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. 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: in MXE. Then you can create the NSIS installer that way:
`PATH=/path/to/mxe/binaries:$PATH make package` `PATH=/path/to/mxe/binaries:$PATH make package`
where `/path/to/mxe/binaries` is path to cross-compiled MXE binaries available 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 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. in system directories, add a shortcut in the start menu and setup an uninstaller.

8
INSTALL.md
View File

@ -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 * recent compiler (GCC >= 4.7, or Clang >= 3.1) since we are using some features of C++11
* CMake >= 2.8 * CMake >= 2.8
* Boost >= 1.51 (header files + components: filesystem and regex) * Boost >= 1.51 (header files + components: filesystem and regex)
* SDL >= 1.2.10 * SDL2
* SDL_image >= 1.2 * SDL2_image
* SDL_ttf >= 2.0 * SDL2_ttf
* GLEW >= 1.8.0 * GLEW >= 1.8.0
* libpng >= 1.2 * libpng >= 1.2
* gettext >= 0.18 * 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: 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, Make sure you install the packages along with header files (often distributed in separate *-dev packages). If you miss any requirements,

2
README.md
View File

@ -1,4 +1,4 @@
# English # Colobot: Gold Edition
Welcome to the Colobot: Gold Edition project code repository Welcome to the Colobot: Gold Edition project code repository