diff --git a/.github/CONTRIBUTING.md b/.github/CONTRIBUTING.md
@@ -0,0 +1,312 @@
+  
+# Contribute
+  
+
+  
+**Opening new issue?** Please read [ISSUES.md](https://github.com/CleverRaven/Cataclysm-DDA/blob/master/ISSUES.md) first.
+  
+
+  
+Contributing to Cataclysm: Dark Days Ahead is easy — simply fork the repository here on GitHub, make your changes, and then send us a pull request.
+  
+
+  
+Cataclysm:Dark Days Ahead is released under the Creative Commons Attribution ShareAlike 3.0 license. The code and content of the game is free to use, modify, and redistribute for any purpose whatsoever. See http://creativecommons.org/licenses/by-sa/3.0/ for details.
+  
+This means any contribution you make to the project will also be covered by the same license, and this license is irrevocable.
+  
+
+  
+## Guidelines
+  
+
+  
+There are a couple of guidelines we suggest sticking to:
+  
+
+  
+* Add this repository as an `upstream` remote.
+  
+* Keep your `master` branch clean. This means you can easily pull changes made to this repository into yours.
+  
+* Create a new branch for each new feature or set of related bug fixes.
+  
+* Never merge from your local branches into your `master` branch. Only update that by pulling from `upstream/master`.
+  
+
+  
+## Code Style
+  
+
+  
+Current policy is to only update code to the standard style when changing a substantial portion of it, but **please** do this in a separate commit. See [CODE_STYLE](../doc/CODE_STYLE.md) for details.
+  
+
+  
+## Translations
+  
+
+  
+The translation of Cataclysm: DDA is done using Transifex.
+  
+Look at the [translation project](https://www.transifex.com/cataclysm-dda-translators/cataclysm-dda/) for an up-to-date list of supported languages.
+  
+
+  
+See [TRANSLATING](../doc/TRANSLATING.md) for more information:
+  
+
+  
+* [For translators](../doc/TRANSLATING.md#translators)
+  
+* [For developers](../doc/TRANSLATING.md#developers)
+  
+* [For maintainers](../doc/TRANSLATING.md#maintainers)
+  
+
+  
+## Doxygen Comments
+  
+
+  
+Extensive documentation of classes and class members will make the code more readable to new contributors. New doxygen comments for existing classes are a welcomed contribution.
+  
+
+  
+Use the following template for commenting classes:
+  
+```c++
+  
+/**
+  
+ * Brief description
+  
+ *
+  
+ * Lengthy description with many words. (optional)
+  
+ */
+  
+class foo {
+  
+```
+  
+
+  
+Use the following template for commenting functions:
+  
+```c++
+  
+/**
+  
+ * Brief description
+  
+ *
+  
+ * Lengthy description with many words. (optional)
+  
+ * @param param1 Description of param1 (optional)
+  
+ * @return Description of return (optional)
+  
+ */
+  
+int foo(int param1);
+  
+```
+  
+
+  
+Use the following template for commenting member variables:
+  
+```c++
+  
+/** Brief description **/
+  
+int foo;
+  
+```
+  
+
+  
+Helpful pages:
+  
+http://www.stack.nl/~dimitri/doxygen/manual/commands.html
+  
+http://www.stack.nl/~dimitri/doxygen/manual/markdown.html#markdown_std
+  
+http://www.stack.nl/~dimitri/doxygen/manual/faq.html
+  
+
+  
+### Guidelines for adding documentation
+  
+* Doxygen comments should describe behavior towards the outside, not implementation, but since many classes in Cataclysm are intertwined, it's often necessary to describe implementation.
+  
+* Describe things that aren't obvious to newcomers just from the name.
+  
+* Don't describe redundantly: `/** Map **/; map* map;` is not a helpful comment.
+  
+* When documenting X, describe how X interacts with other components, not just what X itself does.
+  
+
+  
+### Building the documentation for viewing it locally
+  
+* Install doxygen
+  
+* `doxygen doxygen_doc/doxygen_conf.txt `
+  
+* `firefox doxygen_doc/html/index.html` (replace firefox with your browser of choice)
+  
+
+  
+## Example Workflow
+  
+
+  
+#### Setup your environment
+  
+
+  
+*(This only needs to be done once.)*
+  
+
+  
+1. Fork this repository here on GitHub.
+  
+
+  
+2. Clone your fork locally.
+  
+
+  
+        $ git clone https://github.com/YOUR_USERNAME/Cataclysm-DDA.git
+  
+        # Clones your fork of the repository into the current directory in terminal
+  
+
+  
+3. Set commit message template.
+  
+
+  
+        $ git config --local commit.template .gitmessage
+  
+
+  
+4. Add this repository as a remote.
+  
+
+  
+        $ cd Cataclysm-DDA
+  
+        # Changes the active directory in the prompt to the newly cloned "Cataclysm-DDA" directory
+  
+        $ git remote add -f upstream https://github.com/CleverRaven/Cataclysm-DDA.git
+  
+        # Assigns the original repository to a remote called "upstream"
+  
+
+  
+For further details about commit message guidelines please visit:
+  
+- [codeinthehole.com](https://codeinthehole.com/tips/a-useful-template-for-commit-messages/)
+  
+- [chris.beams.io](https://chris.beams.io/posts/git-commit/)
+  
+- [help.github.com](https://help.github.com/articles/closing-issues-using-keywords/)
+  
+
+  
+#### Update your `master` branch
+  
+
+  
+1. Make sure you have your `master` branch checked out.
+  
+
+  
+        $ git checkout master
+  
+
+  
+2. Pull the changes from the `upstream/master` branch.
+  
+
+  
+        $ git pull --ff-only upstream master
+  
+        # gets changes from "master" branch on the "upstream" remote
+  
+
+  
+ * Note: If this gives you an error, it means you have committed directly to your local `master` branch. [Click here for instructions on how to fix this issue](#why-does-git-pull---ff-only-result-in-an-error).
+  
+
+  
+#### Make your changes
+  
+
+  
+0. Update your `master` branch, if you haven't already.
+  
+
+  
+1. For each new feature or bug fix, create a new branch.
+  
+
+  
+        $ git branch new_feature
+  
+        # Creates a new branch called "new_feature"
+  
+        $ git checkout new_feature
+  
+        # Makes "new_feature" the active branch
+  
+
+  
+2. Once you've committed some changes locally, you need to push them to your fork here on GitHub.
+  
+
+  
+        $ git push origin new_feature
+  
+        # origin was automatically set to point to your fork when you cloned it
+  
+
+  
+
+  
+3. Once you're finished working on your branch, and have committed and pushed all your changes, submit a pull request from your `new_feature` branch to this repository's `master` branch.
+  
+
+  
+ * Note: any new commits to the `new_feature` branch on GitHub will automatically be included in the pull request, so make sure to only commit related changes to the same branch.
+  
+
+  
+## Pull Request Notes
+  
+If you file a PR but you're still working on it, please add a [WIP] before the title text. This will tell the reviewers that you still intend to add more to the PR and we don't need to review it yet. When it's ready to be reviewed by a merger just edit the title text to remove the [WIP].
+  
+
+  
+If you are also looking for suggestions then mark it with [CR] — "comments requested". You can use both [WIP] and [CR] to indicated that you need opinion/code review/suggestions to continue working (e.g. "[WIP] [CR] Super awesome big feature"). Feel free to remove [CR] when you feel you got enough information to proceed.
+  
+
+  
+This can help speed up our review process by allowing us to only review the things that are ready for it, and will prevent anything that isn't completely ready from being merged in.
+  
+
+  
+### All PRs should have a "Summary" line
+  
+Summary is a one-line description of your change that will be extracted and added to the project changelog at https://github.com/CleverRaven/Cataclysm-DDA/blob/master/data/changelog.txt
+  
+
+  
+The format is: ```SUMMARY: Category "description"```
+  
+
+  
+The categories to choose from are: Features, Content, Interface, Mods, Balance, Bugfixes, Performance, Infrastructure, Build, I18N.
+  
+
+  
+Example: ```SUMMARY: Content "Adds new mutation category 'Mouse'"```
+  
+Or, if you want it treated as a minor tweak that doesn't appear in the changelog:
+  
+```SUMMARY: None```
+  
+
+  
+See the Changelog Guidelines at https://github.com/CleverRaven/Cataclysm-DDA/blob/master/doc/CHANGELOG_GUIDELINES.md for explanations of the categories.
+  
+
+  
+### Closing issues using keywords
+  
+
+  
+One more thing: when marking your PR as closing, fixing, or resolving issues, please include "XXXX #???" somewhere in the description, where XXX is on this list:
+  
+* close
+  
+* closes
+  
+* closed
+  
+* fix
+  
+* fixes
+  
+* fixed
+  
+* resolve
+  
+* resolves
+  
+* resolved
+  
+
+  
+The "???" is the issue number. This automatically closes the issue when the PR is pulled in, and allows merges to work slightly faster. To close multiple issues format it as "XXXX #???, XXXX#???".
+  
+
+  
+See https://help.github.com/articles/closing-issues-using-keywords/ for more.
+  
+
+  
+## Tooling support
+  
+
+  
+Various tools are available to help you keep your contributions conforming to the appropriate style.  See [the relevant docs](../doc/DEVELOPER_TOOLING.md) for more details.
+  
+
+  
+## Advanced Techniques
+  
+
+  
+These guidelines aren't essential, but they can make keeping things in order much easier.
+  
+
+  
+#### Using remote tracking branches
+  
+
+  
+Remote tracking branches allow you to easily stay in touch with this repository's `master` branch, as they automatically know which remote branch to get changes from.
+  
+
+  
+    $ git branch -vv
+  
+    * master      xxxx [origin/master] ....
+  
+      new_feature xxxx ....
+  
+
+  
+Here you can see we have two branches; `master` which is tracking `origin/master`, and `new_feature` which isn't tracking any branch. In practice, what this means is that git won't know where to get changes from.
+  
+
+  
+    $ git checkout new_feature
+  
+    Switched to branch 'new_feature'
+  
+    $ git pull
+  
+    There is no tracking information for the current branch.
+  
+    Please specify which branch you want to merge with.
+  
+
+  
+In order to easily pull changes from `upstream/master` into the `new_feature` branch, we can tell git which branch it should track. (You can even do this for your local master branch.)
+  
+
+  
+    $ git branch -u upstream/master new_feature
+  
+    Branch new_feature set up to track remote branch master from upstream.
+  
+    $ git pull
+  
+    Updating xxxx..xxxx
+  
+    ....
+  
+
+  
+You can also set the tracking information at the same time as creating the branch.
+  
+
+  
+    $ git branch new_feature_2 --track upstream/master
+  
+    Branch new_feature_2 set up to track remote branch master from upstream.
+  
+
+  
+ * Note: Although this makes it easier to pull from `upstream/master`, it doesn't change anything with regards to pushing. `git push` fails because you don't have permission to push to `upstream/master`.
+  
+
+  
+        $ git push
+  
+        error: The requested URL returned error: 403 while accessing https://github.com/CleverRaven/Cataclysm-DDA.git
+  
+        fatal: HTTP request failed
+  
+        $ git push origin
+  
+        ....
+  
+        To https://github.com/YOUR_USERNAME/Cataclysm-DDA.git
+  
+        xxxx..xxxx  new_feature -> new_feature
+  
+
+  
+## Unit tests
+  
+
+  
+There is a suite of tests built into the source tree at tests/  
+  
+You should run the test suite after ANY change to the game source.  
+  
+An ordinary invocation of ``make`` will build the test executable at tests/cata_test, and it can be invoked like any ordinary executable.  
+  
+With no arguments it will run the entire test suite.  
+  
+With ``--help`` it will print a number of invocation options you can use to adjust its operation.
+  
+
+  
+    $ make
+  
+    ... compilation details ...
+  
+    $ tests/cata_test
+  
+    Starting the actual test at Fri Nov  9 04:37:03 2018
+  
+    ===============================================================================
+  
+    All tests passed (1324684 assertions in 94 test cases)
+  
+    Ended test at Fri Nov  9 04:37:45 2018
+  
+    The test took 41.772 seconds
+  
+
+  
+I recommend habitually invoking make like ``make YOUR BUILD OPTIONS && tests/cata_test``.
+  
+
+  
+## In-game testing, test environment and the debug menu
+  
+
+  
+Whether you are implementing a new feature or whether you are fixing a bug, it is always a good practice to test your changes in-game. It can be a hard task to create the exact conditions by playing a normal game to be able to test your changes, which is why there is a debug menu. There is no default key to bring up the menu so you will need to assign one first.
+  
+
+  
+Bring up the keybindings menu (press `Escape` then `1`), scroll down almost to the bottom and press `+` to add a new key binding. Press the letter that corresponds to the *Debug menu* item, then press the key you want to use to bring up the debug menu. To test your changes, create a new world with a new character. Once you are in that world, press the key you just assigned for the debug menu and you should see something like this:
+  
+
+  
+```
+  
+┌────────────────────────────────────────────┐
+  
+│ Debug Functions - Using these is CHEATING! │
+  
+├────────────────────────────────────────────┤
+  
+│ 1 Wish for an item                         │
+  
+│ 2 Teleport - Short Range                   │
+  
+│ 3 Teleport - Long Range                    │
+  
+│ 4 Reveal map                               │
+  
+│ 5 Spawn NPC                                │
+  
+│ 6 Spawn Monster                            │
+  
+│ 7 Check game state...                      │
+  
+│ 8 Kill NPCs                                │
+  
+│ 9 Mutate                                   │
+  
+│ 0 Spawn a vehicle                          │
+  
+│ a Change all skills                        │
+  
+│ b Learn all melee styles                   │
+  
+│ c Unlock all recipes                       │
+  
+│ d Edit player/NPC                          │
+  
+│ e Spawn Artifact                           │
+  
+│ f Spawn Clairvoyance Artifact              │
+  
+│ g Map editor                               │
+  
+│ h Change weather                           │
+  
+│ i Remove all monsters                      │
+  
+│ j Display hordes                           │
+  
+│ k Test Item Group                          │
+  
+│ l Damage Self                              │
+  
+│ m Show Sound Clustering                    │
+  
+│ n Lua Command                              │
+  
+│ o Display weather                          │
+  
+│ p Change time                              │
+  
+│ q Set automove route                       │
+  
+│ r Show mutation category levels            │
+  
+│ s Cancel                                   │
+  
+└────────────────────────────────────────────┘
+  
+```
+  
+
+  
+With these commands, you should be able to recreate the proper conditions to test your changes. You can find some more information about the debug menu on [the official wiki](http://cddawiki.chezzo.com/cdda_wiki/index.php).
+  
+
+  
+## Frequently Asked Questions
+  
+
+  
+#### Why does `git pull --ff-only` result in an error?
+  
+
+  
+If `git pull --ff-only` shows an error, it means that you've committed directly to your local `master` branch. To fix this, we create a new branch with these commits, find the point at which we diverged from `upstream/master`, and then reset `master` to that point.
+  
+
+  
+    $ git pull --ff-only upstream master
+  
+    From https://github.com/CleverRaven/Cataclysm-DDA
+  
+     * branch            master     -> FETCH_HEAD
+  
+    fatal: Not possible to fast-forward, aborting.
+  
+    $ git branch new_branch master          # mark the current commit with a tmp branch
+  
+    $ git merge-base master upstream/master
+  
+    cc31d0... # the last commit before we committed directly to master
+  
+    $ git reset --hard cc31d0....
+  
+    HEAD is now at cc31d0... ...
+  
+
+  
+Now that `master` has been cleaned up, we can easily pull from `upstream/master`, and then continue working on `new_branch`.
+  
+
+  
+    $ git pull --ff-only upstream master
+  
+    # gets changes from the "upstream" remote for the matching branch, in this case "master"
+  
+    $ git checkout new_branch
diff --git a/.github/ISSUE_TEMPLATE.md b/.github/ISSUE_TEMPLATE.md
@@ -0,0 +1,13 @@
+  
+Game version:
+  
+
+  
+Operating system:
+  
+
+  
+Tiles or curses:
+  
+
+  
+Mods active:
+  
+
+  
+### Expected behavior
+  
+
+  
+### Actual behavior
+  
+
+  
+### Steps to reproduce the behavior
diff --git a/.github/ISSUE_TEMPLATE/bug_report.md b/.github/ISSUE_TEMPLATE/bug_report.md
@@ -0,0 +1,58 @@
+  
+---
+  
+name: Bug report
+  
+about: Create a report to help us improve
+  
+
+  
+---
+  
+<!-- Please follow the template below -->
+  
+
+  
+# Describe the bug
+  
+
+  
+A clear and concise description of what the bug is.
+  
+
+  
+
+  
+# Steps To Reproduce
+  
+
+  
+Steps to reproduce the behavior:
+  
+1. Make a player with a gun, magazine, and some ammo.
+  
+2. Try to aim at a wall.
+  
+3. There's no way to increase aim level.
+  
+
+  
+
+  
+# Expected behavior
+  
+
+  
+A clear and concise description of what you expected to happen.
+  
+Ideally also describe *why* you expect it to happen.
+  
+
+  
+
+  
+# Screenshots
+  
+
+  
+**If applicable**, add screenshots to help explain your problem.
+  
+
+  
+<!-- Do not take a screenshot of the crashing window. Please provide the crash logs in the "Additional context" -->
+  
+
+  
+# Versions and configuration
+  
+
+  
+<!-- Please complete the following information; you can now go to:
+  
+    - "Main menu (ESC) > Debug Menu > Info > Generate game report" to generate this report.
+  
+    - Please update your OS version with a more precise version. -->
+  
+
+  
+ - OS: [e.g. iOS 8 or Windows 10 or Ubuntu 18.04]
+  
+ - Game Version: [from the main menu, e.g. 0.C-29938-g90f5268437]
+  
+ - Graphics version: [Tiles or Terminal]
+  
+ - Mods loaded: [e.g.dda, boats, hacktheplanet, StatsThroughSkills]
+  
+
+  
+
+  
+# Additional context
+  
+
+  
+Add any other context about the problem here.
+  
+
+  
+<!-- Crash: if your problem refers to a crash, please add the following files to the "Additional Context" paragraph:
+  
+    - From the /config folder (you can zip them both together):
+  
+        - crash.log file.
+  
+        - debug.log file.
+  
+    - Your save file (zipped)
+  
+
+  
+- note #1: you can drag and drop files in this issue post!
+  
+- note #2: it is very important for us that you provide a save file in case of a crash. It really helps the developers
+  
+    to reproduce the bug and fix it. If possible, try to provide a save file that occurs in the right conditions, just
+  
+    before the crash happens. -->
diff --git a/.github/ISSUE_TEMPLATE/feature_request.md b/.github/ISSUE_TEMPLATE/feature_request.md
@@ -0,0 +1,17 @@
+  
+---
+  
+name: Feature request
+  
+about: Suggest an idea for this project
+  
+
+  
+---
+  
+
+  
+**Is your feature request related to a problem? Please describe.**  
+  
+A clear and concise description of what the problem is. Ex. I'm always frustrated when [...]
+  
+
+  
+**Describe the solution you'd like**  
+  
+A clear and concise description of what you want to happen.
+  
+
+  
+**Describe alternatives you've considered**  
+  
+A clear and concise description of any alternative solutions or features you've considered.
+  
+
+  
+**Additional context**  
+  
+Add any other context (such as mock-ups, proof of concepts or screenshots) about the feature request here.
diff --git a/.github/pull_request_template.md b/.github/pull_request_template.md
@@ -0,0 +1,54 @@
+  
+<!--
+  
+### How to use
+  
+Leave the headings unless they don't apply to your PR, replace commented out text (surrounded with <!–– and ––>) with text describing your PR.
+  
+-->
+  
+
+  
+#### Summary
+  
+<!--
+  
+A one-line description of your change that will be extracted and added to the [project changelog](https://github.com/CleverRaven/Cataclysm-DDA/blob/master/data/changelog.txt).
+  
+
+  
+The format is (ignore the square brackets): ```SUMMARY: [Category] "[description]"```
+  
+
+  
+The categories to choose from are:
+  
+
+  
+* Features
+  
+* Content
+  
+* Interface
+  
+* Mods
+  
+* Balance
+  
+* Bugfixes
+  
+* Performance
+  
+* Infrastructure
+  
+* Build
+  
+* I18N
+  
+
+  
+Example: ```SUMMARY: Content "Adds new mutation category 'Mouse'"```
+  
+
+  
+See the [Changelog Guidelines](https://github.com/CleverRaven/Cataclysm-DDA/blob/master/doc/CHANGELOG_GUIDELINES.md) for explanations of the categories.
+  
+-->
+  
+
+  
+#### Purpose of change
+  
+<!--
+  
+If there's an existing issue describing the problem this PR addresses or the feature it adds, please link it like: ```#1234```
+  
+If it *fully* resolves an issue, link it like: ```Fixes #1234```
+  
+Even if the issue describes the problem, please provide a few-sentence summary here.
+  
+Example: ```Fixes #1234 - XL mutants cannot wear arm/leg splints due to missing OVERSIZE flag.```
+  
+If there is no related issue, please describe the issue you are addressing, including how to trigger a bug if this is a bugfix.
+  
+Don't put the backticks around the `#` and issue or pull request number to allow the GitHub automatically reference to it.
+  
+-->
+  
+
+  
+#### Describe the solution
+  
+<!--
+  
+How does the feature work, or how does this fix a bug?
+  
+The easier you make your solution to understand, the faster it can get merged.
+  
+-->
+  
+
+  
+#### Describe alternatives you've considered
+  
+<!--
+  
+A clear and concise description of any alternative solutions or features you've considered.
+  
+-->
+  
+
+  
+#### Additional context
+  
+<!--
+  
+Add any other context (such as mock-ups, proof of concepts or screenshots) about the feature or bugfix here.
+  
+-->
diff --git a/.gitignore b/.gitignore
@@ -1,34 +1,178 @@
+  
+!src/chkjson
+  
+*.7z
+  
+*.a
+  
+*.d
+  
+*.dll
+  
+*.exe
+  
+*.o
+  
+*.tmp
+  
+*.zip
+  
+/WinDepend/
+  
+/bindist/
+  
+/build/
+  
+/build-start-time
+  
+/cmake-build-debug/
+  
+/config/
+  
+/data/*.template
+  
+/data/font/
+  
+/data/mods/user-default-mods.json
+  
+/dep/
+  
+/doxygen_doc/html/*
+  
+/doxygen_doc/latex/*
+  
+/graveyard/
+  
+/memorial/
+  
+/mods/
+  
+/obj/
+  
+/objwin/
+  
+/save/
+  
+/src/version.h
+  
+/sound/
+  
+/templates/
+  
+/tools/format/json_formatter.cgi
+  
+CataclysmWin.cscope_file_list
+  
+CataclysmWin.depend
+  
+CataclysmWin.layout
+  
+cata_test
+  
+cata_test-tiles
 cataclysm
 cataclysm-tiles
-  
-data/*.template
-  
-save/
-  
-obj/
+  
+cataclysm-vcpkg
+  
+cataclysmdda-*
+  
+chkjson*
 debug.log
 logg.txt
-  
-bindist/
-  
-cataclysmdda-*
-  
-objwin/
-  
-cataclysm.exe
-  
-version.h
-  
-Cataclysm.exe
-  
-CataclysmWin.depend
-  
-CataclysmWin.layout
 # Visual Studio files
+  
+*.code-workspace
+  
+*.ilk
+  
+*.opensdf
+  
+*.pdb
+  
+*.lib
+  
+*.sdf
 *.suo
 *.user
-  
-Cataclysm.sdf
-  
-Release*/
+  
+*.vcxproj.filters
+  
+.vs/
+  
+.vscode/
 Debug*/
-  
-*.opensdf
+  
+Release*/
+  
+
+  
+# Distribution script results
+  
+/msvc-full-features/distribution
+  
+
+  
+# Visual Studio 2015
+  
+/msvc-full-features/*db
+  
+/msvc-full-features/ipch
+  
+lnk*.tmp
+  
+Cataclysm.exe.lastcodeanalysissucceeded
+  
+
+  
+#Visual Studio 2017
+  
+/msvc-full-features/PredictedInputCache_Debug_x64.dat
+  
+
+  
+# PVS Studio
+  
+/msvc-full-features/*PVS-Studio*
 # Temporary and backup files
-  
-*~
-  
-\#*
 *.bak
 *.cbTemp
+  
+*.sw?
+  
+*~
+  
+\#*
 gmon.out
 # System Files
-  
-Thumbs.db
 .DS_Store
+  
+._.DS_Store
+  
+Thumbs.db
+  
+cscope.*
+  
+tags
+  
+
+  
+# Compiled binary translations
+  
+/lang/mo/
+  
+
+  
+# Directory for translatable strings
+  
+/lang/json/*
+  
+!/lang/json/README
+  
+
+  
+# Netbeans IDE folders
+  
+nbproject/
+  
+
+  
+# Python runtime files
+  
+*.pyc
+  
+
+  
+# vim files
+  
+*.vim
+  
+*.session
+  
+.ycm_extra_conf.py
+  
+
+  
+# taskwarrior files
+  
+*.task*
+  
+
+  
+# GitEye files
+  
+*.project
+  
+
+  
+# vimdiff backup
+  
+*.orig
+  
+
+  
+# OSX
+  
+Cataclysm.app
+  
+data/osx/AppIcon.icns
+  
+Cataclysm.dmg
+  
+
+  
+# Jetbrains CLion
+  
+.idea/
+  
+
+  
+# test executables and generated data
+  
+/tests/cata_test
+  
+/tests/line_test
+  
+/tests/map_iterator_test
+  
+/tests/shadowcasting_test
+  
+/tests/data/jsionized_overmap.sav
+  
+
+  
+# static library used to link the test executable
+  
+cataclysm.a
+  
+
+  
+# coredumps
+  
+*.core
+  
+
+  
+# sublime-text workspace
+  
+*.sublime-workspace
+  
+
+  
+# cppcheck
+  
+*cppcheck.xml
+  
+*.cppcheck
+  
+
+  
+# clang tooling
+  
+compile_commands.json
+  
+
+  
+# IDA database
+  
+Cataclysm.i64
+  
+Cataclysm.id*
+  
+Cataclysm.til
+  
+Cataclysm.nam
+  
+
+  
+# Transifex Client
+  
+.tx/
+  
+
+  
+# Snapcraft build directories
+  
+prime
+  
+snap
+  
+stage
+  
+
+  
+# Snapcraft build file
+  
+*.snap
+  
+
+  
+# Eclipse IDE
+  
+.cproject
+  
+.settings/
+  
+
+  
+# Apple Xcode IDE
+  
+Xcode/
+  
+
+  
+# gdb
+  
+.gdb_history
+  
+
+  
+# Flatpak build artifacts
+  
+/.flatpak-builder/
+  
+/repo/
+  
+/build-dir/
diff --git a/.gitmessage b/.gitmessage
@@ -0,0 +1,8 @@
+  
+# If this commit is applied, it will ....
+  
+# |<-- Using around 50, Maximum 72 Characters -->|
+  
+
+  
+# Explain why this change is being made
+  
+# |<----      Limit Each Line to a Maximum Of 72 Characters       ---->|
+  
+
+  
+# Provide links or keys to any relevant tickets, articles or other resources
+  
+# Example: fixes #1234, closes #2345, resolves #3456, references #4567
diff --git a/.travis.yml b/.travis.yml
@@ -1,11 +1,208 @@
-  
-language: cpp
-  
-compiler:
-  
-  - gcc
+  
+# this file is HEAVILY influenced by https://github.com/boostorg/hana/blob/master/.travis.yml
-  
-script: make
+  
+dist: xenial
+  
+language: c++
+  
+
+  
+cache: ccache
 notifications:
-  
-  irc: "irc.newnet.net#Cataclysm-DDA"
+  
+  email: false
  irc: "irc.freenode.org#Cataclysm-DDA"
  use_notice: true
  skip_join: true
+  
+
+  
+git:
+  
+  depth: 5
+  
+
+  
+addons:
+  
+  # these apt sources will be referenced later (by using *name)
+  
+  apt:
+  
+    sources: &apt_sources
+  
+      - ubuntu-toolchain-r-test
+  
+    config:
+  
+      retries: true
+  
+
+  
+compiler: gcc
+  
+os: linux
+  
+
+  
+# We have branch builds disabled globally to prevent double-builds of PRs.
+  
+# This re-enables just the master branch.
+  
+branches:
+  
+  only:
+  
+  - master
+  
+  - development
+  
+
+  
+# Overall strategy for what sorts of builds to include:
+  
+# We want a build for each compiler and each platform.
+  
+# For PRs, we lessen the "each compiler" requirement to just covering the newest
+  
+# and oldest relevant version of each compiler.
+  
+# We also want to ensure that each of the following tweaks are covered in at
+  
+# least one PR build:
+  
+# - TILES=1
+  
+# - SOUND=1
+  
+# - RELEASE=1
+  
+# - CMAKE=1
+  
+# - SANITIZE=address
+  
+# - LOCALIZE=0
+  
+# - A clang-tidy run
+  
+# We try to minimize the number of builds subject to those constraints.
+  
+
+  
+# To see what toolchains are available, consult the following:
+  
+# https://github.com/travis-ci/apt-source-safelist/blob/master/ubuntu.json
+  
+# https://launchpad.net/%7Eubuntu-toolchain-r/+archive/ubuntu/test/+index
+  
+
+  
+jobs:
+  
+  include:
+  
+    # Initial test stage, if this fails everything else is cancelled.
+  
+    - stage: Test
+  
+      # Clang is consistently the fastest to build, so use it for the initial test.
+  
+      env: CLANG=clang++-3.8 MODS=--mods=RL_Classes TEST_STAGE=1 CXXFLAGS='-Wno-error=unused-command-line-argument -D__extern_always_inline="extern __always_inline"'
+  
+      name: "Clang 3.8 Make build with curses, style check and RL_Classes test"
+  
+      compiler: clang
+  
+      addons: &clang38
+  
+        apt:
+  
+          packages: ["clang-3.8", "g++-multilib", "libc6-dbg", "libc6-dbg:i386", "g++-6"]
+  
+          sources: *apt_sources
+  
+
+  
+    # Then build different configurations and targets in parallel.
+  
+    - stage: "Main Compilers"
+  
+      env: COMPILER=g++ LOCALIZE=0
+  
+      name: "GCC 5.3 Make build with curses and no Localization"
+  
+      compiler: gcc
+  
+      addons: &gcc53
+  
+        apt:
+  
+          packages: ["g++-5=5.3.1-14ubuntu2", "libstdc++-5-dev=5.3.1-14ubuntu2", "gcc-5=5.3.1-14ubuntu2", "gcc-5-base=5.3.1-14ubuntu2", "cpp-5=5.3.1-14ubuntu2", "libgcc-5-dev=5.3.1-14ubuntu2", "libasan2=5.3.1-14ubuntu2", "libmpx0=5.3.1-14ubuntu2"]
+  
+          sources: [*apt_sources]
+  
+
+  
+    - env: COMPILER=g++-8 CXXFLAGS='-Wno-implicit-fallthrough' TILES=1 SOUND=1 SANITIZE=address
+  
+      name: "GCC 8 Make build with Tiles, Sound and address sanitization"
+  
+      compiler: gcc
+  
+      addons: &gcc8
+  
+        apt:
+  
+          packages: ["g++-8",   "g++-8-multilib",   "libc6-dbg", "libc6-dbg:i386", "libsdl2-dev", "libsdl2-ttf-dev", "libsdl2-image-dev", "libsdl2-mixer-dev"]
+  
+          sources: *apt_sources
+  
+
+  
+    - env: CLANG=clang++-8 SANITIZE=address EXTRA_TEST_OPTS="~[.] ~vehicle_efficiency ~vehicle_drag ~starting_items"
+  
+      name: "Clang 8 Make build with address sanitization, but long-running tests disabled"
+  
+      compiler: clang
+  
+      addons: &clang8
+  
+        apt:
+  
+          packages: ["clang-8", "libc6-dbg", "libc6-dbg:i386"]
+  
+          sources: [*apt_sources, llvm-toolchain-xenial-8]
+  
+
+  
+    - stage: "Platforms and Tidy"
+  
+    # MXE variant using alternate repository http://mirror.mxe.cc/repos/apt
+  
+      env: COMPILER='g++' LDFLAGS='-static-libgcc -static-libstdc++' MXE_TARGET='i686-w64-mingw32.static' WINE='wine' TILES=1 SOUND=1
+  
+      name: "Mingw-w64 Make cross-compile to Windows with Tiles and Sound"
+  
+      compiler: gcc
+  
+      addons: &gcc
+  
+        apt:
+  
+          packages: ["wine"]
+  
+
+  
+    - env: CLANG=clang++ NATIVE=osx OSX_MIN=10.13 TILES=1 SOUND=1
+  
+      name: "Xcode 10.1 Make build with Tiles and sound (macOS)"
+  
+      os: osx
+  
+      osx_image: xcode10.1
+  
+      compiler: clang
+  
+
+  
+    - env: CLANG=clang++-8 TILES=1 SOUND=1 CXXFLAGS=-Wno-unused-command-line-argument CMAKE=1 CATA_CLANG_TIDY=plugin
+  
+      name: "Clang-tidy CMake build with Tiles and Sound"
+  
+      compiler: clang
+  
+      addons: &clang8
+  
+        apt:
+  
+          packages: ["clang-8", "libclang-8-dev", "llvm-8-dev", "llvm-8-tools", "libsdl2-dev", "libsdl2-ttf-dev", "libsdl2-image-dev", "libsdl2-mixer-dev"]
+  
+          sources: [*apt_sources, llvm-toolchain-xenial-8]
+  
+
+  
+    # Finally check the compiler variants
+  
+    - stage: compilers
+  
+      # GCC 5.4 is default on Xenial
+  
+      env: COMPILER=g++
+  
+      name: "GCC 5.4 Make build with Curses"
+  
+      if: type != pull_request
+  
+
+  
+    - env: COMPILER=g++-6 CODE_COVERAGE=true
+  
+      name: "GCC 6 Make build with Curses and Code Coverage"
+  
+      if: type != pull_request
+  
+      compiler: gcc
+  
+      addons: &gcc6
+  
+        apt:
+  
+          packages: ["g++-6",   "g++-6-multilib",   "libc6-dbg", "libc6-dbg:i386"]
+  
+          sources: *apt_sources
+  
+
+  
+    - env: COMPILER=g++-7 CXXFLAGS='-Wno-implicit-fallthrough -D_GLIBCXX_DEBUG'
+  
+      name: "GCC 7 Make build with Curses and GLIBCXX_DEBUG"
+  
+      if: type != pull_request
+  
+      compiler: gcc
+  
+      addons: &gcc7
+  
+        apt:
+  
+          packages: ["g++-7",   "g++-7-multilib",   "libc6-dbg", "libc6-dbg:i386", "lcov"]
+  
+          sources: *apt_sources
+  
+
+  
+    - env: COMPILER='g++' LDFLAGS='-static-libgcc -static-libstdc++' MXE_TARGET='i686-w64-mingw32.static' WINE='wine'
+  
+      name: "Mingw-w64 Make build with Curses"
+  
+      if: type != pull_request
+  
+      addons: &gcc
+  
+        apt:
+  
+          packages: ["wine"]
+  
+
+  
+    - env: CLANG=clang++-3.9 CXXFLAGS='-Wno-error=unused-command-line-argument -D__extern_always_inline="extern __always_inline"'
+  
+      name: "Clang 3.9 Make build with Curses"
+  
+      if: type != pull_request
+  
+      compiler: clang
+  
+      addons: &clang39
+  
+        apt:
+  
+          packages: ["clang-3.9", "g++-multilib", "libc6-dbg", "libc6-dbg:i386", "g++-6"]
+  
+          sources: *apt_sources
+  
+
+  
+    - env: CLANG=clang++-4.0 CXXFLAGS=-Wno-error=unused-command-line-argument
+  
+      name: "Clang 4 Make build with Curses"
+  
+      if: type != pull_request
+  
+      compiler: clang
+  
+      addons: &clang40
+  
+        apt:
+  
+          packages: ["clang-4.0", "g++-multilib", "libc6-dbg", "libc6-dbg:i386", "g++-6"]
+  
+          # Luckily the Trusty install Just Works on Xenial
+  
+          sources: [*apt_sources, llvm-toolchain-trusty-4.0]
+  
+
+  
+    # Clang 5.0 (still on Trusty, because I could find no readily available
+  
+    # source on Xenial at time of writing)
+  
+    - env: CLANG=clang++-5.0 CXXFLAGS=-Wno-error=unused-command-line-argument
+  
+      name: "Clang 5 Make build with Curses"
+  
+      if: type != pull_request
+  
+      dist: trusty
+  
+      compiler: clang
+  
+      addons: &clang50
+  
+        apt:
+  
+          packages: ["clang-5.0", "g++-multilib", "libc6-dbg", "libc6-dbg:i386", "g++-6"]
+  
+          sources: [*apt_sources, llvm-toolchain-trusty-5.0]
+  
+
+  
+    - env: CLANG=clang++-6.0 TILES=1 SOUND=1 CXXFLAGS=-Wno-error=unused-command-line-argument CMAKE=1 RELEASE=1
+  
+      name: "Clang 6 CMake build with tiles and sound"
+  
+      if: type != pull_request
+  
+      compiler: clang
+  
+      addons: &clang60
+  
+        apt:
+  
+          packages: ["clang-6.0", "g++-multilib", "libc6-dbg", "g++-6", "libsdl2-dev", "libsdl2-ttf-dev", "libsdl2-image-dev", "libsdl2-mixer-dev"]
+  
+          sources: [*apt_sources, llvm-toolchain-xenial-6.0]
+  
+
+  
+    - env: CLANG=clang++-7
+  
+      name: "Clang 7 Make build with Curses"
+  
+      if: type != pull_request
+  
+      compiler: clang
+  
+      addons: &clang7
+  
+        apt:
+  
+          packages: ["clang-7", "libc6-dbg", "libc6-dbg:i386"]
+  
+          sources: [*apt_sources, llvm-toolchain-xenial-7]
+  
+
+  
+before_script:
+  
+  - if [ -n "${CLANG}" ]; then COMPILER="$CLANG"; fi
+  
+  - ${COMPILER} --version
+  
+  - CXX="$COMPILER"
+  
+  - source build-scripts/requirements.sh
+  
+
+  
+script:
+  
+  - build-scripts/build.sh
+  
+
+  
+after_success:
+  
+  - if [ -n "${CODE_COVERAGE}" ]; then coveralls -b . -i src -e tests --gcov /usr/bin/gcov-6; fi
+  
+  - if [ -n "${CODE_COVERAGE}" ]; then bash <(curl -s https://codecov.io/bash); fi
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -0,0 +1,370 @@
+  
+# Main project build script
+  
+cmake_minimum_required(VERSION 3.0.0)
+  
+
+  
+PROJECT(CataclysmDDA)
+  
+
+  
+SET(CMAKE_MODULE_PATH
+  
+    ${CMAKE_MODULE_PATH}
+  
+    ${CMAKE_SOURCE_DIR}/CMakeModules
+  
+)
+  
+
+  
+SET(CMAKE_TLS_VERIFY ON)
+  
+
+  
+# Build options
+  
+option(TILES        "Build graphical tileset version."						"OFF")
+  
+option(CURSES       "Build curses version."							"ON" )
+  
+option(SOUND        "Support for in-game sounds & music."					"OFF")
+  
+option(BACKTRACE    "Support for printing stack backtraces on crash"			"ON" )
+  
+option(USE_HOME_DIR "Use user's home directory for save files."					"ON" )
+  
+option(LOCALIZE     "Support for language localizations. Also enable UTF support."		"ON" )
+  
+option(LANGUAGES    "Compile localization files for specified languages."			""   )
+  
+option(DYNAMIC_LINKING "Use dynamic linking. Or use static to remove MinGW dependency instead."	"ON")
+  
+option(CATA_CLANG_TIDY_PLUGIN "Build Cata's custom clang-tidy plugin" "OFF")
+  
+set(CATA_CLANG_TIDY_INCLUDE_DIR "" CACHE STRING "Path to internal clang-tidy headers required for plugin (e.g. ClangTidy.h)")
+  
+set(CATA_CHECK_CLANG_TIDY "" CACHE STRING "Path to check_clang_tidy.py for plugin tests")
+  
+set(GIT_BINARY       "" CACHE STRING "Git binary name or path.")
+  
+set(PREFIX           "" CACHE STRING "Location of Data & GFX directories")
+  
+
+  
+include(CTest)
+  
+
+  
+include(GetGitRevisionDescription)
+  
+git_describe(GIT_VERSION)
+  
+
+  
+MESSAGE("\n * Cataclysm: Dark Days Ahead is a roguelike set in a post-apocalyptic world.")
+  
+MESSAGE("   _________            __                   .__                                ")
+  
+MESSAGE("   \\_   ___ \\ _____   _/  |_ _____     ____  |  |   ___.__   ______  _____      ")
+  
+MESSAGE("   /    \\  \\/ \\__  \\  \\   __\\\\__  \\  _/ ___\\ |  |  <   |  | /  ___/ /     \\     ")
+  
+MESSAGE("   \\     \\____ / __ \\_ |  |   / __ \\_\\  \\___ |  |__ \\___  | \\___ \\ |  Y Y  \\    ")
+  
+MESSAGE("    \\______  /\(____  / |__|  \(____  / \\___  >|____/ / ____|/____  >|__|_|  /    ")
+  
+MESSAGE("           \\/      \\/             \\/      \\/        \\/          \\/       \\/     ")
+  
+MESSAGE("                               --= Dark Days Ahead =--")
+  
+MESSAGE("\n * https://cataclysmdda.org/\n")
+  
+
+  
+MESSAGE(STATUS "${PROJECT} build environment -- \n")
+  
+
+  
+MESSAGE(STATUS "Build realm is                : ${CMAKE_SYSTEM_NAME} ${CMAKE_HOST_SYSTEM_PROCESSOR}")
+  
+
+  
+IF(NOT CMAKE_BUILD_TYPE)
+  
+	set(CMAKE_BUILD_TYPE Debug)
+  
+ENDIF(NOT CMAKE_BUILD_TYPE)
+  
+
+  
+if (NOT ${GIT_VERSION} MATCHES GIT-NOTFOUND)
+  
+    string(REPLACE "-NOTFOUND" "" GIT_VERSION ${GIT_VERSION})
+  
+    FILE(WRITE ${CMAKE_SOURCE_DIR}/src/version.h "\#define VERSION \"${GIT_VERSION}\"\n")
+  
+    MESSAGE(STATUS "${PROJECT_NAME} build version is : ${GIT_VERSION}\n")
+  
+    ADD_DEFINITIONS(-DGIT_VERSION)
+  
+ELSE (NOT ${GIT_VERSION} MATCHES GIT-NOTFOUND)
+  
+    MESSAGE("")
+  
+ENDIF(NOT ${GIT_VERSION} MATCHES GIT-NOTFOUND)
+  
+
+  
+#OS Check Placeholders. Will be used for BINDIST
+  
+IF (${CMAKE_SYSTEM_NAME} MATCHES Linux)
+  
+	SET(_OS_LINUX_ 1)
+  
+ENDIF (${CMAKE_SYSTEM_NAME} MATCHES Linux)
+  
+
+  
+IF (${CMAKE_SYSTEM_NAME} MATCHES FreeBSD)
+  
+	SET(_OS_FREEBSD_ 1)
+  
+ENDIF (${CMAKE_SYSTEM_NAME} MATCHES FreeBSD)
+  
+
+  
+IF(${CMAKE_SYSTEM_NAME} MATCHES Darwin)
+  
+	SET(_OS_DARWIN_ 1)
+  
+	SET(LOCALIZE OFF)
+  
+	MESSAGE(STATUS "Disable internationalization on Darwin as it is not supported")
+  
+ENDIF(${CMAKE_SYSTEM_NAME} MATCHES Darwin)
+  
+
+  
+include(CheckCXXCompilerFlag)
+  
+
+  
+#FIXME: Add dest build choice: m32 for 32 bit or m64 for 64 bit version
+  
+#add_definitions("-m32")
+  
+#SET(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -m32")
+  
+#SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -m32")
+  
+#SET(CMAKE_SHARED_LIBRARY_C_FLAGS "${CMAKE_SHARED_LIBRARY_C_FLAGS} -m32")
+  
+#SET(CMAKE_SHARED_LIBRARY_CXX_FLAGS "${CMAKE_SHARED_LIBRARY_CXX_FLAGS} -m32")
+  
+
+  
+IF (NOT DYNAMIC_LINKING)
+  
+	SET(CMAKE_FIND_LIBRARY_SUFFIXES ".a;.dll.a")
+  
+	SET(BUILD_SHARED_LIBRARIES OFF)
+  
+	check_cxx_compiler_flag (-static HAVE_STATIC_FLAG)
+  
+	IF(HAVE_STATIC_FLAG)
+  
+		SET(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} -static")
+  
+	ENDIF(HAVE_STATIC_FLAG)
+  
+	# Workaround for cmake link library guesser
+  
+	SET(CMAKE_EXE_LINK_DYNAMIC_C_FLAGS)       # remove -Wl,-Bdynamic
+  
+	SET(CMAKE_EXE_LINK_DYNAMIC_CXX_FLAGS)
+  
+	SET(CMAKE_SHARED_LIBRARY_C_FLAGS)         # remove -fPIC
+  
+	SET(CMAKE_SHARED_LIBRARY_CXX_FLAGS)
+  
+	SET(CMAKE_SHARED_LIBRARY_LINK_C_FLAGS)    # remove -rdynamic
+  
+	SET(CMAKE_SHARED_LIBRARY_LINK_CXX_FLAGS)
+  
+ELSE (NOT DYNAMIC_LINKING)
+  
+	IF(MINGW AND NOT CMAKE_CXX_COMPILER_ID MATCHES "Clang")
+  
+		# Avoid depending on MinGW runtime DLLs
+  
+		SET(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} -static-libgcc -static-libstdc++")
+  
+	ENDIF(MINGW AND NOT CMAKE_CXX_COMPILER_ID MATCHES "Clang")
+  
+ENDIF (NOT DYNAMIC_LINKING)
+  
+
+  
+#Sysem specific actions
+  
+IF (${CMAKE_SYSTEM_NAME} MATCHES Linux OR ${CMAKE_SYSTEM_NAME} MATCHES FreeBSD)
+  
+    IF(NOT DATA_PREFIX)
+  
+        SET( DATA_PREFIX ${CMAKE_INSTALL_PREFIX}/share/cataclysm-dda)
+  
+    ENDIF(NOT DATA_PREFIX)
+  
+    IF(NOT LOCALE_DIR)
+  
+        SET( LOCALE_DIR ${CMAKE_INSTALL_PREFIX}/share/locale)
+  
+    ENDIF(NOT LOCALE_DIR)
+  
+    IF(NOT BIN_PREFIX)
+  
+        SET( BIN_PREFIX ${CMAKE_INSTALL_PREFIX}/bin)
+  
+    ENDIF(NOT BIN_PREFIX)
+  
+    IF(NOT DESKTOP_ENTRY_PATH)
+  
+        SET( DESKTOP_ENTRY_PATH ${CMAKE_INSTALL_PREFIX}/share/applications)
+  
+    ENDIF(NOT DESKTOP_ENTRY_PATH)
+  
+    IF(NOT PIXMAPS_ENTRY_PATH)
+  
+        SET( PIXMAPS_ENTRY_PATH ${CMAKE_INSTALL_PREFIX}/share/icons/hicolor)
+  
+    ENDIF(NOT PIXMAPS_ENTRY_PATH)
+  
+    IF(NOT PIXMAPS_UNITY_ENTRY_PATH)
+  
+        SET( PIXMAPS_UNITY_ENTRY_PATH ${CMAKE_INSTALL_PREFIX}/share/icons/ubuntu-mono-dark)
+  
+    ENDIF(NOT PIXMAPS_UNITY_ENTRY_PATH)
+  
+    IF(NOT MANPAGE_ENTRY_PATH)
+  
+        SET( MANPAGE_ENTRY_PATH ${CMAKE_INSTALL_PREFIX}/share/man)
+  
+    ENDIF(NOT MANPAGE_ENTRY_PATH)
+  
+ENDIF (${CMAKE_SYSTEM_NAME} MATCHES Linux OR ${CMAKE_SYSTEM_NAME} MATCHES FreeBSD)
+  
+
+  
+IF (${CMAKE_SYSTEM_NAME} MATCHES Windows)
+  
+    IF(NOT DATA_PREFIX)
+  
+        SET(DATA_PREFIX ${CMAKE_INSTALL_PREFIX})
+  
+    ENDIF(NOT DATA_PREFIX)
+  
+    IF(NOT LOCALE_DIR)
+  
+        SET(LOCALE_DIR ${CMAKE_INSTALL_PREFIX})
+  
+    ENDIF(NOT LOCALE_DIR)
+  
+    IF(NOT BIN_PREFIX)
+  
+        SET(BIN_PREFIX ${CMAKE_INSTALL_PREFIX})
+  
+    ENDIF(NOT BIN_PREFIX)
+  
+ENDIF (${CMAKE_SYSTEM_NAME} MATCHES Windows)
+  
+
+  
+
+  
+MESSAGE(STATUS "${PROJECT_NAME} build options --\n")
+  
+
+  
+# Preset variables
+  
+IF(NOT LANGUAGES)
+  
+	SET (LANGUAGES de es_AR es_ES fr it_IT ja ko pt_BR ru zh_CN zh_TW)
+  
+ENDIF(NOT LANGUAGES)
+  
+
+  
+IF (GIT_BINARY)
+  
+	SET(GIT_EXECUTABLE ${GIT_BINARY})
+  
+ELSE (GIT_BINARY)
+  
+	FIND_PACKAGE(Git)
+  
+	IF (NOT GIT_FOUND)
+  
+		MESSAGE(WARNING "Git binary not found. Build version will be set to NULL. Install Git package or use -DGIT_BINARY to set path to git binary.")
+  
+	ENDIF (NOT GIT_FOUND)
+  
+ENDIF (GIT_BINARY)
+  
+
+  
+IF (PREFIX)
+  
+	ADD_DEFINITIONS(-DPREFIX=${PREFIX})
+  
+ENDIF (PREFIX)
+  
+
+  
+# Can't compile curses and tiles build's at same time
+  
+IF(TILES)
+  
+    SET(CURSES OFF)
+  
+ENDIF(TILES)
+  
+
+  
+# Set build types and display info
+  
+IF(CMAKE_BUILD_TYPE STREQUAL Debug)
+  
+	MESSAGE("\n")
+  
+	MESSAGE(STATUS "Build ${PROJECT} in development mode --\n")
+  
+	MESSAGE(STATUS "Binaries will be located in: " ${CMAKE_SOURCE_DIR})
+  
+	SET(CMAKE_VERBOSE_MAKEFILE ON)
+  
+	# Since CataclusmDDA does not respect PREFIX for development builds
+  
+	# and has funny path handlers, we should create resulting Binaries
+  
+	# in the source redectory
+  
+	SET(CMAKE_RUNTIME_OUTPUT_DIRECTORY
+  
+		${CMAKE_SOURCE_DIR}
+  
+		CACHE PATH "Single Directory for all Executables."
+  
+	)
+  
+	SET(BIN_PREFIX ${CMAKE_SOURCE_DIR})
+  
+ELSE (CMAKE_BUILD_TYPE STREQUAL Debug)
+  
+	MESSAGE(STATUS "CMAKE_INSTALL_PREFIX          : ${CMAKE_INSTALL_PREFIX}")
+  
+	MESSAGE(STATUS "BIN_PREFIX                    : ${BIN_PREFIX}")
+  
+	MESSAGE(STATUS "DATA_PREFIX                   : ${DATA_PREFIX}")
+  
+    IF(LOCALIZE)
+  
+        MESSAGE(STATUS "LOCALE_PATH                   : ${LOCALE_DIR}")
+  
+    ENDIF(LOCALIZE)
+  
+	MESSAGE(STATUS "DESKTOP_ENTRY_PATH            : ${DESKTOP_ENTRY_PATH}")
+  
+	MESSAGE(STATUS "PIXMAPS_ENTRY_PATH            : ${PIXMAPS_ENTRY_PATH}")
+  
+	MESSAGE(STATUS "PIXMAPS_UNITY_ENTRY_PATH      : ${PIXMAPS_UNITY_ENTRY_PATH}")
+  
+	MESSAGE(STATUS "MANPAGE_ENTRY_PATH            : ${MANPAGE_ENTRY_PATH}\n")
+  
+	ADD_DEFINITIONS(-DRELEASE)
+  
+    # Use PREFIX as storage of data,gfx, etc.. Usefull only on *nix OS.
+  
+    IF (PREFIX AND NOT WIN32)
+  
+	    ADD_DEFINITIONS(-DDATA_DIR_PREFIX)
+  
+    ENDIF (PREFIX AND NOT WIN32)
+  
+ENDIF (CMAKE_BUILD_TYPE STREQUAL Debug)
+  
+
+  
+	MESSAGE(STATUS "GIT_BINARY                    : ${GIT_EXECUTABLE}")
+  
+	MESSAGE(STATUS "DYNAMIC_LINKING               : ${DYNAMIC_LINKING}")
+  
+	MESSAGE(STATUS "TILES                         : ${TILES}")
+  
+	MESSAGE(STATUS "CURSES                        : ${CURSES}")
+  
+	MESSAGE(STATUS "SOUND                         : ${SOUND}")
+  
+	MESSAGE(STATUS "BACKTRACE                     : ${BACKTRACE}")
+  
+	MESSAGE(STATUS "LOCALIZE                      : ${LOCALIZE}")
+  
+	MESSAGE(STATUS "USE_HOME_DIR                  : ${USE_HOME_DIR}\n")
+  
+
+  
+	MESSAGE(STATUS "LANGUAGES                     : ${LANGUAGES}\n")
+  
+
+  
+	MESSAGE(STATUS "See INSTALL file for details and more info --\n")
+  
+
+  
+IF(MSVC)
+  
+	if(CMAKE_SIZEOF_VOID_P EQUAL 8)
+  
+		add_definitions(-D_AMD64_)
+  
+	else()
+  
+		add_definitions(-D_X86_)
+  
+	endif()
+  
+ELSE()
+  
+	SET(CATA_WARNINGS
+  
+		"-Werror -Wall -Wextra \
+  
+		-Wmissing-declarations \
+  
+		-Wold-style-cast \
+  
+		-Woverloaded-virtual \
+  
+		-Wpedantic")
+  
+	# Compact the whitespace in the warning string
+  
+	string(REGEX REPLACE "[\t ]+" " " CATA_WARNINGS "${CATA_WARNINGS}")
+  
+	SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${CATA_WARNINGS} -std=c++14")
+  
+	SET(CMAKE_CXX_FLAGS_DEBUG "-Og -g")
+  
+ENDIF()
+  
+
+  
+# Force out-of-source build
+  
+IF(${CMAKE_SOURCE_DIR} STREQUAL ${CMAKE_BINARY_DIR})
+  
+	MESSAGE(FATAL_ERROR
+  
+		"This project requires an out of source build. Remove the file 'CMakeCache.txt' found in this directory before continuing, create a separate build directory and run 'cmake [options] <srcs>' from there.\nSee INSTALL file for details and more info\n"
+  
+	)
+  
+ENDIF(${CMAKE_SOURCE_DIR} STREQUAL ${CMAKE_BINARY_DIR})
+  
+
+  
+#SET(THREADS_USE_PTHREADS_WIN32 True)
+  
+SET(CMAKE_THREAD_PREFER_PTHREAD True)
+  
+FIND_PACKAGE(Threads REQUIRED)
+  
+
+  
+# Check for build types and libraries
+  
+IF(TILES)
+  
+	# Find SDL, SDL_ttf & SDL_image for graphical install
+  
+	MESSAGE(STATUS "Searching for SDL2 library --")
+  
+	FIND_PACKAGE(SDL2)
+  
+	IF(NOT SDL2_FOUND)
+  
+        	MESSAGE(FATAL_ERROR
+  
+            		"This project requires SDL2 to be installed to be compiled in graphical mode. Please install the SDL2 development libraries, or try compiling without the -DTILES=1 for a text only compilation.\nSee INSTALL file for details and more info\n"
+  
+		)
+  
+	ENDIF(NOT SDL2_FOUND)
+  
+
+  
+	IF (NOT DYNAMIC_LINKING)
+  
+		# SDL, SDL_Image, SDL_ttf deps are required for static build
+  
+		MESSAGE(STATUS "Searching for SDL deps libraries --")
+  
+		FIND_PACKAGE(Freetype REQUIRED)
+  
+		FIND_PACKAGE(PNG REQUIRED)
+  
+		FIND_PACKAGE(JPEG REQUIRED)
+  
+		FIND_PACKAGE(ZLIB REQUIRED)
+  
+		FIND_PACKAGE(BZip2 REQUIRED)
+  
+	ENDIF (NOT DYNAMIC_LINKING)
+  
+
+  
+	MESSAGE(STATUS "Searching for SDL2_image library --")
+  
+
+  
+	MESSAGE(STATUS "Searching for SDL2_TTF library --")
+  
+	FIND_PACKAGE(SDL2_ttf)
+  
+		IF(NOT SDL2_TTF_FOUND)
+  
+		MESSAGE(FATAL_ERROR
+  
+			"This project requires SDL2_ttf to be installed to be compiled in graphical mode. Please install the SDL2_ttf development libraries, or try compiling without the -DTILES=1 for a text only compilation.\nSee INSTALL file for details and moreinfo\n"
+  
+		)
+  
+	ENDIF(NOT SDL2_TTF_FOUND)
+  
+
+  
+	MESSAGE(STATUS "Searching for SDL2_image library --\n")
+  
+	FIND_PACKAGE(SDL2_image)
+  
+	IF(NOT SDL2_IMAGE_FOUND)
+  
+        	MESSAGE(FATAL_ERROR
+  
+			"This project requires SDL2_image to be installed to be compiled in graphical mode. Please install the SDL2_image development libraries, or try compiling without the -DTILES=1 for a text only compilation.\nSee INSTALL file for details and more info\n"
+  
+		)
+  
+	ENDIF(NOT SDL2_IMAGE_FOUND)
+  
+	ADD_DEFINITIONS(-DTILES)
+  
+ENDIF(TILES)
+  
+
+  
+IF(CURSES)
+  
+	# Find the ncurses library for a text based compile
+  
+	MESSAGE(STATUS "Searching for Curses library --\n")
+  
+	SET(CURSES_NEED_NCURSES TRUE)
+  
+	SET(CURSES_NEED_WIDE TRUE)
+  
+	FIND_PACKAGE(Curses)
+  
+	IF(NOT CURSES_FOUND)
+  
+		MESSAGE(FATAL_ERROR
+  
+			"This project requires ncurses to be installed to be compiled in text only mode. Please install the ncurses development libraries, or try compiling with the -DTILES=1 for a graphical compilation.\nSee INSTALL file for details and more info\n"
+  
+		)
+  
+	ENDIF(NOT CURSES_FOUND)
+  
+ENDIF(CURSES)
+  
+
+  
+IF(SOUND)
+  
+	# You need TILES to be able to use SOUND
+  
+	IF(NOT TILES)
+  
+		MESSAGE(FATAL_ERROR
+  
+			"You must enable graphical support with -DTILES=1 to be able to enable sound support.\nSee INSTALL file for details and more info\n"
+  
+		)
+  
+	ENDIF(NOT TILES)
+  
+
+  
+	# Sound requires SDL_mixer library
+  
+	MESSAGE(STATUS "Searching for SDL2_mixer library --\n")
+  
+	FIND_PACKAGE(SDL2_mixer)
+  
+	IF(NOT SDL2_MIXER_FOUND)
+  
+		MESSAGE(FATAL_ERROR
+  
+			"You need the SDL2_mixer development library to be able to compile with sound enabled.\nSee INSTALL file for details and more info\n"
+  
+		)
+  
+	ENDIF(NOT SDL2_MIXER_FOUND)
+  
+ENDIF(SOUND)
+  
+
+  
+IF(BACKTRACE)
+  
+	ADD_DEFINITIONS(-DBACKTRACE)
+  
+ENDIF(BACKTRACE)
+  
+
+  
+# Ok. Now create build and install recipes
+  
+IF(LOCALIZE)
+  
+	IF(WIN32)
+  
+		FIND_PACKAGE(Libintl)
+  
+		IF(NOT LIBINTL_FOUND)
+  
+		MESSAGE(FATAL_ERROR
+  
+			"You need the libintl development library to be able to compile with Localize support.\nSee INSTALL file for details and more info\n"
+  
+		)
+  
+		ENDIF(NOT LIBINTL_FOUND)
+  
+		FIND_PACKAGE(Iconv)
+  
+		IF(NOT ICONV_FOUND)
+  
+		MESSAGE(FATAL_ERROR
+  
+			"You need the iconv development library to be able to compile with Localize support.\nSee INSTALL file for details and more info\n"
+  
+		)
+  
+		ENDIF(NOT ICONV_FOUND)
+  
+	ENDIF(WIN32)
+  
+	add_subdirectory(lang)
+  
+	ADD_DEFINITIONS(-DLOCALIZE)
+  
+ENDIF(LOCALIZE)
+  
+
+  
+IF(USE_HOME_DIR)
+  
+	ADD_DEFINITIONS(-DUSE_HOME_DIR)
+  
+ENDIF(USE_HOME_DIR)
+  
+
+  
+add_subdirectory(src)
+  
+add_subdirectory(data)
+  
+if (NOT MSVC)
+  
+	add_subdirectory(src/chkjson)
+  
+endif()
+  
+add_subdirectory(tests)
+  
+if (CATA_CLANG_TIDY_PLUGIN)
+  
+	add_subdirectory(tools/clang-tidy-plugin)
+  
+endif()
+  
+
+  
+CONFIGURE_FILE(
+  
+	"${CMAKE_CURRENT_SOURCE_DIR}/cmake_uninstall.cmake.in"
+  
+	"${CMAKE_CURRENT_BINARY_DIR}/cmake_uninstall.cmake"
+  
+	IMMEDIATE @ONLY
+  
+)
+  
+
+  
+ADD_CUSTOM_TARGET(uninstall
+  
+	"${CMAKE_COMMAND}"
+  
+	-P "${CMAKE_CURRENT_BINARY_DIR}/cmake_uninstall.cmake"
+  
+)
+  
+
+  
+find_program(CCACHE_FOUND ccache)
+  
+if(CCACHE_FOUND)
+  
+    set_property(GLOBAL PROPERTY RULE_LAUNCH_COMPILE ccache)
+  
+    set_property(GLOBAL PROPERTY RULE_LAUNCH_LINK ccache)
+  
+endif(CCACHE_FOUND)
+  
+
+  
+# vim:noet
diff --git a/CMakeModules/CMakeParseArguments.cmake b/CMakeModules/CMakeParseArguments.cmake
@@ -0,0 +1,160 @@
+  
+#.rst:
+  
+# CMakeParseArguments
+  
+# -------------------
+  
+#
+  
+#
+  
+#
+  
+# CMAKE_PARSE_ARGUMENTS(<prefix> <options> <one_value_keywords>
+  
+# <multi_value_keywords> args...)
+  
+#
+  
+# CMAKE_PARSE_ARGUMENTS() is intended to be used in macros or functions
+  
+# for parsing the arguments given to that macro or function.  It
+  
+# processes the arguments and defines a set of variables which hold the
+  
+# values of the respective options.
+  
+#
+  
+# The <options> argument contains all options for the respective macro,
+  
+# i.e.  keywords which can be used when calling the macro without any
+  
+# value following, like e.g.  the OPTIONAL keyword of the install()
+  
+# command.
+  
+#
+  
+# The <one_value_keywords> argument contains all keywords for this macro
+  
+# which are followed by one value, like e.g.  DESTINATION keyword of the
+  
+# install() command.
+  
+#
+  
+# The <multi_value_keywords> argument contains all keywords for this
+  
+# macro which can be followed by more than one value, like e.g.  the
+  
+# TARGETS or FILES keywords of the install() command.
+  
+#
+  
+# When done, CMAKE_PARSE_ARGUMENTS() will have defined for each of the
+  
+# keywords listed in <options>, <one_value_keywords> and
+  
+# <multi_value_keywords> a variable composed of the given <prefix>
+  
+# followed by "_" and the name of the respective keyword.  These
+  
+# variables will then hold the respective value from the argument list.
+  
+# For the <options> keywords this will be TRUE or FALSE.
+  
+#
+  
+# All remaining arguments are collected in a variable
+  
+# <prefix>_UNPARSED_ARGUMENTS, this can be checked afterwards to see
+  
+# whether your macro was called with unrecognized parameters.
+  
+#
+  
+# As an example here a my_install() macro, which takes similar arguments
+  
+# as the real install() command:
+  
+#
+  
+# ::
+  
+#
+  
+#    function(MY_INSTALL)
+  
+#      set(options OPTIONAL FAST)
+  
+#      set(oneValueArgs DESTINATION RENAME)
+  
+#      set(multiValueArgs TARGETS CONFIGURATIONS)
+  
+#      cmake_parse_arguments(MY_INSTALL "${options}" "${oneValueArgs}" "${multiValueArgs}" ${ARGN} )
+  
+#      ...
+  
+#
+  
+#
+  
+#
+  
+# Assume my_install() has been called like this:
+  
+#
+  
+# ::
+  
+#
+  
+#    my_install(TARGETS foo bar DESTINATION bin OPTIONAL blub)
+  
+#
+  
+#
+  
+#
+  
+# After the cmake_parse_arguments() call the macro will have set the
+  
+# following variables:
+  
+#
+  
+# ::
+  
+#
+  
+#    MY_INSTALL_OPTIONAL = TRUE
+  
+#    MY_INSTALL_FAST = FALSE (this option was not used when calling my_install()
+  
+#    MY_INSTALL_DESTINATION = "bin"
+  
+#    MY_INSTALL_RENAME = "" (was not used)
+  
+#    MY_INSTALL_TARGETS = "foo;bar"
+  
+#    MY_INSTALL_CONFIGURATIONS = "" (was not used)
+  
+#    MY_INSTALL_UNPARSED_ARGUMENTS = "blub" (no value expected after "OPTIONAL"
+  
+#
+  
+#
+  
+#
+  
+# You can then continue and process these variables.
+  
+#
+  
+# Keywords terminate lists of values, e.g.  if directly after a
+  
+# one_value_keyword another recognized keyword follows, this is
+  
+# interpreted as the beginning of the new option.  E.g.
+  
+# my_install(TARGETS foo DESTINATION OPTIONAL) would result in
+  
+# MY_INSTALL_DESTINATION set to "OPTIONAL", but MY_INSTALL_DESTINATION
+  
+# would be empty and MY_INSTALL_OPTIONAL would be set to TRUE therefor.
+  
+
+  
+#=============================================================================
+  
+# Copyright 2010 Alexander Neundorf <neundorf@kde.org>
+  
+#
+  
+# Distributed under the OSI-approved BSD License (the "License");
+  
+# see accompanying file Copyright.txt for details.
+  
+#
+  
+# This software is distributed WITHOUT ANY WARRANTY; without even the
+  
+# implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+  
+# See the License for more information.
+  
+#=============================================================================
+  
+# (To distribute this file outside of CMake, substitute the full
+  
+#  License text for the above reference.)
+  
+
+  
+
+  
+if(__CMAKE_PARSE_ARGUMENTS_INCLUDED)
+  
+  return()
+  
+endif()
+  
+set(__CMAKE_PARSE_ARGUMENTS_INCLUDED TRUE)
+  
+
+  
+
+  
+function(CMAKE_PARSE_ARGUMENTS prefix _optionNames _singleArgNames _multiArgNames)
+  
+  # first set all result variables to empty/FALSE
+  
+  foreach(arg_name ${_singleArgNames} ${_multiArgNames})
+  
+    set(${prefix}_${arg_name})
+  
+  endforeach()
+  
+
+  
+  foreach(option ${_optionNames})
+  
+    set(${prefix}_${option} FALSE)
+  
+  endforeach()
+  
+
+  
+  set(${prefix}_UNPARSED_ARGUMENTS)
+  
+
+  
+  set(insideValues FALSE)
+  
+  set(currentArgName)
+  
+
+  
+  # now iterate over all arguments and fill the result variables
+  
+  foreach(currentArg ${ARGN})
+  
+    list(FIND _optionNames "${currentArg}" optionIndex)  # ... then this marks the end of the arguments belonging to this keyword
+  
+    list(FIND _singleArgNames "${currentArg}" singleArgIndex)  # ... then this marks the end of the arguments belonging to this keyword
+  
+    list(FIND _multiArgNames "${currentArg}" multiArgIndex)  # ... then this marks the end of the arguments belonging to this keyword
+  
+
+  
+    if(${optionIndex} EQUAL -1  AND  ${singleArgIndex} EQUAL -1  AND  ${multiArgIndex} EQUAL -1)
+  
+      if(insideValues)
+  
+        if("${insideValues}" STREQUAL "SINGLE")
+  
+          set(${prefix}_${currentArgName} ${currentArg})
+  
+          set(insideValues FALSE)
+  
+        elseif("${insideValues}" STREQUAL "MULTI")
+  
+          list(APPEND ${prefix}_${currentArgName} ${currentArg})
+  
+        endif()
+  
+      else()
+  
+        list(APPEND ${prefix}_UNPARSED_ARGUMENTS ${currentArg})
+  
+      endif()
+  
+    else()
+  
+      if(NOT ${optionIndex} EQUAL -1)
+  
+        set(${prefix}_${currentArg} TRUE)
+  
+        set(insideValues FALSE)
+  
+      elseif(NOT ${singleArgIndex} EQUAL -1)
+  
+        set(currentArgName ${currentArg})
+  
+        set(${prefix}_${currentArgName})
+  
+        set(insideValues "SINGLE")
+  
+      elseif(NOT ${multiArgIndex} EQUAL -1)
+  
+        set(currentArgName ${currentArg})
+  
+        set(${prefix}_${currentArgName})
+  
+        set(insideValues "MULTI")
+  
+      endif()
+  
+    endif()
+  
+
+  
+  endforeach()
+  
+
+  
+  # propagate the result variables to the caller:
+  
+  foreach(arg_name ${_singleArgNames} ${_multiArgNames} ${_optionNames})
+  
+    set(${prefix}_${arg_name}  ${${prefix}_${arg_name}} PARENT_SCOPE)
+  
+  endforeach()
+  
+  set(${prefix}_UNPARSED_ARGUMENTS ${${prefix}_UNPARSED_ARGUMENTS} PARENT_SCOPE)
+  
+
+  
+endfunction()
diff --git a/CMakeModules/CheckLibraryExists.cmake b/CMakeModules/CheckLibraryExists.cmake
@@ -0,0 +1,78 @@
+  
+#.rst:
+  
+# CheckLibraryExists
+  
+# ------------------
+  
+#
+  
+# Check if the function exists.
+  
+#
+  
+# CHECK_LIBRARY_EXISTS (LIBRARY FUNCTION LOCATION VARIABLE)
+  
+#
+  
+# ::
+  
+#
+  
+#   LIBRARY  - the name of the library you are looking for
+  
+#   FUNCTION - the name of the function
+  
+#   LOCATION - location where the library should be found
+  
+#   VARIABLE - variable to store the result
+  
+#
+  
+#
+  
+#
+  
+# The following variables may be set before calling this macro to modify
+  
+# the way the check is run:
+  
+#
+  
+# ::
+  
+#
+  
+#   CMAKE_REQUIRED_FLAGS = string of compile command line flags
+  
+#   CMAKE_REQUIRED_DEFINITIONS = list of macros to define (-DFOO=bar)
+  
+#   CMAKE_REQUIRED_LIBRARIES = list of libraries to link
+  
+
+  
+#=============================================================================
+  
+# Copyright 2002-2009 Kitware, Inc.
+  
+#
+  
+# Distributed under the OSI-approved BSD License (the "License");
+  
+# see accompanying file Copyright.txt for details.
+  
+#
+  
+# This software is distributed WITHOUT ANY WARRANTY; without even the
+  
+# implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+  
+# See the License for more information.
+  
+#=============================================================================
+  
+# (To distribute this file outside of CMake, substitute the full
+  
+#  License text for the above reference.)
+  
+
+  
+
+  
+
+  
+macro(CHECK_LIBRARY_EXISTS LIBRARY FUNCTION LOCATION VARIABLE)
+  
+  if(${VARIABLE} MATCHES "^${VARIABLE}$")
+  
+    set(MACRO_CHECK_LIBRARY_EXISTS_DEFINITION
+  
+      "-DCHECK_FUNCTION_EXISTS=${FUNCTION} ${CMAKE_REQUIRED_FLAGS}")
+  
+    message(STATUS "Looking for ${FUNCTION} in ${LIBRARY}")
+  
+    set(CHECK_LIBRARY_EXISTS_LIBRARIES ${LIBRARY})
+  
+    if(CMAKE_REQUIRED_LIBRARIES)
+  
+      set(CHECK_LIBRARY_EXISTS_LIBRARIES
+  
+        ${CHECK_LIBRARY_EXISTS_LIBRARIES} ${CMAKE_REQUIRED_LIBRARIES})
+  
+    endif()
+  
+    try_compile(${VARIABLE}
+  
+      ${CMAKE_BINARY_DIR}
+  
+      ${CMAKE_ROOT}/Modules/CheckFunctionExists.c
+  
+      COMPILE_DEFINITIONS ${CMAKE_REQUIRED_DEFINITIONS}
+  
+      LINK_LIBRARIES ${CHECK_LIBRARY_EXISTS_LIBRARIES}
+  
+      CMAKE_FLAGS
+  
+      -DCOMPILE_DEFINITIONS:STRING=${MACRO_CHECK_LIBRARY_EXISTS_DEFINITION}
+  
+      -DLINK_DIRECTORIES:STRING=${LOCATION}
+  
+      OUTPUT_VARIABLE OUTPUT)
+  
+
+  
+    if(${VARIABLE})
+  
+      message(STATUS "Looking for ${FUNCTION} in ${LIBRARY} - found")
+  
+      set(${VARIABLE} 1 CACHE INTERNAL "Have library ${LIBRARY}")
+  
+      file(APPEND ${CMAKE_BINARY_DIR}${CMAKE_FILES_DIRECTORY}/CMakeOutput.log
+  
+        "Determining if the function ${FUNCTION} exists in the ${LIBRARY} "
+  
+        "passed with the following output:\n"
+  
+        "${OUTPUT}\n\n")
+  
+    else()
+  
+      message(STATUS "Looking for ${FUNCTION} in ${LIBRARY} - not found")
+  
+      set(${VARIABLE} "" CACHE INTERNAL "Have library ${LIBRARY}")
+  
+      file(APPEND ${CMAKE_BINARY_DIR}${CMAKE_FILES_DIRECTORY}/CMakeError.log
+  
+        "Determining if the function ${FUNCTION} exists in the ${LIBRARY} "
+  
+        "failed with the following output:\n"
+  
+        "${OUTPUT}\n\n")
+  
+    endif()
+  
+  endif()
+  
+endmacro()
diff --git a/CMakeModules/FindCurses.cmake b/CMakeModules/FindCurses.cmake
@@ -0,0 +1,198 @@
+  
+#.rst:
+  
+# FindCurses
+  
+# ----------
+  
+#
+  
+# Find the curses include file and library
+  
+#
+  
+#
+  
+#
+  
+# ::
+  
+#
+  
+#   CURSES_FOUND - system has Curses
+  
+#   CURSES_INCLUDE_DIR - the Curses include directory
+  
+#   CURSES_LIBRARIES - The libraries needed to use Curses
+  
+#   CURSES_HAVE_CURSES_H - true if curses.h is available
+  
+#   CURSES_HAVE_NCURSES_H - true if ncurses.h is available
+  
+#   CURSES_HAVE_NCURSES_NCURSES_H - true if ncurses/ncurses.h is available
+  
+#   CURSES_HAVE_NCURSES_CURSES_H - true if ncurses/curses.h is available
+  
+#   CURSES_LIBRARY - set for backwards compatibility with 2.4 CMake
+  
+#
+  
+#
+  
+#
+  
+# Set CURSES_NEED_NCURSES to TRUE before the find_package() command if
+  
+# NCurses functionality is required.
+  
+
+  
+#=============================================================================
+  
+# Copyright 2001-2009 Kitware, Inc.
+  
+#
+  
+# Distributed under the OSI-approved BSD License (the "License");
+  
+# see accompanying file Copyright.txt for details.
+  
+#
+  
+# This software is distributed WITHOUT ANY WARRANTY; without even the
+  
+# implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+  
+# See the License for more information.
+  
+#=============================================================================
+  
+# (To distribute this file outside of CMake, substitute the full
+  
+#  License text for the above reference.)
+  
+
+  
+find_library(CURSES_CURSES_LIBRARY NAMES curses )
+  
+
+  
+find_library(CURSES_NCURSES_LIBRARY NAMES ncurses )
+  
+set(CURSES_USE_NCURSES FALSE)
+  
+
+  
+if(CURSES_NCURSES_LIBRARY  AND ((NOT CURSES_CURSES_LIBRARY) OR CURSES_NEED_NCURSES))
+  
+  set(CURSES_USE_NCURSES TRUE)
+  
+endif()
+  
+# http://cygwin.com/ml/cygwin-announce/2010-01/msg00002.html
+  
+# cygwin ncurses stopped providing curses.h symlinks see above
+  
+# message.  Cygwin is an ncurses package, so force ncurses on
+  
+# cygwin if the curses.h is missing
+  
+if(CYGWIN)
+  
+  if(NOT EXISTS /usr/include/curses.h)
+  
+    set(CURSES_USE_NCURSES TRUE)
+  
+  endif()
+  
+endif()
+  
+
+  
+
+  
+# Not sure the logic is correct here.
+  
+# If NCurses is required, use the function wsyncup() to check if the library
+  
+# has NCurses functionality (at least this is where it breaks on NetBSD).
+  
+# If wsyncup is in curses, use this one.
+  
+# If not, try to find ncurses and check if this has the symbol.
+  
+# Once the ncurses library is found, search the ncurses.h header first, but
+  
+# some web pages also say that even with ncurses there is not always a ncurses.h:
+  
+# http://osdir.com/ml/gnome.apps.mc.devel/2002-06/msg00029.html
+  
+# So at first try ncurses.h, if not found, try to find curses.h under the same
+  
+# prefix as the library was found, if still not found, try curses.h with the
+  
+# default search paths.
+  
+if(CURSES_CURSES_LIBRARY  AND  CURSES_NEED_NCURSES)
+  
+  include(${CMAKE_CURRENT_LIST_DIR}/CheckLibraryExists.cmake)
+  
+  CHECK_LIBRARY_EXISTS("${CURSES_CURSES_LIBRARY}"
+  
+    wsyncup "" CURSES_CURSES_HAS_WSYNCUP)
+  
+
+  
+  if(CURSES_NCURSES_LIBRARY  AND NOT  CURSES_CURSES_HAS_WSYNCUP)
+  
+    CHECK_LIBRARY_EXISTS("${CURSES_NCURSES_LIBRARY}"
+  
+      wsyncup "" CURSES_NCURSES_HAS_WSYNCUP)
+  
+    if( CURSES_NCURSES_HAS_WSYNCUP)
+  
+      set(CURSES_USE_NCURSES TRUE)
+  
+    endif()
+  
+  endif()
+  
+
+  
+endif()
+  
+
+  
+
+  
+if(NOT CURSES_USE_NCURSES)
+  
+  find_file(CURSES_HAVE_CURSES_H curses.h )
+  
+  find_path(CURSES_CURSES_H_PATH curses.h )
+  
+  get_filename_component(_cursesLibDir "${CURSES_CURSES_LIBRARY}" PATH)
+  
+  get_filename_component(_cursesParentDir "${_cursesLibDir}" PATH)
+  
+
+  
+  # for compatibility with older FindCurses.cmake this has to be in the cache
+  
+  # FORCE must not be used since this would break builds which preload a cache wqith these variables set
+  
+  set(CURSES_INCLUDE_PATH "${CURSES_CURSES_H_PATH}"
+  
+    CACHE FILEPATH "The curses include path")
+  
+  set(CURSES_LIBRARY "${CURSES_CURSES_LIBRARY}"
+  
+    CACHE FILEPATH "The curses library")
+  
+else()
+  
+# we need to find ncurses
+  
+  get_filename_component(_cursesLibDir "${CURSES_NCURSES_LIBRARY}" PATH)
+  
+  get_filename_component(_cursesParentDir "${_cursesLibDir}" PATH)
+  
+
+  
+  find_file(CURSES_HAVE_NCURSES_H         ncurses.h)
+  
+  find_file(CURSES_HAVE_NCURSES_NCURSES_H ncurses/ncurses.h)
+  
+  find_file(CURSES_HAVE_NCURSES_CURSES_H  ncurses/curses.h)
+  
+  find_file(CURSES_HAVE_CURSES_H          curses.h
+  
+    HINTS "${_cursesParentDir}/include")
+  
+
+  
+  find_path(CURSES_NCURSES_INCLUDE_PATH ncurses.h ncurses/ncurses.h
+  
+    ncurses/curses.h)
+  
+  find_path(CURSES_NCURSES_INCLUDE_PATH curses.h
+  
+    HINTS "${_cursesParentDir}/include")
+  
+
+  
+  # for compatibility with older FindCurses.cmake this has to be in the cache
+  
+  # FORCE must not be used since this would break builds which preload
+  
+  # however if the value of the variable has NOTFOUND in it, then
+  
+  # it is OK to force, and we need to force in order to have it work.
+  
+  # a cache wqith these variables set
+  
+  # only put ncurses include and library into
+  
+  # variables if they are found
+  
+  if(NOT CURSES_NCURSES_INCLUDE_PATH AND CURSES_HAVE_NCURSES_NCURSES_H)
+  
+    get_filename_component(CURSES_NCURSES_INCLUDE_PATH
+  
+      "${CURSES_HAVE_NCURSES_NCURSES_H}" PATH)
+  
+  endif()
+  
+  if(CURSES_NCURSES_INCLUDE_PATH AND CURSES_NCURSES_LIBRARY)
+  
+    set( FORCE_IT )
+  
+    if(CURSES_INCLUDE_PATH MATCHES NOTFOUND)
+  
+      set(FORCE_IT FORCE)
+  
+    endif()
+  
+    set(CURSES_INCLUDE_PATH "${CURSES_NCURSES_INCLUDE_PATH}"
+  
+      CACHE FILEPATH "The curses include path" ${FORCE_IT})
+  
+    set( FORCE_IT)
+  
+    if(CURSES_LIBRARY MATCHES NOTFOUND)
+  
+      set(FORCE_IT FORCE)
+  
+    endif()
+  
+    set(CURSES_LIBRARY "${CURSES_NCURSES_LIBRARY}"
+  
+      CACHE FILEPATH "The curses library" ${FORCE_IT})
+  
+  endif()
+  
+
+  
+  CHECK_LIBRARY_EXISTS("${CURSES_NCURSES_LIBRARY}"
+  
+    cbreak "" CURSES_NCURSES_HAS_CBREAK)
+  
+  if(NOT CURSES_NCURSES_HAS_CBREAK)
+  
+    find_library(CURSES_EXTRA_LIBRARY tinfo HINTS "${_cursesLibDir}")
+  
+    find_library(CURSES_EXTRA_LIBRARY tinfo )
+  
+    CHECK_LIBRARY_EXISTS("${CURSES_EXTRA_LIBRARY}"
+  
+      cbreak "" CURSES_TINFO_HAS_CBREAK)
+  
+  endif()
+  
+endif()
+  
+
+  
+if (NOT CURSES_TINFO_HAS_CBREAK)
+  
+  find_library(CURSES_EXTRA_LIBRARY cur_colr HINTS "${_cursesLibDir}")
+  
+  find_library(CURSES_EXTRA_LIBRARY cur_colr )
+  
+endif()
+  
+
+  
+find_library(CURSES_FORM_LIBRARY form HINTS "${_cursesLibDir}")
+  
+find_library(CURSES_FORM_LIBRARY form )
+  
+
+  
+# for compatibility with older FindCurses.cmake this has to be in the cache
+  
+# FORCE must not be used since this would break builds which preload a cache
+  
+# qith these variables set
+  
+set(FORM_LIBRARY "${CURSES_FORM_LIBRARY}"
+  
+  CACHE FILEPATH "The curses form library")
+  
+
+  
+# Need to provide the *_LIBRARIES
+  
+set(CURSES_LIBRARIES ${CURSES_LIBRARY})
+  
+
+  
+if(CURSES_EXTRA_LIBRARY)
+  
+  set(CURSES_LIBRARIES ${CURSES_LIBRARIES} ${CURSES_EXTRA_LIBRARY})
+  
+endif()
+  
+
+  
+if(CURSES_FORM_LIBRARY)
+  
+  set(CURSES_LIBRARIES ${CURSES_LIBRARIES} ${CURSES_FORM_LIBRARY})
+  
+endif()
+  
+
+  
+# Proper name is *_INCLUDE_DIR
+  
+set(CURSES_INCLUDE_DIR ${CURSES_INCLUDE_PATH})
+  
+
+  
+# handle the QUIETLY and REQUIRED arguments and set CURSES_FOUND to TRUE if
+  
+# all listed variables are TRUE
+  
+include(${CMAKE_CURRENT_LIST_DIR}/FindPackageHandleStandardArgs.cmake)
+  
+FIND_PACKAGE_HANDLE_STANDARD_ARGS(Curses DEFAULT_MSG
+  
+  CURSES_LIBRARY CURSES_INCLUDE_PATH)
+  
+
+  
+mark_as_advanced(
+  
+  CURSES_INCLUDE_PATH
+  
+  CURSES_LIBRARY
+  
+  CURSES_CURSES_INCLUDE_PATH
+  
+  CURSES_CURSES_LIBRARY
+  
+  CURSES_NCURSES_INCLUDE_PATH
+  
+  CURSES_NCURSES_LIBRARY
+  
+  CURSES_EXTRA_LIBRARY
+  
+  FORM_LIBRARY
+  
+  CURSES_LIBRARIES
+  
+  CURSES_INCLUDE_DIR
+  
+  CURSES_CURSES_HAS_WSYNCUP
+  
+  CURSES_NCURSES_HAS_WSYNCUP
+  
+  CURSES_NCURSES_HAS_CBREAK
+  
+  CURSES_TINFO_HAS_CBREAK
+  
+  )
+  
+
diff --git a/CMakeModules/FindIconv.cmake b/CMakeModules/FindIconv.cmake
@@ -0,0 +1,53 @@
+  
+# - Try to find Iconv 
+  
+# Once done this will define 
+  
+# 
+  
+#  ICONV_FOUND - system has Iconv 
+  
+#  ICONV_INCLUDE_DIR - the Iconv include directory 
+  
+#  ICONV_LIBRARIES - Link these to use Iconv 
+  
+#  ICONV_SECOND_ARGUMENT_IS_CONST - the second argument for iconv() is const
+  
+# 
+  
+include(CheckCXXSourceCompiles)
+  
+
+  
+IF (ICONV_INCLUDE_DIR AND ICONV_LIBRARIES)
+  
+	# Already in cache, be silent
+  
+	SET(ICONV_FIND_QUIETLY TRUE)
+  
+ENDIF (ICONV_INCLUDE_DIR AND ICONV_LIBRARIES)
+  
+
+  
+FIND_PATH(ICONV_INCLUDE_DIR iconv.h) 
+  
+
+  
+FIND_LIBRARY(ICONV_LIBRARIES NAMES iconv libiconv libiconv-2 c)
+  
+
+  
+IF(ICONV_INCLUDE_DIR AND ICONV_LIBRARIES)
+  
+	SET(ICONV_FOUND TRUE)
+  
+ENDIF(ICONV_INCLUDE_DIR AND ICONV_LIBRARIES)
+  
+
+  
+set(CMAKE_REQUIRED_INCLUDES ${ICONV_INCLUDE_DIR})
+  
+set(CMAKE_REQUIRED_LIBRARIES ${ICONV_LIBRARIES})
+  
+IF(ICONV_FOUND)
+  
+  check_cxx_source_compiles("
+  
+  #include <iconv.h>
+  
+  int main(){
+  
+    iconv_t conv = 0;
+  
+    const char* in = 0;
+  
+    size_t ilen = 0;
+  
+    char* out = 0;
+  
+    size_t olen = 0;
+  
+    iconv(conv, &in, &ilen, &out, &olen);
+  
+    return 0;
+  
+  }
+  
+" ICONV_SECOND_ARGUMENT_IS_CONST )
+  
+ENDIF(ICONV_FOUND)
+  
+set(CMAKE_REQUIRED_INCLUDES)
+  
+set(CMAKE_REQUIRED_LIBRARIES)
+  
+
+  
+# handle the QUIETLY and REQUIRED arguments and set CURSES_FOUND to TRUE if 
+  
+# all listed variables are TRUE
+  
+INCLUDE(FindPackageHandleStandardArgs)
+  
+FIND_PACKAGE_HANDLE_STANDARD_ARGS(Iconv DEFAULT_MSG
+  
+	ICONV_LIBRARIES ICONV_INCLUDE_DIR)
+  
+
+  
+MARK_AS_ADVANCED(
+  
+	ICONV_INCLUDE_DIR
+  
+	ICONV_LIBRARIES
+  
+	ICONV_SECOND_ARGUMENT_IS_CONST
+  
+)
diff --git a/CMakeModules/FindLibintl.cmake b/CMakeModules/FindLibintl.cmake
@@ -0,0 +1,45 @@
+  
+# Try to find Libintl functionality
+  
+# Once done this will define
+  
+#
+  
+#  LIBINTL_FOUND - system has Libintl
+  
+#  LIBINTL_INCLUDE_DIR - Libintl include directory
+  
+#  LIBINTL_LIBRARIES - Libraries needed to use Libintl
+  
+#
+  
+# TODO: This will enable translations only if Gettext functionality is
+  
+# present in libc. Must have more robust system for release, where Gettext
+  
+# functionality can also reside in standalone Gettext library, or the one
+  
+# embedded within kdelibs (cf. gettext.m4 from Gettext source).
+  
+
+  
+# Copyright (c) 2006, Chusslove Illich, <caslav.ilic@gmx.net>
+  
+# Copyright (c) 2007, Alexander Neundorf, <neundorf@kde.org>
+  
+#
+  
+# Redistribution and use is allowed according to the terms of the BSD license.
+  
+# For details see the accompanying COPYING-CMAKE-SCRIPTS file.
+  
+
+  
+if(LIBINTL_INCLUDE_DIR AND LIBINTL_LIB_FOUND)
+  
+	set(Libintl_FIND_QUIETLY TRUE)
+  
+endif(LIBINTL_INCLUDE_DIR AND LIBINTL_LIB_FOUND)
+  
+
+  
+find_path(LIBINTL_INCLUDE_DIR libintl.h)
+  
+
+  
+set(LIBINTL_LIB_FOUND FALSE)
+  
+
+  
+if(LIBINTL_INCLUDE_DIR)
+  
+	include(CheckFunctionExists)
+  
+	check_function_exists(dgettext LIBINTL_LIBC_HAS_DGETTEXT)
+  
+
+  
+	if (LIBINTL_LIBC_HAS_DGETTEXT)
+  
+		set(LIBINTL_LIBRARIES)
+  
+		set(LIBINTL_LIB_FOUND TRUE)
+  
+	else (LIBINTL_LIBC_HAS_DGETTEXT)
+  
+		find_library(LIBINTL_LIBRARIES intl libintl libintl-8)
+  
+		if(LIBINTL_LIBRARIES)
+  
+			set(LIBINTL_LIB_FOUND TRUE)
+  
+		endif(LIBINTL_LIBRARIES)
+  
+	endif (LIBINTL_LIBC_HAS_DGETTEXT)
+  
+endif(LIBINTL_INCLUDE_DIR)
+  
+
+  
+include(FindPackageHandleStandardArgs)
+  
+find_package_handle_standard_args(Libintl DEFAULT_MSG LIBINTL_LIBRARIES LIBINTL_INCLUDE_DIR)
+  
+
+  
+mark_as_advanced(LIBINTL_INCLUDE_DIR LIBINTL_LIBRARIES LIBINTL_LIBC_HAS_DGETTEXT LIBINTL_LIB_FOUND)
diff --git a/CMakeModules/FindPackageHandleStandardArgs.cmake b/CMakeModules/FindPackageHandleStandardArgs.cmake
@@ -0,0 +1,351 @@
+  
+#.rst:
+  
+# FindPackageHandleStandardArgs
+  
+# -----------------------------
+  
+#
+  
+#
+  
+#
+  
+# FIND_PACKAGE_HANDLE_STANDARD_ARGS(<name> ...  )
+  
+#
+  
+# This function is intended to be used in FindXXX.cmake modules files.
+  
+# It handles the REQUIRED, QUIET and version-related arguments to
+  
+# find_package().  It also sets the <packagename>_FOUND variable.  The
+  
+# package is considered found if all variables <var1>...  listed contain
+  
+# valid results, e.g.  valid filepaths.
+  
+#
+  
+# There are two modes of this function.  The first argument in both
+  
+# modes is the name of the Find-module where it is called (in original
+  
+# casing).
+  
+#
+  
+# The first simple mode looks like this:
+  
+#
+  
+# ::
+  
+#
+  
+#     FIND_PACKAGE_HANDLE_STANDARD_ARGS(<name> (DEFAULT_MSG|"Custom failure message") <var1>...<varN> )
+  
+#
+  
+# If the variables <var1> to <varN> are all valid, then
+  
+# <UPPERCASED_NAME>_FOUND will be set to TRUE.  If DEFAULT_MSG is given
+  
+# as second argument, then the function will generate itself useful
+  
+# success and error messages.  You can also supply a custom error
+  
+# message for the failure case.  This is not recommended.
+  
+#
+  
+# The second mode is more powerful and also supports version checking:
+  
+#
+  
+# ::
+  
+#
+  
+#     FIND_PACKAGE_HANDLE_STANDARD_ARGS(NAME [FOUND_VAR <resultVar>]
+  
+#                                            [REQUIRED_VARS <var1>...<varN>]
+  
+#                                            [VERSION_VAR   <versionvar>]
+  
+#                                            [HANDLE_COMPONENTS]
+  
+#                                            [CONFIG_MODE]
+  
+#                                            [FAIL_MESSAGE "Custom failure message"] )
+  
+#
+  
+#
+  
+#
+  
+# In this mode, the name of the result-variable can be set either to
+  
+# either <UPPERCASED_NAME>_FOUND or <OriginalCase_Name>_FOUND using the
+  
+# FOUND_VAR option.  Other names for the result-variable are not
+  
+# allowed.  So for a Find-module named FindFooBar.cmake, the two
+  
+# possible names are FooBar_FOUND and FOOBAR_FOUND.  It is recommended
+  
+# to use the original case version.  If the FOUND_VAR option is not
+  
+# used, the default is <UPPERCASED_NAME>_FOUND.
+  
+#
+  
+# As in the simple mode, if <var1> through <varN> are all valid,
+  
+# <packagename>_FOUND will be set to TRUE.  After REQUIRED_VARS the
+  
+# variables which are required for this package are listed.  Following
+  
+# VERSION_VAR the name of the variable can be specified which holds the
+  
+# version of the package which has been found.  If this is done, this
+  
+# version will be checked against the (potentially) specified required
+  
+# version used in the find_package() call.  The EXACT keyword is also
+  
+# handled.  The default messages include information about the required
+  
+# version and the version which has been actually found, both if the
+  
+# version is ok or not.  If the package supports components, use the
+  
+# HANDLE_COMPONENTS option to enable handling them.  In this case,
+  
+# find_package_handle_standard_args() will report which components have
+  
+# been found and which are missing, and the <packagename>_FOUND variable
+  
+# will be set to FALSE if any of the required components (i.e.  not the
+  
+# ones listed after OPTIONAL_COMPONENTS) are missing.  Use the option
+  
+# CONFIG_MODE if your FindXXX.cmake module is a wrapper for a
+  
+# find_package(...  NO_MODULE) call.  In this case VERSION_VAR will be
+  
+# set to <NAME>_VERSION and the macro will automatically check whether
+  
+# the Config module was found.  Via FAIL_MESSAGE a custom failure
+  
+# message can be specified, if this is not used, the default message
+  
+# will be displayed.
+  
+#
+  
+# Example for mode 1:
+  
+#
+  
+# ::
+  
+#
+  
+#     find_package_handle_standard_args(LibXml2  DEFAULT_MSG  LIBXML2_LIBRARY LIBXML2_INCLUDE_DIR)
+  
+#
+  
+#
+  
+#
+  
+# LibXml2 is considered to be found, if both LIBXML2_LIBRARY and
+  
+# LIBXML2_INCLUDE_DIR are valid.  Then also LIBXML2_FOUND is set to
+  
+# TRUE.  If it is not found and REQUIRED was used, it fails with
+  
+# FATAL_ERROR, independent whether QUIET was used or not.  If it is
+  
+# found, success will be reported, including the content of <var1>.  On
+  
+# repeated Cmake runs, the same message won't be printed again.
+  
+#
+  
+# Example for mode 2:
+  
+#
+  
+# ::
+  
+#
+  
+#     find_package_handle_standard_args(LibXslt FOUND_VAR LibXslt_FOUND
+  
+#                                              REQUIRED_VARS LibXslt_LIBRARIES LibXslt_INCLUDE_DIRS
+  
+#                                              VERSION_VAR LibXslt_VERSION_STRING)
+  
+#
+  
+# In this case, LibXslt is considered to be found if the variable(s)
+  
+# listed after REQUIRED_VAR are all valid, i.e.  LibXslt_LIBRARIES and
+  
+# LibXslt_INCLUDE_DIRS in this case.  The result will then be stored in
+  
+# LibXslt_FOUND .  Also the version of LibXslt will be checked by using
+  
+# the version contained in LibXslt_VERSION_STRING.  Since no
+  
+# FAIL_MESSAGE is given, the default messages will be printed.
+  
+#
+  
+# Another example for mode 2:
+  
+#
+  
+# ::
+  
+#
+  
+#     find_package(Automoc4 QUIET NO_MODULE HINTS /opt/automoc4)
+  
+#     find_package_handle_standard_args(Automoc4  CONFIG_MODE)
+  
+#
+  
+# In this case, FindAutmoc4.cmake wraps a call to find_package(Automoc4
+  
+# NO_MODULE) and adds an additional search directory for automoc4.  Here
+  
+# the result will be stored in AUTOMOC4_FOUND.  The following
+  
+# FIND_PACKAGE_HANDLE_STANDARD_ARGS() call produces a proper
+  
+# success/error message.
+  
+
+  
+#=============================================================================
+  
+# Copyright 2007-2009 Kitware, Inc.
+  
+#
+  
+# Distributed under the OSI-approved BSD License (the "License");
+  
+# see accompanying file Copyright.txt for details.
+  
+#
+  
+# This software is distributed WITHOUT ANY WARRANTY; without even the
+  
+# implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+  
+# See the License for more information.
+  
+#=============================================================================
+  
+# (To distribute this file outside of CMake, substitute the full
+  
+#  License text for the above reference.)
+  
+
+  
+include(${CMAKE_CURRENT_LIST_DIR}/FindPackageMessage.cmake)
+  
+include(${CMAKE_CURRENT_LIST_DIR}/CMakeParseArguments.cmake)
+  
+
+  
+# internal helper macro
+  
+macro(_FPHSA_FAILURE_MESSAGE _msg)
+  
+  if (${_NAME}_FIND_REQUIRED)
+  
+    message(FATAL_ERROR "${_msg}")
+  
+  else ()
+  
+    if (NOT ${_NAME}_FIND_QUIETLY)
+  
+      message(STATUS "${_msg}")
+  
+    endif ()
+  
+  endif ()
+  
+endmacro()
+  
+
+  
+
+  
+# internal helper macro to generate the failure message when used in CONFIG_MODE:
+  
+macro(_FPHSA_HANDLE_FAILURE_CONFIG_MODE)
+  
+  # <name>_CONFIG is set, but FOUND is false, this means that some other of the REQUIRED_VARS was not found:
+  
+  if(${_NAME}_CONFIG)
+  
+    _FPHSA_FAILURE_MESSAGE("${FPHSA_FAIL_MESSAGE}: missing: ${MISSING_VARS} (found ${${_NAME}_CONFIG} ${VERSION_MSG})")
+  
+  else()
+  
+    # If _CONSIDERED_CONFIGS is set, the config-file has been found, but no suitable version.
+  
+    # List them all in the error message:
+  
+    if(${_NAME}_CONSIDERED_CONFIGS)
+  
+      set(configsText "")
+  
+      list(LENGTH ${_NAME}_CONSIDERED_CONFIGS configsCount)
+  
+      math(EXPR configsCount "${configsCount} - 1")
+  
+      foreach(currentConfigIndex RANGE ${configsCount})
+  
+        list(GET ${_NAME}_CONSIDERED_CONFIGS ${currentConfigIndex} filename)
+  
+        list(GET ${_NAME}_CONSIDERED_VERSIONS ${currentConfigIndex} version)
+  
+        set(configsText "${configsText}    ${filename} (version ${version})\n")
+  
+      endforeach()
+  
+      if (${_NAME}_NOT_FOUND_MESSAGE)
+  
+        set(configsText "${configsText}    Reason given by package: ${${_NAME}_NOT_FOUND_MESSAGE}\n")
+  
+      endif()
+  
+      _FPHSA_FAILURE_MESSAGE("${FPHSA_FAIL_MESSAGE} ${VERSION_MSG}, checked the following files:\n${configsText}")
+  
+
+  
+    else()
+  
+      # Simple case: No Config-file was found at all:
+  
+      _FPHSA_FAILURE_MESSAGE("${FPHSA_FAIL_MESSAGE}: found neither ${_NAME}Config.cmake nor ${_NAME_LOWER}-config.cmake ${VERSION_MSG}")
+  
+    endif()
+  
+  endif()
+  
+endmacro()
+  
+
+  
+
+  
+function(FIND_PACKAGE_HANDLE_STANDARD_ARGS _NAME _FIRST_ARG)
+  
+
+  
+# set up the arguments for CMAKE_PARSE_ARGUMENTS and check whether we are in
+  
+# new extended or in the "old" mode:
+  
+  set(options  CONFIG_MODE  HANDLE_COMPONENTS)
+  
+  set(oneValueArgs  FAIL_MESSAGE  VERSION_VAR  FOUND_VAR)
+  
+  set(multiValueArgs REQUIRED_VARS)
+  
+  set(_KEYWORDS_FOR_EXTENDED_MODE  ${options} ${oneValueArgs} ${multiValueArgs} )
+  
+  list(FIND _KEYWORDS_FOR_EXTENDED_MODE "${_FIRST_ARG}" INDEX)
+  
+
+  
+  if(${INDEX} EQUAL -1)
+  
+    set(FPHSA_FAIL_MESSAGE ${_FIRST_ARG})
+  
+    set(FPHSA_REQUIRED_VARS ${ARGN})
+  
+    set(FPHSA_VERSION_VAR)
+  
+  else()
+  
+
+  
+    CMAKE_PARSE_ARGUMENTS(FPHSA "${options}" "${oneValueArgs}" "${multiValueArgs}"  ${_FIRST_ARG} ${ARGN})
+  
+
+  
+    if(FPHSA_UNPARSED_ARGUMENTS)
+  
+      message(FATAL_ERROR "Unknown keywords given to FIND_PACKAGE_HANDLE_STANDARD_ARGS(): \"${FPHSA_UNPARSED_ARGUMENTS}\"")
+  
+    endif()
+  
+
+  
+    if(NOT FPHSA_FAIL_MESSAGE)
+  
+      set(FPHSA_FAIL_MESSAGE  "DEFAULT_MSG")
+  
+    endif()
+  
+  endif()
+  
+
+  
+# now that we collected all arguments, process them
+  
+
+  
+  if("${FPHSA_FAIL_MESSAGE}" STREQUAL "DEFAULT_MSG")
+  
+    set(FPHSA_FAIL_MESSAGE "Could NOT find ${_NAME}")
+  
+  endif()
+  
+
+  
+  # In config-mode, we rely on the variable <package>_CONFIG, which is set by find_package()
+  
+  # when it successfully found the config-file, including version checking:
+  
+  if(FPHSA_CONFIG_MODE)
+  
+    list(INSERT FPHSA_REQUIRED_VARS 0 ${_NAME}_CONFIG)
+  
+    list(REMOVE_DUPLICATES FPHSA_REQUIRED_VARS)
+  
+    set(FPHSA_VERSION_VAR ${_NAME}_VERSION)
+  
+  endif()
+  
+
+  
+  if(NOT FPHSA_REQUIRED_VARS)
+  
+    message(FATAL_ERROR "No REQUIRED_VARS specified for FIND_PACKAGE_HANDLE_STANDARD_ARGS()")
+  
+  endif()
+  
+
+  
+  list(GET FPHSA_REQUIRED_VARS 0 _FIRST_REQUIRED_VAR)
+  
+
+  
+  string(TOUPPER ${_NAME} _NAME_UPPER)
+  
+  string(TOLOWER ${_NAME} _NAME_LOWER)
+  
+
+  
+  if(FPHSA_FOUND_VAR)
+  
+    if(FPHSA_FOUND_VAR MATCHES "^${_NAME}_FOUND$"  OR  FPHSA_FOUND_VAR MATCHES "^${_NAME_UPPER}_FOUND$")
+  
+      set(_FOUND_VAR ${FPHSA_FOUND_VAR})
+  
+    else()
+  
+      message(FATAL_ERROR "The argument for FOUND_VAR is \"${FPHSA_FOUND_VAR}\", but only \"${_NAME}_FOUND\" and \"${_NAME_UPPER}_FOUND\" are valid names.")
+  
+    endif()
+  
+  else()
+  
+    set(_FOUND_VAR ${_NAME_UPPER}_FOUND)
+  
+  endif()
+  
+
+  
+  # collect all variables which were not found, so they can be printed, so the
+  
+  # user knows better what went wrong (#6375)
+  
+  set(MISSING_VARS "")
+  
+  set(DETAILS "")
+  
+  # check if all passed variables are valid
+  
+  unset(${_FOUND_VAR})
+  
+  foreach(_CURRENT_VAR ${FPHSA_REQUIRED_VARS})
+  
+    if(NOT ${_CURRENT_VAR})
+  
+      set(${_FOUND_VAR} FALSE)
+  
+      set(MISSING_VARS "${MISSING_VARS} ${_CURRENT_VAR}")
+  
+    else()
+  
+      set(DETAILS "${DETAILS}[${${_CURRENT_VAR}}]")
+  
+    endif()
+  
+  endforeach()
+  
+  if(NOT "${${_FOUND_VAR}}" STREQUAL "FALSE")
+  
+    set(${_FOUND_VAR} TRUE)
+  
+  endif()
+  
+
+  
+  # component handling
+  
+  unset(FOUND_COMPONENTS_MSG)
+  
+  unset(MISSING_COMPONENTS_MSG)
+  
+
+  
+  if(FPHSA_HANDLE_COMPONENTS)
+  
+    foreach(comp ${${_NAME}_FIND_COMPONENTS})
+  
+      if(${_NAME}_${comp}_FOUND)
+  
+
+  
+        if(NOT DEFINED FOUND_COMPONENTS_MSG)
+  
+          set(FOUND_COMPONENTS_MSG "found components: ")
+  
+        endif()
+  
+        set(FOUND_COMPONENTS_MSG "${FOUND_COMPONENTS_MSG} ${comp}")
+  
+
+  
+      else()
+  
+
+  
+        if(NOT DEFINED MISSING_COMPONENTS_MSG)
+  
+          set(MISSING_COMPONENTS_MSG "missing components: ")
+  
+        endif()
+  
+        set(MISSING_COMPONENTS_MSG "${MISSING_COMPONENTS_MSG} ${comp}")
+  
+
+  
+        if(${_NAME}_FIND_REQUIRED_${comp})
+  
+          set(${_FOUND_VAR} FALSE)
+  
+          set(MISSING_VARS "${MISSING_VARS} ${comp}")
+  
+        endif()
+  
+
+  
+      endif()
+  
+    endforeach()
+  
+    set(COMPONENT_MSG "${FOUND_COMPONENTS_MSG} ${MISSING_COMPONENTS_MSG}")
+  
+    set(DETAILS "${DETAILS}[c${COMPONENT_MSG}]")
+  
+  endif()
+  
+
+  
+  # version handling:
+  
+  set(VERSION_MSG "")
+  
+  set(VERSION_OK TRUE)
+  
+  set(VERSION ${${FPHSA_VERSION_VAR}} )
+  
+  if (${_NAME}_FIND_VERSION)
+  
+
+  
+    if(VERSION)
+  
+
+  
+      if(${_NAME}_FIND_VERSION_EXACT)       # exact version required
+  
+        if (NOT "${${_NAME}_FIND_VERSION}" VERSION_EQUAL "${VERSION}")
+  
+          set(VERSION_MSG "Found unsuitable version \"${VERSION}\", but required is exact version \"${${_NAME}_FIND_VERSION}\"")
+  
+          set(VERSION_OK FALSE)
+  
+        else ()
+  
+          set(VERSION_MSG "(found suitable exact version \"${VERSION}\")")
+  
+        endif ()
+  
+
+  
+      else()     # minimum version specified:
+  
+        if ("${${_NAME}_FIND_VERSION}" VERSION_GREATER "${VERSION}")
+  
+          set(VERSION_MSG "Found unsuitable version \"${VERSION}\", but required is at least \"${${_NAME}_FIND_VERSION}\"")
+  
+          set(VERSION_OK FALSE)
+  
+        else ()
+  
+          set(VERSION_MSG "(found suitable version \"${VERSION}\", minimum required is \"${${_NAME}_FIND_VERSION}\")")
+  
+        endif ()
+  
+      endif()
+  
+
+  
+    else()
+  
+
+  
+      # if the package was not found, but a version was given, add that to the output:
+  
+      if(${_NAME}_FIND_VERSION_EXACT)
+  
+         set(VERSION_MSG "(Required is exact version \"${${_NAME}_FIND_VERSION}\")")
+  
+      else()
+  
+         set(VERSION_MSG "(Required is at least version \"${${_NAME}_FIND_VERSION}\")")
+  
+      endif()
+  
+
+  
+    endif()
+  
+  else ()
+  
+    if(VERSION)
+  
+      set(VERSION_MSG "(found version \"${VERSION}\")")
+  
+    endif()
+  
+  endif ()
+  
+
+  
+  if(VERSION_OK)
+  
+    set(DETAILS "${DETAILS}[v${VERSION}(${${_NAME}_FIND_VERSION})]")
+  
+  else()
+  
+    set(${_FOUND_VAR} FALSE)
+  
+  endif()
+  
+
+  
+
+  
+  # print the result:
+  
+  if (${_FOUND_VAR})
+  
+    FIND_PACKAGE_MESSAGE(${_NAME} "Found ${_NAME}: ${${_FIRST_REQUIRED_VAR}} ${VERSION_MSG} ${COMPONENT_MSG}" "${DETAILS}")
+  
+  else ()
+  
+
+  
+    if(FPHSA_CONFIG_MODE)
+  
+      _FPHSA_HANDLE_FAILURE_CONFIG_MODE()
+  
+    else()
+  
+      if(NOT VERSION_OK)
+  
+        _FPHSA_FAILURE_MESSAGE("${FPHSA_FAIL_MESSAGE}: ${VERSION_MSG} (found ${${_FIRST_REQUIRED_VAR}})")
+  
+      else()
+  
+        _FPHSA_FAILURE_MESSAGE("${FPHSA_FAIL_MESSAGE} (missing: ${MISSING_VARS}) ${VERSION_MSG}")
+  
+      endif()
+  
+    endif()
+  
+
+  
+  endif ()
+  
+
+  
+  set(${_FOUND_VAR} ${${_FOUND_VAR}} PARENT_SCOPE)
+  
+
+  
+endfunction()
diff --git a/CMakeModules/FindPackageMessage.cmake b/CMakeModules/FindPackageMessage.cmake
@@ -0,0 +1,57 @@
+  
+#.rst:
+  
+# FindPackageMessage
+  
+# ------------------
+  
+#
+  
+#
+  
+#
+  
+# FIND_PACKAGE_MESSAGE(<name> "message for user" "find result details")
+  
+#
+  
+# This macro is intended to be used in FindXXX.cmake modules files.  It
+  
+# will print a message once for each unique find result.  This is useful
+  
+# for telling the user where a package was found.  The first argument
+  
+# specifies the name (XXX) of the package.  The second argument
+  
+# specifies the message to display.  The third argument lists details
+  
+# about the find result so that if they change the message will be
+  
+# displayed again.  The macro also obeys the QUIET argument to the
+  
+# find_package command.
+  
+#
+  
+# Example:
+  
+#
+  
+# ::
+  
+#
+  
+#   if(X11_FOUND)
+  
+#     FIND_PACKAGE_MESSAGE(X11 "Found X11: ${X11_X11_LIB}"
+  
+#       "[${X11_X11_LIB}][${X11_INCLUDE_DIR}]")
+  
+#   else()
+  
+#    ...
+  
+#   endif()
+  
+
+  
+#=============================================================================
+  
+# Copyright 2008-2009 Kitware, Inc.
+  
+#
+  
+# Distributed under the OSI-approved BSD License (the "License");
+  
+# see accompanying file Copyright.txt for details.
+  
+#
+  
+# This software is distributed WITHOUT ANY WARRANTY; without even the
+  
+# implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+  
+# See the License for more information.
+  
+#=============================================================================
+  
+# (To distribute this file outside of CMake, substitute the full
+  
+#  License text for the above reference.)
+  
+
+  
+function(FIND_PACKAGE_MESSAGE pkg msg details)
+  
+  # Avoid printing a message repeatedly for the same find result.
+  
+  if(NOT ${pkg}_FIND_QUIETLY)
+  
+    string(REGEX REPLACE "[\n]" "" details "${details}")
+  
+    set(DETAILS_VAR FIND_PACKAGE_MESSAGE_DETAILS_${pkg})
+  
+    if(NOT "${details}" STREQUAL "${${DETAILS_VAR}}")
+  
+      # The message has not yet been printed.
+  
+      message(STATUS "${msg}")
+  
+
+  
+      # Save the find details in the cache to avoid printing the same
+  
+      # message again.
+  
+      set("${DETAILS_VAR}" "${details}"
+  
+        CACHE INTERNAL "Details about finding ${pkg}")
+  
+    endif()
+  
+  endif()
+  
+endfunction()
diff --git a/CMakeModules/FindSDL2.cmake b/CMakeModules/FindSDL2.cmake
@@ -0,0 +1,186 @@
+  
+#.rst:
+  
+# FindSDL2
+  
+# -------
+  
+#
+  
+# Locate SDL2 library
+  
+#
+  
+# This module defines
+  
+#
+  
+# ::
+  
+#
+  
+#   SDL2_LIBRARY, the name of the library to link against
+  
+#   SDL2_FOUND, if false, do not try to link to SDL
+  
+#   SDL2_INCLUDE_DIR, where to find SDL.h
+  
+#   SDL2_VERSION_STRING, human-readable string containing the version of SDL
+  
+#
+  
+#
+  
+#
+  
+# This module responds to the flag:
+  
+#
+  
+# ::
+  
+#
+  
+#   SDL2_BUILDING_LIBRARY
+  
+#     If this is defined, then no SDL2_main will be linked in because
+  
+#     only applications need main().
+  
+#     Otherwise, it is assumed you are building an application and this
+  
+#     module will attempt to locate and set the proper link flags
+  
+#     as part of the returned SDL2_LIBRARY variable.
+  
+#
+  
+#
+  
+#
+  
+# Don't forget to include SDLmain.h and SDLmain.m your project for the
+  
+# OS X framework based version.  (Other versions link to -lSDLmain which
+  
+# this module will try to find on your behalf.) Also for OS X, this
+  
+# module will automatically add the -framework Cocoa on your behalf.
+  
+#
+  
+#
+  
+#
+  
+# Additional Note: If you see an empty SDL2_LIBRARY_TEMP in your
+  
+# configuration and no SDL2_LIBRARY, it means CMake did not find your SDL
+  
+# library (SDL.dll, libsdl.so, SDL.framework, etc).  Set
+  
+# SDL2_LIBRARY_TEMP to point to your SDL library, and configure again.
+  
+# Similarly, if you see an empty SDLMAIN_LIBRARY, you should set this
+  
+# value as appropriate.  These values are used to generate the final
+  
+# SDL2_LIBRARY variable, but when these values are unset, SDL2_LIBRARY
+  
+# does not get created.
+  
+#
+  
+#
+  
+#
+  
+# $SDLDIR is an environment variable that would correspond to the
+  
+# ./configure --prefix=$SDLDIR used in building SDL.  l.e.galup 9-20-02
+  
+#
+  
+# Modified by Eric Wing.  Added code to assist with automated building
+  
+# by using environmental variables and providing a more
+  
+# controlled/consistent search behavior.  Added new modifications to
+  
+# recognize OS X frameworks and additional Unix paths (FreeBSD, etc).
+  
+# Also corrected the header search path to follow "proper" SDL
+  
+# guidelines.  Added a search for SDLmain which is needed by some
+  
+# platforms.  Added a search for threads which is needed by some
+  
+# platforms.  Added needed compile switches for MinGW.
+  
+#
+  
+# On OSX, this will prefer the Framework version (if found) over others.
+  
+# People will have to manually change the cache values of SDL2_LIBRARY to
+  
+# override this selection or set the CMake environment
+  
+# CMAKE_INCLUDE_PATH to modify the search paths.
+  
+#
+  
+# Note that the header path has changed from SDL/SDL.h to just SDL.h
+  
+# This needed to change because "proper" SDL convention is #include
+  
+# "SDL.h", not <SDL/SDL.h>.  This is done for portability reasons
+  
+# because not all systems place things in SDL/ (see FreeBSD).
+  
+
+  
+#=============================================================================
+  
+# Copyright 2003-2009 Kitware, Inc.
+  
+# Copyright 2012 Benjamin Eikel
+  
+#
+  
+# Distributed under the OSI-approved BSD License (the "License");
+  
+# see accompanying file Copyright.txt for details.
+  
+#
+  
+# This software is distributed WITHOUT ANY WARRANTY; without even the
+  
+# implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+  
+# See the License for more information.
+  
+#=============================================================================
+  
+# (To distribute this file outside of CMake, substitute the full
+  
+#  License text for the above reference.)
+  
+
+  
+find_path(SDL2_INCLUDE_DIR SDL.h
+  
+  HINTS
+  
+    ENV SDL2DIR
+  
+    ${CMAKE_SOURCE_DIR}/dep/
+  
+  PATH_SUFFIXES SDL2
+  
+                # path suffixes to search inside ENV{SDLDIR}
+  
+                include/SDL2 include
+  
+)
+  
+
+  
+if(CMAKE_SIZEOF_VOID_P EQUAL 8)
+  
+  set(VC_LIB_PATH_SUFFIX lib/x64)
+  
+else()
+  
+  set(VC_LIB_PATH_SUFFIX lib/x86)
+  
+endif()
+  
+
+  
+find_library(SDL2_LIBRARY_TEMP
+  
+  NAMES SDL2
+  
+  HINTS
+  
+    ENV SDL2DIR
+  
+    ${CMAKE_SOURCE_DIR}/dep/
+  
+  PATH_SUFFIXES lib ${VC_LIB_PATH_SUFFIX}
+  
+)
+  
+
+  
+if(NOT SDL2_BUILDING_LIBRARY)
+  
+  if(NOT SDL2_INCLUDE_DIR MATCHES ".framework")
+  
+    # Non-OS X framework versions expect you to also dynamically link to
+  
+    # SDLmain. This is mainly for Windows and OS X. Other (Unix) platforms
+  
+    # seem to provide SDLmain for compatibility even though they don't
+  
+    # necessarily need it.
+  
+    find_library(SDL2MAIN_LIBRARY
+  
+      NAMES SDL2main
+  
+      HINTS
+  
+        ENV SDL2DIR
+  
+        ${CMAKE_SOURCE_DIR}/dep/
+  
+      PATH_SUFFIXES lib ${VC_LIB_PATH_SUFFIX}
+  
+      PATHS
+  
+      /sw
+  
+      /opt/local
+  
+      /opt/csw
+  
+      /opt
+  
+    )
+  
+  endif()
+  
+endif()
+  
+
+  
+# SDL may require threads on your system.
+  
+# The Apple build may not need an explicit flag because one of the
+  
+# frameworks may already provide it.
+  
+# But for non-OSX systems, I will use the CMake Threads package.
+  
+if(NOT APPLE)
+  
+  find_package(Threads)
+  
+endif()
+  
+
+  
+# MinGW needs an additional library, mwindows
+  
+# It's total link flags should look like -lmingw32 -lSDLmain -lSDL -lmwindows
+  
+# (Actually on second look, I think it only needs one of the m* libraries.)
+  
+if(MINGW)
+  
+  set(MINGW32_LIBRARY mingw32 CACHE STRING "mwindows for MinGW")
+  
+endif()
+  
+
+  
+if(SDL2_LIBRARY_TEMP)
+  
+  # For SDLmain
+  
+  if(SDL2MAIN_LIBRARY AND NOT SDL2_BUILDING_LIBRARY)
+  
+    list(FIND SDL2_LIBRARY_TEMP "${SDL2MAIN_LIBRARY}" _SDL2_MAIN_INDEX)
+  
+    if(_SDL2_MAIN_INDEX EQUAL -1)
+  
+      set(SDL2_LIBRARY_TEMP "${SDL2MAIN_LIBRARY}" ${SDL2_LIBRARY_TEMP})
+  
+    endif()
+  
+    unset(_SDL2_MAIN_INDEX)
+  
+  endif()
+  
+
+  
+  # For OS X, SDL uses Cocoa as a backend so it must link to Cocoa.
+  
+  # CMake doesn't display the -framework Cocoa string in the UI even
+  
+  # though it actually is there if I modify a pre-used variable.
+  
+  # I think it has something to do with the CACHE STRING.
+  
+  # So I use a temporary variable until the end so I can set the
+  
+  # "real" variable in one-shot.
+  
+  if(APPLE)
+  
+    set(SDL2_LIBRARY_TEMP ${SDL2_LIBRARY_TEMP} "-framework Cocoa")
+  
+  endif()
+  
+
+  
+  # For threads, as mentioned Apple doesn't need this.
+  
+  # In fact, there seems to be a problem if I used the Threads package
+  
+  # and try using this line, so I'm just skipping it entirely for OS X.
+  
+  if(NOT APPLE)
+  
+    set(SDL2_LIBRARY_TEMP ${SDL2_LIBRARY_TEMP} ${CMAKE_THREAD_LIBS_INIT})
+  
+  endif()
+  
+
+  
+  # For MinGW library
+  
+  if(MINGW)
+  
+    set(SDL2_LIBRARY_TEMP ${MINGW32_LIBRARY} ${SDL2_LIBRARY_TEMP})
+  
+  endif()
+  
+
+  
+  # Set the final string here so the GUI reflects the final state.
+  
+  set(SDL2_LIBRARY ${SDL2_LIBRARY_TEMP} CACHE STRING "Where the SDL2 Library can be found")
+  
+  # Set the temp variable to INTERNAL so it is not seen in the CMake GUI
+  
+  set(SDL2_LIBRARY_TEMP "${SDL2_LIBRARY_TEMP}" CACHE INTERNAL "")
+  
+endif()
+  
+
+  
+include(FindPackageHandleStandardArgs)
+  
+
+  
+FIND_PACKAGE_HANDLE_STANDARD_ARGS(SDL2
+  
+                                  REQUIRED_VARS SDL2_LIBRARY SDL2_INCLUDE_DIR
+  
+                                  VERSION_VAR SDL2_VERSION_STRING)
diff --git a/CMakeModules/FindSDL2_image.cmake b/CMakeModules/FindSDL2_image.cmake
@@ -0,0 +1,97 @@
+  
+#.rst:
+  
+# FindSDL2_image
+  
+# -------------
+  
+#
+  
+# Locate SDL2_image library
+  
+#
+  
+# This module defines:
+  
+#
+  
+# ::
+  
+#
+  
+#   SDL2_IMAGE_LIBRARIES, the name of the library to link against
+  
+#   SDL2_IMAGE_INCLUDE_DIRS, where to find the headers
+  
+#   SDL2_IMAGE_FOUND, if false, do not try to link against
+  
+#   SDL2_IMAGE_VERSION_STRING - human-readable string containing the
+  
+#                              version of SDL2_image
+  
+#
+  
+#
+  
+#
+  
+# For backward compatiblity the following variables are also set:
+  
+#
+  
+# ::
+  
+#
+  
+#   SDL2IMAGE_LIBRARY (same value as SDL2_IMAGE_LIBRARIES)
+  
+#   SDL2IMAGE_INCLUDE_DIR (same value as SDL2_IMAGE_INCLUDE_DIRS)
+  
+#   SDL2IMAGE_FOUND (same value as SDL2_IMAGE_FOUND)
+  
+#
+  
+#
+  
+#
+  
+# $SDL2DIR is an environment variable that would correspond to the
+  
+# ./configure --prefix=$SDL2DIR used in building SDL2.
+  
+#
+  
+# Created by Eric Wing.  This was influenced by the FindSDL2.cmake
+  
+# module, but with modifications to recognize OS X frameworks and
+  
+# additional Unix paths (FreeBSD, etc).
+  
+
+  
+#=============================================================================
+  
+# Copyright 2005-2009 Kitware, Inc.
+  
+# Copyright 2012 Benjamin Eikel
+  
+#
+  
+# Distributed under the OSI-approved BSD License (the "License");
+  
+# see accompanying file Copyright.txt for details.
+  
+#
+  
+# This software is distributed WITHOUT ANY WARRANTY; without even the
+  
+# implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+  
+# See the License for more information.
+  
+#=============================================================================
+  
+# (To distribute this file outside of CMake, substitute the full
+  
+#  License text for the above reference.)
+  
+
+  
+if(NOT SDL2_IMAGE_INCLUDE_DIR AND SDL2IMAGE_INCLUDE_DIR)
+  
+  set(SDL2_IMAGE_INCLUDE_DIR ${SDL2IMAGE_INCLUDE_DIR} CACHE PATH "directory cache
+  
+entry initialized from old variable name")
+  
+endif()
+  
+find_path(SDL2_IMAGE_INCLUDE_DIR SDL_image.h
+  
+  HINTS
+  
+    ENV SDL2IMAGEDIR
+  
+    ENV SDL2DIR
+  
+    ${CMAKE_SOURCE_DIR}/dep/
+  
+  PATH_SUFFIXES SDL2
+  
+                # path suffixes to search inside ENV{SDL2DIR}
+  
+                include/SDL2 include
+  
+)
+  
+
+  
+if(CMAKE_SIZEOF_VOID_P EQUAL 8)
+  
+  set(VC_LIB_PATH_SUFFIX lib/x64)
+  
+else()
+  
+  set(VC_LIB_PATH_SUFFIX lib/x86)
+  
+endif()
+  
+
+  
+if(NOT SDL2_IMAGE_LIBRARY AND SDL2IMAGE_LIBRARY)
+  
+  set(SDL2_IMAGE_LIBRARY ${SDL2IMAGE_LIBRARY} CACHE FILEPATH "file cache entry
+  
+initialized from old variable name")
+  
+endif()
+  
+find_library(SDL2_IMAGE_LIBRARY
+  
+  NAMES SDL2_image
+  
+  HINTS
+  
+    ENV SDL2IMAGEDIR
+  
+    ENV SDL2DIR
+  
+    ${CMAKE_SOURCE_DIR}/dep/
+  
+  PATH_SUFFIXES lib ${VC_LIB_PATH_SUFFIX}
+  
+)
+  
+
+  
+set(SDL2_IMAGE_LIBRARIES ${SDL2_IMAGE_LIBRARY})
+  
+set(SDL2_IMAGE_INCLUDE_DIRS ${SDL2_IMAGE_INCLUDE_DIR})
+  
+
+  
+include(FindPackageHandleStandardArgs)
+  
+
+  
+FIND_PACKAGE_HANDLE_STANDARD_ARGS(SDL2_image
+  
+                                  REQUIRED_VARS SDL2_IMAGE_LIBRARIES SDL2_IMAGE_INCLUDE_DIRS
+  
+                                  VERSION_VAR SDL2_IMAGE_VERSION_STRING)
+  
+
+  
+# for backward compatiblity
+  
+set(SDL2IMAGE_LIBRARY ${SDL2_IMAGE_LIBRARIES})
+  
+set(SDL2IMAGE_INCLUDE_DIR ${SDL2_IMAGE_INCLUDE_DIRS})
+  
+set(SDL2IMAGE_FOUND ${SDL2_IMAGE_FOUND})
+  
+
+  
+mark_as_advanced(SDL2_IMAGE_LIBRARY SDL2_IMAGE_INCLUDE_DIR)
diff --git a/CMakeModules/FindSDL2_mixer.cmake b/CMakeModules/FindSDL2_mixer.cmake
@@ -0,0 +1,97 @@
+  
+#.rst:
+  
+# FindSDL2_mixer
+  
+# -------------
+  
+#
+  
+# Locate SDL2_mixer library
+  
+#
+  
+# This module defines:
+  
+#
+  
+# ::
+  
+#
+  
+#   SDL2_MIXER_LIBRARIES, the name of the library to link against
+  
+#   SDL2_MIXER_INCLUDE_DIRS, where to find the headers
+  
+#   SDL2_MIXER_FOUND, if false, do not try to link against
+  
+#   SDL2_MIXER_VERSION_STRING - human-readable string containing the
+  
+#                              version of SDL2_mixer
+  
+#
+  
+#
+  
+#
+  
+# For backward compatiblity the following variables are also set:
+  
+#
+  
+# ::
+  
+#
+  
+#   SDL2MIXER_LIBRARY (same value as SDL2_MIXER_LIBRARIES)
+  
+#   SDL2MIXER_INCLUDE_DIR (same value as SDL2_MIXER_INCLUDE_DIRS)
+  
+#   SDL2MIXER_FOUND (same value as SDL2_MIXER_FOUND)
+  
+#
+  
+#
+  
+#
+  
+# $SDL2DIR is an environment variable that would correspond to the
+  
+# ./configure --prefix=$SDL2DIR used in building SDL2.
+  
+#
+  
+# Created by Eric Wing.  This was influenced by the FindSDL2.cmake
+  
+# module, but with modifications to recognize OS X frameworks and
+  
+# additional Unix paths (FreeBSD, etc).
+  
+
+  
+#=============================================================================
+  
+# Copyright 2005-2009 Kitware, Inc.
+  
+# Copyright 2012 Benjamin Eikel
+  
+#
+  
+# Distributed under the OSI-approved BSD License (the "License");
+  
+# see accompanying file Copyright.txt for details.
+  
+#
+  
+# This software is distributed WITHOUT ANY WARRANTY; without even the
+  
+# implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+  
+# See the License for more information.
+  
+#=============================================================================
+  
+# (To distribute this file outside of CMake, substitute the full
+  
+#  License text for the above reference.)
+  
+
+  
+if(NOT SDL2_MIXER_INCLUDE_DIR AND SDL2MIXER_INCLUDE_DIR)
+  
+  set(SDL2_MIXER_INCLUDE_DIR ${SDL2MIXER_INCLUDE_DIR} CACHE PATH "directory cache
+  
+entry initialized from old variable name")
+  
+endif()
+  
+find_path(SDL2_MIXER_INCLUDE_DIR SDL_mixer.h
+  
+  HINTS
+  
+    ENV SDL2MIXERDIR
+  
+    ENV SDL2DIR
+  
+    ${CMAKE_SOURCE_DIR}/dep/
+  
+  PATH_SUFFIXES SDL2
+  
+                # path suffixes to search inside ENV{SDL2DIR}
+  
+                include/SDL2 include
+  
+)
+  
+
+  
+if(CMAKE_SIZEOF_VOID_P EQUAL 8)
+  
+  set(VC_LIB_PATH_SUFFIX lib/x64)
+  
+else()
+  
+  set(VC_LIB_PATH_SUFFIX lib/x86)
+  
+endif()
+  
+
+  
+if(NOT SDL2_MIXER_LIBRARY AND SDL2MIXER_LIBRARY)
+  
+  set(SDL2_MIXER_LIBRARY ${SDL2MIXER_LIBRARY} CACHE FILEPATH "file cache entry
+  
+initialized from old variable name")
+  
+endif()
+  
+find_library(SDL2_MIXER_LIBRARY
+  
+  NAMES SDL2_mixer
+  
+  HINTS
+  
+    ENV SDL2MIXERDIR
+  
+    ENV SDL2DIR
+  
+    ${CMAKE_SOURCE_DIR}/dep/
+  
+  PATH_SUFFIXES lib ${VC_LIB_PATH_SUFFIX}
+  
+)
+  
+
+  
+set(SDL2_MIXER_LIBRARIES ${SDL2_MIXER_LIBRARY})
+  
+set(SDL2_MIXER_INCLUDE_DIRS ${SDL2_MIXER_INCLUDE_DIR})
+  
+
+  
+include(FindPackageHandleStandardArgs)
+  
+
+  
+FIND_PACKAGE_HANDLE_STANDARD_ARGS(SDL2_mixer
+  
+                                  REQUIRED_VARS SDL2_MIXER_LIBRARIES SDL2_MIXER_INCLUDE_DIRS
+  
+                                  VERSION_VAR SDL2_MIXER_VERSION_STRING)
+  
+
+  
+# for backward compatiblity
+  
+set(SDL2MIXER_LIBRARY ${SDL2_MIXER_LIBRARIES})
+  
+set(SDL2MIXER_INCLUDE_DIR ${SDL2_MIXER_INCLUDE_DIRS})
+  
+set(SDL2MIXER_FOUND ${SDL2_MIXER_FOUND})
+  
+
+  
+mark_as_advanced(SDL2_MIXER_LIBRARY SDL2_MIXER_INCLUDE_DIR)
diff --git a/CMakeModules/FindSDL2_ttf.cmake b/CMakeModules/FindSDL2_ttf.cmake
@@ -0,0 +1,96 @@
+  
+#.rst:
+  
+# FindSDL2_ttf
+  
+# -----------
+  
+#
+  
+# Locate SDL2_ttf library
+  
+#
+  
+# This module defines:
+  
+#
+  
+# ::
+  
+#
+  
+#   SDL2_TTF_LIBRARIES, the name of the library to link against
+  
+#   SDL2_TTF_INCLUDE_DIRS, where to find the headers
+  
+#   SDL2_TTF_FOUND, if false, do not try to link against
+  
+#   SDL2_TTF_VERSION_STRING - human-readable string containing the version of SDL2_ttf
+  
+#
+  
+#
+  
+#
+  
+# For backward compatiblity the following variables are also set:
+  
+#
+  
+# ::
+  
+#
+  
+#   SDL2TTF_LIBRARY (same value as SDL2_TTF_LIBRARIES)
+  
+#   SDL2TTF_INCLUDE_DIR (same value as SDL2_TTF_INCLUDE_DIRS)
+  
+#   SDL2TTF_FOUND (same value as SDL2_TTF_FOUND)
+  
+#
+  
+#
+  
+#
+  
+# $SDL2DIR is an environment variable that would correspond to the
+  
+# ./configure --prefix=$SDL2DIR used in building SDL2.
+  
+#
+  
+# Created by Eric Wing.  This was influenced by the FindSDL2.cmake
+  
+# module, but with modifications to recognize OS X frameworks and
+  
+# additional Unix paths (FreeBSD, etc).
+  
+
+  
+#=============================================================================
+  
+# Copyright 2005-2009 Kitware, Inc.
+  
+# Copyright 2012 Benjamin Eikel
+  
+#
+  
+# Distributed under the OSI-approved BSD License (the "License");
+  
+# see accompanying file Copyright.txt for details.
+  
+#
+  
+# This software is distributed WITHOUT ANY WARRANTY; without even the
+  
+# implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+  
+# See the License for more information.
+  
+#=============================================================================
+  
+# (To distribute this file outside of CMake, substitute the full
+  
+#  License text for the above reference.)
+  
+
+  
+if(NOT SDL2_TTF_INCLUDE_DIR AND SDL2TTF_INCLUDE_DIR)
+  
+  set(SDL2_TTF_INCLUDE_DIR ${SDL2TTF_INCLUDE_DIR} CACHE PATH "directory cache
+  
+entry initialized from old variable name")
+  
+endif()
+  
+find_path(SDL2_TTF_INCLUDE_DIR SDL_ttf.h
+  
+  HINTS
+  
+    ENV SDL2TTFDIR
+  
+    ENV SDL2DIR
+  
+    ${CMAKE_SOURCE_DIR}/dep/
+  
+  PATH_SUFFIXES SDL2
+  
+                # path suffixes to search inside ENV{SDL2DIR}
+  
+                include/SDL2 include
+  
+)
+  
+
+  
+if(CMAKE_SIZEOF_VOID_P EQUAL 8)
+  
+  set(VC_LIB_PATH_SUFFIX lib/x64)
+  
+else()
+  
+  set(VC_LIB_PATH_SUFFIX lib/x86)
+  
+endif()
+  
+
+  
+if(NOT SDL2_TTF_LIBRARY AND SDL2TTF_LIBRARY)
+  
+  set(SDL2_TTF_LIBRARY ${SDL2TTF_LIBRARY} CACHE FILEPATH "file cache entry
+  
+initialized from old variable name")
+  
+endif()
+  
+find_library(SDL2_TTF_LIBRARY
+  
+  NAMES SDL2_ttf
+  
+  HINTS
+  
+    ENV SDL2TTFDIR
+  
+    ENV SDL2DIR
+  
+    ${CMAKE_SOURCE_DIR}/dep/
+  
+  PATH_SUFFIXES lib ${VC_LIB_PATH_SUFFIX}
+  
+)
+  
+
+  
+set(SDL2_TTF_LIBRARIES ${SDL2_TTF_LIBRARY})
+  
+set(SDL2_TTF_INCLUDE_DIRS ${SDL2_TTF_INCLUDE_DIR})
+  
+
+  
+include(FindPackageHandleStandardArgs)
+  
+
+  
+FIND_PACKAGE_HANDLE_STANDARD_ARGS(SDL2_ttf
+  
+                                  REQUIRED_VARS SDL2_TTF_LIBRARIES SDL2_TTF_INCLUDE_DIRS
+  
+                                  VERSION_VAR SDL2_TTF_VERSION_STRING)
+  
+
+  
+# for backward compatiblity
+  
+set(SDL2TTF_LIBRARY ${SDL2_TTF_LIBRARIES})
+  
+set(SDL2TTF_INCLUDE_DIR ${SDL2_TTF_INCLUDE_DIRS})
+  
+set(SDL2TTF_FOUND ${SDL2_TTF_FOUND})
+  
+
+  
+mark_as_advanced(SDL2_TTF_LIBRARY SDL2_TTF_INCLUDE_DIR)
diff --git a/CMakeModules/GetGitRevisionDescription.cmake b/CMakeModules/GetGitRevisionDescription.cmake
@@ -0,0 +1,130 @@
+  
+# - Returns a version string from Git
+  
+#
+  
+# These functions force a re-configure on each git commit so that you can
+  
+# trust the values of the variables in your build system.
+  
+#
+  
+#  get_git_head_revision(<refspecvar> <hashvar> [<additional arguments to git describe> ...])
+  
+#
+  
+# Returns the refspec and sha hash of the current head revision
+  
+#
+  
+#  git_describe(<var> [<additional arguments to git describe> ...])
+  
+#
+  
+# Returns the results of git describe on the source tree, and adjusting
+  
+# the output so that it tests false if an error occurs.
+  
+#
+  
+#  git_get_exact_tag(<var> [<additional arguments to git describe> ...])
+  
+#
+  
+# Returns the results of git describe --exact-match on the source tree,
+  
+# and adjusting the output so that it tests false if there was no exact
+  
+# matching tag.
+  
+#
+  
+# Requires CMake 2.6 or newer (uses the 'function' command)
+  
+#
+  
+# Original Author:
+  
+# 2009-2010 Ryan Pavlik <rpavlik@iastate.edu> <abiryan@ryand.net>
+  
+# http://academic.cleardefinition.com
+  
+# Iowa State University HCI Graduate Program/VRAC
+  
+#
+  
+# Copyright Iowa State University 2009-2010.
+  
+# Distributed under the Boost Software License, Version 1.0.
+  
+# (See accompanying file LICENSE_1_0.txt or copy at
+  
+# http://www.boost.org/LICENSE_1_0.txt)
+  
+
+  
+if(__get_git_revision_description)
+  
+	return()
+  
+endif()
+  
+set(__get_git_revision_description YES)
+  
+
+  
+# We must run the following at "include" time, not at function call time,
+  
+# to find the path to this module rather than the path to a calling list file
+  
+get_filename_component(_gitdescmoddir ${CMAKE_CURRENT_LIST_FILE} PATH)
+  
+
+  
+function(get_git_head_revision _refspecvar _hashvar)
+  
+	set(GIT_PARENT_DIR "${CMAKE_CURRENT_SOURCE_DIR}")
+  
+	set(GIT_DIR "${GIT_PARENT_DIR}/.git")
+  
+	while(NOT EXISTS "${GIT_DIR}")	# .git dir not found, search parent directories
+  
+		set(GIT_PREVIOUS_PARENT "${GIT_PARENT_DIR}")
+  
+		get_filename_component(GIT_PARENT_DIR ${GIT_PARENT_DIR} PATH)
+  
+		if(GIT_PARENT_DIR STREQUAL GIT_PREVIOUS_PARENT)
+  
+			# We have reached the root directory, we are not in git
+  
+			set(${_refspecvar} "GITDIR-NOTFOUND" PARENT_SCOPE)
+  
+			set(${_hashvar} "GITDIR-NOTFOUND" PARENT_SCOPE)
+  
+			return()
+  
+		endif()
+  
+		set(GIT_DIR "${GIT_PARENT_DIR}/.git")
+  
+	endwhile()
+  
+	# check if this is a submodule
+  
+	if(NOT IS_DIRECTORY ${GIT_DIR})
+  
+		file(READ ${GIT_DIR} submodule)
+  
+		string(REGEX REPLACE "gitdir: (.*)\n$" "\\1" GIT_DIR_RELATIVE ${submodule})
+  
+		get_filename_component(SUBMODULE_DIR ${GIT_DIR} PATH)
+  
+		get_filename_component(GIT_DIR ${SUBMODULE_DIR}/${GIT_DIR_RELATIVE} ABSOLUTE)
+  
+	endif()
+  
+	set(GIT_DATA "${CMAKE_CURRENT_BINARY_DIR}/CMakeFiles/git-data")
+  
+	if(NOT EXISTS "${GIT_DATA}")
+  
+		file(MAKE_DIRECTORY "${GIT_DATA}")
+  
+	endif()
+  
+
+  
+	if(NOT EXISTS "${GIT_DIR}/HEAD")
+  
+		return()
+  
+	endif()
+  
+	set(HEAD_FILE "${GIT_DATA}/HEAD")
+  
+	configure_file("${GIT_DIR}/HEAD" "${HEAD_FILE}" COPYONLY)
+  
+
+  
+	configure_file("${_gitdescmoddir}/GetGitRevisionDescription.cmake.in"
+  
+		"${GIT_DATA}/grabRef.cmake"
+  
+		@ONLY)
+  
+	include("${GIT_DATA}/grabRef.cmake")
+  
+
+  
+	set(${_refspecvar} "${HEAD_REF}" PARENT_SCOPE)
+  
+	set(${_hashvar} "${HEAD_HASH}" PARENT_SCOPE)
+  
+endfunction()
+  
+
+  
+function(git_describe _var)
+  
+	if(NOT GIT_FOUND)
+  
+		find_package(Git QUIET)
+  
+	endif()
+  
+	get_git_head_revision(refspec hash)
+  
+	if(NOT GIT_FOUND)
+  
+		set(${_var} "GIT-NOTFOUND" PARENT_SCOPE)
+  
+		return()
+  
+	endif()
+  
+	if(NOT hash)
+  
+		set(${_var} "HEAD-HASH-NOTFOUND" PARENT_SCOPE)
+  
+		return()
+  
+	endif()
+  
+
+  
+	# TODO sanitize
+  
+	#if((${ARGN}" MATCHES "&&") OR
+  
+	#	(ARGN MATCHES "||") OR
+  
+	#	(ARGN MATCHES "\\;"))
+  
+	#	message("Please report the following error to the project!")
+  
+	#	message(FATAL_ERROR "Looks like someone's doing something nefarious with git_describe! Passed arguments ${ARGN}")
+  
+	#endif()
+  
+
+  
+	#message(STATUS "Arguments to execute_process: ${ARGN}")
+  
+
+  
+	execute_process(COMMAND
+  
+		"${GIT_EXECUTABLE}"
+  
+		describe
+  
+		${hash}
+  
+		${ARGN}
+  
+		WORKING_DIRECTORY
+  
+		"${CMAKE_SOURCE_DIR}"
+  
+		RESULT_VARIABLE
+  
+		res
+  
+		OUTPUT_VARIABLE
+  
+		out
+  
+		ERROR_QUIET
+  
+		OUTPUT_STRIP_TRAILING_WHITESPACE)
+  
+	if(NOT res EQUAL 0)
+  
+		set(out "${out}-${res}-NOTFOUND")
+  
+	endif()
+  
+
+  
+	set(${_var} "${out}" PARENT_SCOPE)
+  
+endfunction()
+  
+
+  
+function(git_get_exact_tag _var)
+  
+	git_describe(out --exact-match ${ARGN})
+  
+	set(${_var} "${out}" PARENT_SCOPE)
+  
+endfunction()