diff options
| author | Nao Pross <naopross@thearcway.org> | 2018-02-16 21:55:10 +0100 |
|---|---|---|
| committer | Nao Pross <naopross@thearcway.org> | 2018-02-16 21:55:10 +0100 |
| commit | bdf602f48194058d998909a233556cc57bac303e (patch) | |
| tree | 20827387e7c7785329783b1168b0214fc7fc0f52 | |
| parent | Merge branch 'dev' of ssh://git.thearcway.org:2222/naopross/subconscious into... (diff) | |
| download | Subconscious-old-bdf602f48194058d998909a233556cc57bac303e.tar.gz Subconscious-old-bdf602f48194058d998909a233556cc57bac303e.zip | |
Add cpack directive and update README
| -rw-r--r-- | CMakeLists.txt | 7 | ||||
| -rw-r--r-- | README.md | 20 | ||||
| -rw-r--r-- | src/main/resources/items/items_template.xml | 14 |
3 files changed, 36 insertions, 5 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt index 6b81e25..91774af 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -34,3 +34,10 @@ endif () # install target install(TARGETS ${EXECUTABLE_NAME} DESTINATION bin) + +# CPack packaging +include(InstallRequiredSystemLibraries) +# set(CPACK_RESOURCES_FILE_LICENSE "${CMAKE_SOURCE_DIR}/COPYING") +set(CPACK_PACKAGE_VERSION_MAJOR "${subconscious_VERSION_MAJOR}") +set(CPACK_PACKAGE_VERSION_MINOR "${subconscious_VERSION_MINOR}") +include(CPack) @@ -5,3 +5,23 @@ ``` gradle libsfml-dev ``` + +# Build +### With Gradle +``` +gradle mainExecutable +``` + +### With CMake +On Debian the `libfsml-dev` package does not installs itself in +`/usr/share/cmake-x.x/Modules` and so it must be done manually. +``` +sudo cp /usr/share/SFML/cmake/Modules/FindSFML.cmake \ + /usr/share/cmake-3.7/Modules +``` + +``` +cd build +cmake .. +make +``` diff --git a/src/main/resources/items/items_template.xml b/src/main/resources/items/items_template.xml index 0810f45..19c9264 100644 --- a/src/main/resources/items/items_template.xml +++ b/src/main/resources/items/items_template.xml @@ -4,7 +4,7 @@ Available item types: - weapon - medicine - food ---!> +--> <item type=""> <name></name> @@ -12,28 +12,31 @@ Available item types: </item> + <item type="stick"> - <!-- item --!> + <!-- item --> <name></name> <maxAmount></maxAmount> - <!-- stick --!> + <!-- stick --> <requiredLevel></reqiredLevel> <requiredClass>Wizard</requiredClass> </item> + <item type="medicine"> - <!-- item --!> + <!-- item --> <name></name> <maxAmount></maxAmount> - <!-- medicine --!> + <!-- medicine --> <heal></heal> <requiredLevel></reqiredLevel> </item> + <item type="food"> <!-- item --!> <name></name> @@ -44,6 +47,7 @@ Available item types: <\item> + <item type="weapon"> <!-- item --!> <name></name> |