diff --git a/README.md b/README.md index 71629423..2b48fb73 100644 --- a/README.md +++ b/README.md @@ -40,9 +40,7 @@ And the following development libraries: - mesa (if using X11 or any OpenGL otherwise) - ffmpeg (optional, for game recording) - gettext and gettext tools -- jpeg - png -- tiff - SDL2 - SFML (optional, for link) - OpenAL (optional, a sound interface) @@ -50,7 +48,7 @@ And the following development libraries: - cairo (completely optional) On Linux and similar, you also need the version of GTK your wxWidgets is linked -to (usuall 2 or 3). +to (usually 2 or 3). Support for more OSes/distributions for `./installdeps` is planned. diff --git a/installdeps b/installdeps index f8c2efe9..0c0ba162 100755 --- a/installdeps +++ b/installdeps @@ -199,7 +199,7 @@ debian_installdeps() { if [ -z "$target" ]; then check sudo apt-get -qq update - check sudo apt-get -qy install build-essential g++ nasm cmake gettext zlib1g-dev libgl1-mesa-dev libavcodec-dev libavformat-dev libswscale-dev libavutil-dev libgettextpo-dev libjpeg-dev libpng-dev libtiff5-dev libsdl2-dev libsfml-dev libopenal-dev libwxgtk3.0-dev libgtk2.0-dev libgtk-3-dev libcairo2-dev + check sudo apt-get -qy install build-essential g++ nasm cmake gettext zlib1g-dev libgl1-mesa-dev libavcodec-dev libavformat-dev libswscale-dev libavutil-dev libgettextpo-dev libpng-dev libsdl2-dev libsfml-dev libopenal-dev libwxgtk3.0-dev libgtk2.0-dev libgtk-3-dev libcairo2-dev else case "$target" in mingw-w64-i686) @@ -228,7 +228,7 @@ debian_installdeps() { fi set -- - for dep in gcc zlib ffmpeg gettext jpeg tiff sdl2 sfml openal wxwidgets cairo; do + for dep in gcc zlib ffmpeg gettext sdl2 sfml openal wxwidgets cairo; do set -- "$@" "mxe-${target}-$dep" done check sudo apt-get -qy install build-essential cmake "$@" @@ -264,7 +264,7 @@ fedora_installdeps() { # this is sometimes necessary for rawhide set -- --exclude='glibc32*' fi - for pkg in zlib-devel mesa-libGL-devel ffmpeg-devel gettext-devel libjpeg-turbo-devel libpng-devel libtiff-devel SDL2-devel SFML-devel openal-soft-devel wxGTK3-devel gtk2-devel gtk3-devel; do + for pkg in zlib-devel mesa-libGL-devel ffmpeg-devel gettext-devel libpng-devel SDL2-devel SFML-devel openal-soft-devel wxGTK3-devel gtk2-devel gtk3-devel; do if [ -n "$amd64" ]; then set -- "$@" "${pkg}.x86_64" "${pkg}.i686" else @@ -287,7 +287,7 @@ fedora_installdeps() { ;; esac # install static deps - for pkg in zlib gettext libjpeg-turbo libpng libtiff SDL2 wxWidgets; do + for pkg in zlib gettext libpng SDL2 wxWidgets; do set -- "$@" "${target}-${pkg}-static" done # install deps that are not available as static @@ -339,7 +339,7 @@ archlinux_installdeps() { if [ -z "$target" ]; then # native build - check $pacman --noconfirm --needed -S base-devel "$gcc_pkg" nasm zlib mesa cairo cmake ffmpeg gettext libpng libtiff pkg-config sdl2 sfml openal wxgtk gtk2 gtk3 + check $pacman --noconfirm --needed -S base-devel "$gcc_pkg" nasm zlib mesa cairo cmake ffmpeg gettext libpng pkg-config sdl2 sfml openal wxgtk gtk2 gtk3 else # windows cross build case "$target" in @@ -411,7 +411,7 @@ archlinux_installdeps() { done # and the actual deps - for p in zlib gettext libpng libtiff pkg-config sdl2 openal wxmsw; do + for p in zlib gettext libpng pkg-config sdl2 openal wxmsw; do pkg="${pkg_prefix}${p}" # check if already installed if ! $pacman -Q "$pkg" >/dev/null 2>&1; then @@ -476,7 +476,7 @@ brew_installdeps() { check brew -v update set -- - for f in cairo nasm cmake ffmpeg gettext jpeg libpng libtiff pkg-config sdl2 sfml wxmac; do + for f in cairo nasm cmake ffmpeg gettext libpng pkg-config sdl2 sfml wxmac; do if brew info "$f" | grep -Eq '^Not installed$'; then set -- "$@" "$f" fi @@ -493,7 +493,7 @@ macports_installdeps() { installing check sudo port -v selfupdate - check sudo port -v install cairo cmake nasm ffmpeg gettext jpeg libpng tiff pkgconfig libsdl2 sfml wxWidgets-3.0 libiconv + check sudo port -v install cairo cmake nasm ffmpeg gettext libpng pkgconfig libsdl2 sfml wxWidgets-3.0 libiconv check sudo port select wxWidgets wxWidgets-3.0 build_instructions @@ -504,7 +504,7 @@ fink_installdeps() { installing check sudo fink -vy selfupdate - check sudo fink -vy install cairo cmake nasm ffmpeg libgettext8-dev gettext-tools libjpeg9 libpng16 libtiff5 pkgconfig sdl2 wxwidgets300-osxcocoa libiconv-dev + check sudo fink -vy install cairo cmake nasm ffmpeg libgettext8-dev gettext-tools libpng16 pkgconfig sdl2 wxwidgets300-osxcocoa libiconv-dev warning 'SFML is required for LINK support, there is currently no SFML package for Fink, if you want LINK support you will need to install it manually'