doc updates; CMake works reasonably well now.

This commit is contained in:
Perttu Ahola 2011-01-08 17:45:26 +02:00
parent 7862a6f68d
commit d435dedb89
3 changed files with 43 additions and 14 deletions

@ -29,10 +29,32 @@ MESSAGE(STATUS "BUILD_DATE = ${BUILD_DATE}")
# This is done here so that relative search paths are more reasnable # This is done here so that relative search paths are more reasnable
find_package(Irrlicht) find_package(Irrlicht)
# This way the CMakeLists.txt file in src/ is processed #
add_subdirectory(src) # Installation
#
install(FILES "doc/README.txt" DESTINATION "share/minetest/doc") if(WIN32)
set(DATADIR "data")
set(BINDIR "bin")
set(DOCDIR "doc")
elseif(APPLE)
set(DATADIR "share/minetest")
set(BINDIR "bin")
set(DOCDIR "share/doc/minetest")
elseif(UNIX)
set(DATADIR "share/minetest")
set(BINDIR "bin")
set(DOCDIR "share/doc/minetest")
endif()
install(FILES "doc/README.txt" DESTINATION "${DOCDIR}")
install(FILES "minetest.conf.example" DESTINATION "${DOCDIR}")
#
# Subdirectories
#
add_subdirectory(src)
# CPack # CPack

@ -19,6 +19,16 @@ Public servers:
Controls: Controls:
- See the in-game pause menu - See the in-game pause menu
Map directory:
- Map is stored in a directory, which can be removed to generate a new map.
- There is na command-line option for it: --map-dir
- As default, it is located in:
../map
- Otherwise something like this:
Windows: C:\Documents and Settings\user\Application Data\minetest\map
Linux: ~/.minetest/map
OS X: ~/Library/Application Support/map
Configuration file: Configuration file:
- An optional configuration file can be used. See minetest.conf.example. - An optional configuration file can be used. See minetest.conf.example.
- Path to file can be passed as a parameter to the executable: - Path to file can be passed as a parameter to the executable:
@ -55,6 +65,14 @@ Compiling on GNU/Linux:
$ minetest $ minetest
- Install to home directory:
$ cd whatever/minetest
$ cmake . -DCMAKE_INSTALL_PREFIX=~/minetest_install
$ make -j2
$ make install
$ ~/minetest_install/bin/minetest
- For running in the source directory: - For running in the source directory:
$ cd whatever/minetest $ cd whatever/minetest
$ cmake . -DRUN_IN_PLACE $ cmake . -DRUN_IN_PLACE

@ -161,17 +161,6 @@ endif( UNIX )
# Installation # Installation
# #
if(WIN32)
set(DATADIR "data")
set(BINDIR "bin")
elseif(APPLE)
set(DATADIR "share/minetest")
set(BINDIR "bin")
elseif(UNIX)
set(DATADIR "share/minetest")
set(BINDIR "bin")
endif()
if(BUILD_CLIENT) if(BUILD_CLIENT)
install(TARGETS minetest DESTINATION ${BINDIR}) install(TARGETS minetest DESTINATION ${BINDIR})