X-Git-Url: http://de.git.xonotic.org/?p=xonotic%2Fnetradiant.git;a=blobdiff_plain;f=README.md;h=35a3194633262125fbac09d1589c3440725fb625;hp=8bd40e27f3aac5549e0c5770d31c9573efefe9f7;hb=826fce3cdc0bce78d15c04a2eb0a373dc1b251a3;hpb=a68115c805c158e21a4b6574026a91e0ae58bfac diff --git a/README.md b/README.md index 8bd40e27..35a31946 100644 --- a/README.md +++ b/README.md @@ -27,36 +27,21 @@ See also https://gitlab.com/xonotic/netradiant/ for a source browser, issues and * GtkGLExt * LibJpeg * LibPng + * Minizip * ZLib -# Compiling - -This project uses the usual CMake workflow: - -`cmake -H. -Bbuild && cmake --build build -- -j$(nproc)`` - -## linux - -``` -cmake -H. -Bbuild -G "Unix Makefiles" -``` - ## msys2 -`pacman -S --needed base-devel` - ### 32 bit: ``` -pacman -S --needed mingw-w64-i686-{toolchain,cmake,gtk2,gtkglext} -cmake -H. -Bbuild -G "MSYS Makefiles" -DGTK2_GLIBCONFIG_INCLUDE_DIR=/mingw32/lib/glib-2.0/include -DGTK2_GDKCONFIG_INCLUDE_DIR=/mingw32/lib/gtk-2.0/include +pacman -S --needed base-devel mingw-w64-i686-{toolchain,cmake,make,gtk2,gtkglext} ``` ### 64 bit: ``` -pacman -S mingw-w64-x86_64-{toolchain,cmake,gtk2,gtkglext} -cmake -H. -Bbuild -G "MSYS Makefiles" -DGTK2_GLIBCONFIG_INCLUDE_DIR=/mingw64/lib/glib-2.0/include -DGTK2_GDKCONFIG_INCLUDE_DIR=/mingw64/lib/gtk-2.0/include +pacman -S --needed base-devel mingw-w64-x86_64-{toolchain,cmake,make,gtk2,gtkglext} ``` ## OS X: @@ -67,8 +52,30 @@ brew install Caskroom/cask/xquartz brew link --force gettext ``` -More Compilation Details ------------------------- +# Compiling + +This project uses the usual CMake workflow: + +## Debug + +`cmake -G "Unix Makefiles" -H. -Bbuild && cmake --build build -- -j$(nproc)` + +## Release + +`cmake -G "Unix Makefiles" -H. -Bbuild -DCMAKE_BUILD_TYPE=Release && cmake --build build -- -j$(nproc)` + +## MSYS2 + +Under MSYS2, the mingw shell must be used with the following additional flags: + +``` +cmake -G "MSYS Makefiles" \ + -DGTK2_GLIBCONFIG_INCLUDE_DIR=/mingw64/lib/glib-2.0/include \ + -DGTK2_GDKCONFIG_INCLUDE_DIR=/mingw64/lib/gtk-2.0/include \ + -H. -Bbuild +``` + +## More Compilation Details options: * `DOWNLOAD_GAMEPACKS=ON`