From f127645799b22f67449e6312a4a0e0616cf2057c Mon Sep 17 00:00:00 2001 From: Golias Date: Sat, 9 Feb 2019 06:36:53 -0500 Subject: [PATCH 1/2] Added command to install dependencies for Fedora (Linux) --- docs/Compile.rst | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/docs/Compile.rst b/docs/Compile.rst index 30fab6154..8c2a56626 100644 --- a/docs/Compile.rst +++ b/docs/Compile.rst @@ -158,6 +158,10 @@ Here are some package install commands for various platforms: apt-get install gcc cmake ninja-build git zlib1g-dev libsdl1.2-dev libxml-libxml-perl libxml-libxslt-perl +* On Fedora:: + + yum install gcc-c++ cmake ninja-build git zlib-devel SDL-devel perl-core perl-XML-LibXML perl-XML-LibXSLT ruby + * Debian and derived distros should have similar requirements to Ubuntu. From eeef058684c42fe62ef079124d30ad796c46c543 Mon Sep 17 00:00:00 2001 From: Golias Date: Sat, 9 Feb 2019 06:40:47 -0500 Subject: [PATCH 2/2] Improved .gitignore. Added all files generated in build with ninja, so that the rep remains clean after a complete build + install. --- .gitignore | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/.gitignore b/.gitignore index 6a447a40e..0a614b082 100644 --- a/.gitignore +++ b/.gitignore @@ -34,6 +34,10 @@ build/install_manifest.txt build/_CPack_Packages build/dfhack-*.zip build/dfhack-*.bz2 +build/*ninja* +build/compile_commands.json +build/dfhack_setarch.txt +build/ImportExecutables.cmake # Python binding binaries *.pyc @@ -58,5 +62,8 @@ tags /build/win32/DF_PATH.txt /.vs +# CLion +.idea + # custom plugins /plugins/CMakeLists.custom.txt