Skip to content

Commit

Permalink
Add tranlsation dependency
Browse files Browse the repository at this point in the history
  • Loading branch information
AJenbo committed Jan 5, 2020
1 parent d2d80f6 commit 89189f8
Show file tree
Hide file tree
Showing 4 changed files with 17 additions and 14 deletions.
14 changes: 8 additions & 6 deletions .circleci/config.yml
Expand Up @@ -7,7 +7,7 @@ jobs:
steps:
- checkout
- run: apt-get update -y
- run: apt-get install -y g++ libsdl2-dev libsdl2-mixer-dev libsdl2-ttf-dev git
- run: apt-get install -y g++ libsdl2-dev libsdl2-mixer-dev libsdl2-ttf-dev git gettext
- run: apt-get install -y -t stretch-backports cmake libsodium-dev
- run: cd build && cmake .. -DNIGHTLY_BUILD=ON
- run: cd build && cmake --build . -j $(nproc)
Expand All @@ -19,7 +19,7 @@ jobs:
steps:
- checkout
- run: apt-get update -y
- run: apt-get install -y g++ libsdl-dev libsdl-mixer1.2-dev libsdl-ttf2.0-dev git
- run: apt-get install -y g++ libsdl-dev libsdl-mixer1.2-dev libsdl-ttf2.0-dev git gettext
- run: apt-get install -y -t stretch-backports cmake libsodium-dev
- run: cd build && cmake .. -DNIGHTLY_BUILD=ON -DUSE_SDL1=ON
- run: cd build && cmake --build . -j $(nproc)
Expand All @@ -32,7 +32,7 @@ jobs:
- checkout
- run: dpkg --add-architecture i386
- run: apt-get update -y
- run: apt-get install -y g++-multilib libsdl2-dev:i386 libsdl2-mixer-dev:i386 libsdl2-ttf-dev:i386 libsodium-dev git
- run: apt-get install -y g++-multilib libsdl2-dev:i386 libsdl2-mixer-dev:i386 libsdl2-ttf-dev:i386 libsodium-dev git gettext
- run: apt-get install -y -t stretch-backports cmake libsodium-dev:i386
- run: cd build && cmake -DNIGHTLY_BUILD=ON -DCMAKE_TOOLCHAIN_FILE=../CMake/32bit.cmake ..
- run: cd build && cmake --build . -j $(nproc)
Expand All @@ -44,7 +44,7 @@ jobs:
steps:
- checkout
- run: apt-get update -y
- run: apt-get install -y cmake gcc-mingw-w64-i686 g++-mingw-w64-i686 wget git
- run: apt-get install -y cmake gcc-mingw-w64-i686 g++-mingw-w64-i686 wget git gettext
- run: wget https://www.libsdl.org/release/SDL2-devel-2.0.9-mingw.tar.gz
- run: tar -xzf SDL2-devel-2.0.9-mingw.tar.gz
- run: wget https://www.libsdl.org/projects/SDL_ttf/release/SDL2_ttf-devel-2.0.15-mingw.tar.gz
Expand All @@ -65,7 +65,9 @@ jobs:
steps:
- checkout
- run: echo deb http://deb.debian.org/debian stretch-backports main > /etc/apt/sources.list.d/debian-backports.list
- run: apt-get update && apt-get install -y -t stretch-backports cmake
- run: apt-get update
- run: apt-get install -y gettext
- run: apt-get install -y -t stretch-backports cmake
- run: dkp-pacman -Syu --noconfirm
# Install cmake files (https://github.com/devkitPro/docker/issues/3)
- run: dkp-pacman -S --needed --noconfirm --quiet devkitpro-pkgbuild-helpers
Expand All @@ -75,7 +77,7 @@ jobs:

workflows:
version: 2
testflow:
build:
jobs:
- linux_x86_64
- linux_x86
Expand Down
7 changes: 4 additions & 3 deletions Brewfile
@@ -1,5 +1,6 @@
brew "cmake"
brew "sdl2_mixer"
brew "sdl2_ttf"
brew "libsodium"
brew "sdl2_mixer"
brew "sdl2_ttf"
brew "libsodium"
brew "pkg-config"
brew "gettext"
8 changes: 4 additions & 4 deletions README.md
Expand Up @@ -23,7 +23,7 @@ Nightly builds | Platform

### Installing dependencies on Debian and Ubuntu
```
sudo apt-get install cmake g++ libsdl2-mixer-dev libsdl2-ttf-dev libsodium-dev
sudo apt-get install cmake g++ libsdl2-mixer-dev libsdl2-ttf-dev libsodium-dev gettext
```
### Installing dependencies on Fedora
```
Expand Down Expand Up @@ -83,7 +83,7 @@ cmake --build . -j $(sysctl -n hw.ncpuonline)
Download and place the 32bit MinGW Development Libraries of [SDL2](https://www.libsdl.org/download-2.0.php), [SDL2_mixer](https://www.libsdl.org/projects/SDL_mixer/), [SDL2_ttf](https://www.libsdl.org/projects/SDL_ttf/) and [Libsodium](https://github.com/jedisct1/libsodium/releases) in `/usr/i686-w64-mingw32`.

```
sudo apt-get install cmake gcc-mingw-w64-i686 g++-mingw-w64-i686
sudo apt-get install cmake gcc-mingw-w64-i686 g++-mingw-w64-i686 gettext
```
### Compiling
```
Expand All @@ -106,13 +106,13 @@ Make sure to install the `C++ CMake tools for Windows` component for Visual Stud
For the 64-bit version of the dependencies please run this command:

```
vcpkg install sdl2:x64-windows sdl2-mixer:x64-windows sdl2-ttf:x64-windows libsodium:x64-windows
vcpkg install sdl2:x64-windows sdl2-mixer:x64-windows sdl2-ttf:x64-windows libsodium:x64-windows gettext:x64-windows
```

For the 32-bit version of the dependencies please run this command:

```
vcpkg install sdl2:x86-windows sdl2-mixer:x86-windows sdl2-ttf:x86-windows libsodium:x86-windows
vcpkg install sdl2:x86-windows sdl2-mixer:x86-windows sdl2-ttf:x86-windows libsodium:x86-windows gettext:x86-windows
```

* **Manually**
Expand Down
2 changes: 1 addition & 1 deletion appveyor.yml
Expand Up @@ -7,7 +7,7 @@ image: Visual Studio 2017
cache: c:\tools\vcpkg\installed\

install:
- vcpkg install sdl2:x64-windows sdl2-mixer:x64-windows sdl2-ttf:x64-windows libsodium:x64-windows
- vcpkg install sdl2:x64-windows sdl2-mixer:x64-windows sdl2-ttf:x64-windows libsodium:x64-windows gettext:x64-windows

before_build:
- cmake -G "Visual Studio 15 2017" -A x64 -DNIGHTLY_BUILD=ON -DCMAKE_TOOLCHAIN_FILE=c:/tools/vcpkg/scripts/buildsystems/vcpkg.cmake .
Expand Down

0 comments on commit 89189f8

Please sign in to comment.