diff options
| author | Paramat <paramat@users.noreply.github.com> | 2019-02-23 20:24:59 +0000 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-02-23 20:24:59 +0000 |
| commit | ae1caba6aaa6f0a13e70f195f371fd4e7a378491 (patch) | |
| tree | 50b7708b99508e37cf28018da1e6cb4100da3497 /builtin | |
| parent | eeb67627ec75f9c42e089b5e90686017b7eb62c8 (diff) | |
| download | minetest-ae1caba6aaa6f0a13e70f195f371fd4e7a378491.tar.gz minetest-ae1caba6aaa6f0a13e70f195f371fd4e7a378491.tar.bz2 minetest-ae1caba6aaa6f0a13e70f195f371fd4e7a378491.zip | |
Update minetest.conf.example and settings_translation_file.cpp (#8278)
Diffstat (limited to 'builtin')
| -rw-r--r-- | builtin/mainmenu/dlg_settings_advanced.lua | 5 | ||||
| -rw-r--r-- | builtin/mainmenu/generate_from_settingtypes.lua | 3 |
2 files changed, 6 insertions, 2 deletions
diff --git a/builtin/mainmenu/dlg_settings_advanced.lua b/builtin/mainmenu/dlg_settings_advanced.lua index cbeb6fee2..bff36d8cb 100644 --- a/builtin/mainmenu/dlg_settings_advanced.lua +++ b/builtin/mainmenu/dlg_settings_advanced.lua @@ -1072,7 +1072,8 @@ function create_adv_settings_dlg() return dlg end --- Uncomment to generate minetest.conf.example and settings_translation_file.cpp --- For RUN_IN_PLACE the generated files may appear in the bin folder +-- Uncomment to generate 'minetest.conf.example' and 'settings_translation_file.cpp'. +-- For RUN_IN_PLACE the generated files may appear in the 'bin' folder. +-- See comment and alternative line at the end of 'generate_from_settingtypes.lua'. --assert(loadfile(core.get_builtin_path().."mainmenu"..DIR_DELIM.."generate_from_settingtypes.lua"))(parse_config_file(true, false)) diff --git a/builtin/mainmenu/generate_from_settingtypes.lua b/builtin/mainmenu/generate_from_settingtypes.lua index 25cc44606..43fc57bb9 100644 --- a/builtin/mainmenu/generate_from_settingtypes.lua +++ b/builtin/mainmenu/generate_from_settingtypes.lua @@ -121,6 +121,9 @@ file:write(create_minetest_conf_example()) file:close() file = assert(io.open("src/settings_translation_file.cpp", "w")) +-- If 'minetest.conf.example' appears in the 'bin' folder, the line below may have to be +-- used instead. The file will also appear in the 'bin' folder. +--file = assert(io.open("settings_translation_file.cpp", "w")) file:write(create_translation_file()) file:close() |