X-Git-Url: http://git.xonotic.org/?a=blobdiff_plain;f=README.md;h=8ffb05e5ab91a191b72f87705baf1d546e831cbe;hb=6d57ebdc6206f237e1fd77349fd35466e234af1c;hp=7c2191eade62b83fb0c91b2ac36023a63d713f68;hpb=fa505051e63a8c5889440aa2577d75f6abe8bd9e;p=xonotic%2Fnetradiant.git diff --git a/README.md b/README.md index 7c2191ea..8ffb05e5 100644 --- a/README.md +++ b/README.md @@ -3,7 +3,7 @@ NetRadiant ![NetRadiant logo](setup/data/tools/bitmaps/splash.png) -The open source, cross platform level editor for idtech games (Radiant fork). +The open source, cross platform level editor for id Tech-derivated games (Radiant fork). # Getting the sources @@ -63,7 +63,7 @@ You may have to install `subversion` and `unzip` to fetch or extract some non-de ## macOS: ``` -brew install gcc cmake Caskroom/cask/xquartz gtkglext pkgconfig minizip webp coreutils gnu-sed +brew install gcc cmake gtkglext pkgconfig minizip webp coreutils gnu-sed brew link --force gettext ``` @@ -71,7 +71,7 @@ brew link --force gettext * Crunch (optional, disabled by default, only supported with CMake build) -If you have not used `--recursive` option at `git clone` time, you can fetch Crunch this way (run it within the NetRadiant repository): +If you have not used `--recursive` option at `git clone` time, you can fetch Crunch this way (run it within the `netradiant` repository): ``` @@ -85,7 +85,7 @@ This project uses the usual CMake workflow: ## Debug ``` -cmake -G "Unix Makefiles" -H. -Bbuild && cmake --build build -- -j$(nproc) +cmake -G "Unix Makefiles" -H. -Bbuild -DCMAKE_BUILD_TYPE=Debug && cmake --build build -- -j$(nproc) ``` ## Release @@ -94,10 +94,16 @@ cmake -G "Unix Makefiles" -H. -Bbuild && cmake --build build -- -j$(nproc) cmake -G "Unix Makefiles" -H. -Bbuild -DCMAKE_BUILD_TYPE=Release && cmake --build build -- -j$(nproc) ``` -On Mac you have to add this to the first cmake call: +On macOS you have to add this to the first cmake call: ``` --DCMAKE_C_COMPILER=/usr/local/bin/gcc-9 -DCMAKE_CXX_COMPILER=/usr/local/bin/g++-9 -DOPENGL_INCLUDE_DIR=/opt/X11/include -DOPENGL_gl_LIBRARY=/opt/X11/lib/libGL.dylib +-DCMAKE_C_COMPILER=/usr/local/bin/gcc-9 -DCMAKE_CXX_COMPILER=/usr/local/bin/g++-9 +``` + +On FreeBSD you have to add this to the first cmake call: + +``` +-DCMAKE_C_COMPILER=/usr/local/bin/gcc8 -DCMAKE_CXX_COMPILER=/usr/local/bin/g++8 ``` ## Build and installation details @@ -132,7 +138,7 @@ options: Do not automatically download the gamepack data during the first compilation (default: `ON`) * `GAMEPACKS_LICENSE_LIST=all` Download all gamepacks whatever the license (default: `free`, download free gamepacks, can be set to `none` to only filter by name) -* `GAMEPACKS_NAME_LIST=Xonotic Unvanquished` +* `GAMEPACKS_NAME_LIST="Xonotic Unvanquished"` Download gamepacks for the given games (default: `none`, do not select more gamepacks to download) target: