diff options
| author | Nadia Holmquist Pedersen <nadia@nhp.sh> | 2020-06-03 13:54:28 +0200 |
|---|---|---|
| committer | Nadia Holmquist Pedersen <nadia@nhp.sh> | 2020-06-03 13:54:28 +0200 |
| commit | f9f366e296a68be0aa2eb7bfd0552da31896a18c (patch) | |
| tree | f52760d5505b84074a9c1b50b4fe16e40035ba06 /README.md | |
| parent | b746c0b7279d1f5b4bcfd02c115b09d583e9df4f (diff) | |
| parent | d6332f96f162849ad0dde2738cacd3fae6e76e5d (diff) | |
Merge remote-tracking branch 'remotes/upstream/master' into feature/qt-platform
# Conflicts:
# src/frontend/qt_sdl/CMakeLists.txt
# src/frontend/qt_sdl/Platform.cpp
# src/frontend/qt_sdl/main.cpp
Diffstat (limited to 'README.md')
| -rw-r--r-- | README.md | 6 |
1 files changed, 1 insertions, 5 deletions
@@ -38,7 +38,7 @@ As for the rest, the interface should be pretty straightforward. If you have a q * Install dependencies: ```sh -sudo apt-get install gtk+-3.0 libcurl4-gnutls-dev libpcap0.8-dev libsdl2-dev +sudo apt-get install libgtk-3-dev libcurl4-gnutls-dev libpcap0.8-dev libsdl2-dev ``` * Compile: @@ -52,10 +52,6 @@ make -j$(nproc --all) ### Windows: - * use CodeBlocks - -#### MSYS2 and CMake - 1. Install [MSYS2](https://www.msys2.org/) 2. Open the **MSYS2 MinGW 64-bit** terminal 3. Update the packages using `pacman -Syu` and reopen the terminal if it asks you to |