provide the minetest game as submodule, so we can work unified in sync
* change README to my repos * change git ignore to include necessary * aded one module the minetest game * set default game to minetest
This commit is contained in:
parent
ec10d728b6
commit
de8b12ef5d
1
.gitignore
vendored
1
.gitignore
vendored
@ -37,6 +37,7 @@ gtags.files
|
|||||||
/bin/
|
/bin/
|
||||||
/games/*
|
/games/*
|
||||||
!/games/minimal/
|
!/games/minimal/
|
||||||
|
!/games/minetest/
|
||||||
/cache
|
/cache
|
||||||
/textures/*
|
/textures/*
|
||||||
!/textures/base/
|
!/textures/base/
|
||||||
|
3
.gitmodules
vendored
Normal file
3
.gitmodules
vendored
Normal file
@ -0,0 +1,3 @@
|
|||||||
|
[submodule "games/minetest"]
|
||||||
|
path = games/minetest
|
||||||
|
url = https://codeberg.org/minenux/minetest-game-minetest.git
|
27
README.md
27
README.md
@ -114,14 +114,10 @@ Locations:
|
|||||||
|
|
||||||
Where each location is on each platform:
|
Where each location is on each platform:
|
||||||
|
|
||||||
* Windows .zip / RUN_IN_PLACE source:
|
* Others OS's / RUN_IN_PLACE source:
|
||||||
* `bin` = `bin`
|
* `bin` = `bin`
|
||||||
* `share` = `.`
|
* `share` = `.`
|
||||||
* `user` = `.`
|
* `user` = `.`
|
||||||
* Windows installed:
|
|
||||||
* `bin` = `C:\Program Files\Minetest5\bin (Depends on the install location)`
|
|
||||||
* `share` = `C:\Program Files\Minetest5 (Depends on the install location)`
|
|
||||||
* `user` = `%APPDATA%\Minetest5`
|
|
||||||
* Linux installed:
|
* Linux installed:
|
||||||
* `bin` = `/usr/bin`
|
* `bin` = `/usr/bin`
|
||||||
* `share` = `/usr/share/minetest5`
|
* `share` = `/usr/share/minetest5`
|
||||||
@ -142,7 +138,7 @@ Configuration file
|
|||||||
- A specific file can be specified on the command line:
|
- A specific file can be specified on the command line:
|
||||||
`--config <path-to-file>`
|
`--config <path-to-file>`
|
||||||
- A run-in-place build will look for the configuration file in
|
- A run-in-place build will look for the configuration file in
|
||||||
`location_of_exe/../minetest5.conf` and also `location_of_exe/../../minetest5.conf`
|
`location_of_bin/../minetest5.conf` and also `location_of_bin/../../minetest5.conf`
|
||||||
|
|
||||||
Command-line options
|
Command-line options
|
||||||
--------------------
|
--------------------
|
||||||
@ -196,30 +192,30 @@ For Fedora users:
|
|||||||
|
|
||||||
Download source (this is the URL to the latest of source repository, which might not work at all times) using Git:
|
Download source (this is the URL to the latest of source repository, which might not work at all times) using Git:
|
||||||
|
|
||||||
git clone --depth 1 https://github.com/minetest/minetest.git
|
git clone --recursive https://codeberg.org/minenux/minetest-engine.git minetest
|
||||||
cd minetest
|
cd minetest
|
||||||
|
|
||||||
Download minetest_game (otherwise only the "Minimal development test" game is available) using Git:
|
Download minetest_game (otherwise only the "Minimal development test" game is available) using Git:
|
||||||
|
|
||||||
git clone --depth 1 https://github.com/minetest/minetest_game.git games/minetest_game
|
git submodule init && git submodule update --recursive
|
||||||
|
|
||||||
Download source, without using Git:
|
Download source, without using Git:
|
||||||
|
|
||||||
wget https://github.com/minetest/minetest/archive/master.tar.gz
|
wget https://codeberg.org/minenux/minetest-engine/archive/stable-5.2.tar.gz
|
||||||
tar xf master.tar.gz
|
tar xf stable-5.2.tar.gz
|
||||||
cd minetest-master
|
cd stable-5.2
|
||||||
|
|
||||||
Download minetest_game, without using Git:
|
Download minetest_game, without using Git:
|
||||||
|
|
||||||
cd games/
|
cd games/
|
||||||
wget https://github.com/minetest/minetest_game/archive/master.tar.gz
|
wget https://codeberg.org/minenux/minetest-game-minetest/archive/stable-5.2.tar.gz
|
||||||
tar xf master.tar.gz
|
tar xf stable-5.2.tar.gz
|
||||||
mv minetest_game-master minetest_game
|
mv minetest-game-minetest_stable-5.2 minetest
|
||||||
cd ..
|
cd ..
|
||||||
|
|
||||||
#### Build
|
#### Build
|
||||||
|
|
||||||
Build a version that runs directly from the source directory:
|
Build a version that runs directly from the source directory there program are:
|
||||||
|
|
||||||
cmake . -DRUN_IN_PLACE=TRUE
|
cmake . -DRUN_IN_PLACE=TRUE
|
||||||
make -j$(nproc)
|
make -j$(nproc)
|
||||||
@ -324,7 +320,6 @@ Library specific options:
|
|||||||
|
|
||||||
Docker
|
Docker
|
||||||
------
|
------
|
||||||
We provide Minetest server Docker images using the GitLab mirror registry.
|
|
||||||
|
|
||||||
Images are built on each commit and available using the following tag scheme:
|
Images are built on each commit and available using the following tag scheme:
|
||||||
|
|
||||||
|
1
games/minetest
Submodule
1
games/minetest
Submodule
@ -0,0 +1 @@
|
|||||||
|
Subproject commit 0e0ea932efc47ec4658b601445b7520e410ec727
|
@ -345,7 +345,7 @@ void set_default_settings(Settings *settings)
|
|||||||
settings->setDefault("max_simultaneous_block_sends_per_client", "40");
|
settings->setDefault("max_simultaneous_block_sends_per_client", "40");
|
||||||
settings->setDefault("time_send_interval", "5");
|
settings->setDefault("time_send_interval", "5");
|
||||||
|
|
||||||
settings->setDefault("default_game", lowercase(PROJECT_NAME) + std::to_string(VERSION_MAJOR));
|
settings->setDefault("default_game", lowercase(PROJECT_NAME) + std::to_string(VERSION_MAJOR)); // minetst 5 is renamed in cmake at install as minetest
|
||||||
settings->setDefault("motd", "");
|
settings->setDefault("motd", "");
|
||||||
settings->setDefault("max_users", "15");
|
settings->setDefault("max_users", "15");
|
||||||
settings->setDefault("creative_mode", "false");
|
settings->setDefault("creative_mode", "false");
|
||||||
|
Loading…
x
Reference in New Issue
Block a user