Move files to subdirectories (#6599)

* Move files around
This commit is contained in:
Vitaliy 2017-11-09 01:56:20 +03:00 committed by Loïc Blot
parent fc9747eb4b
commit 20a85d76d9
118 changed files with 236 additions and 221 deletions

@ -114,7 +114,7 @@ LOCAL_C_INCLUDES := \
LOCAL_SRC_FILES := \
jni/src/ban.cpp \
jni/src/camera.cpp \
jni/src/cavegen.cpp \
jni/src/mapgen/cavegen.cpp \
jni/src/chat.cpp \
jni/src/client.cpp \
jni/src/clientenvironment.cpp \
@ -132,13 +132,13 @@ LOCAL_SRC_FILES := \
jni/src/content_sao.cpp \
jni/src/convert_json.cpp \
jni/src/craftdef.cpp \
jni/src/database-dummy.cpp \
jni/src/database-files.cpp \
jni/src/database-sqlite3.cpp \
jni/src/database.cpp \
jni/src/database/database-dummy.cpp \
jni/src/database/database-files.cpp \
jni/src/database/database-sqlite3.cpp \
jni/src/database/database.cpp \
jni/src/debug.cpp \
jni/src/defaultsettings.cpp \
jni/src/dungeongen.cpp \
jni/src/mapgen/dungeongen.cpp \
jni/src/emerge.cpp \
jni/src/environment.cpp \
jni/src/face_position_cache.cpp \
@ -148,20 +148,20 @@ LOCAL_SRC_FILES := \
jni/src/game.cpp \
jni/src/genericobject.cpp \
jni/src/gettext.cpp \
jni/src/guiChatConsole.cpp \
jni/src/guiEditBoxWithScrollbar.cpp \
jni/src/guiEngine.cpp \
jni/src/guiPathSelectMenu.cpp \
jni/src/guiFormSpecMenu.cpp \
jni/src/guiKeyChangeMenu.cpp \
jni/src/guiPasswordChange.cpp \
jni/src/guiTable.cpp \
jni/src/gui/guiChatConsole.cpp \
jni/src/gui/guiEditBoxWithScrollbar.cpp \
jni/src/gui/guiEngine.cpp \
jni/src/gui/guiPathSelectMenu.cpp \
jni/src/gui/guiFormSpecMenu.cpp \
jni/src/gui/guiKeyChangeMenu.cpp \
jni/src/gui/guiPasswordChange.cpp \
jni/src/gui/guiTable.cpp \
jni/src/guiscalingfilter.cpp \
jni/src/guiVolumeChange.cpp \
jni/src/gui/guiVolumeChange.cpp \
jni/src/httpfetch.cpp \
jni/src/hud.cpp \
jni/src/imagefilters.cpp \
jni/src/intlGUIEditBox.cpp \
jni/src/gui/intlGUIEditBox.cpp \
jni/src/inventory.cpp \
jni/src/inventorymanager.cpp \
jni/src/itemdef.cpp \
@ -175,24 +175,24 @@ LOCAL_SRC_FILES := \
jni/src/map_settings_manager.cpp \
jni/src/mapblock.cpp \
jni/src/mapblock_mesh.cpp \
jni/src/mapgen.cpp \
jni/src/mapgen_carpathian.cpp \
jni/src/mapgen_flat.cpp \
jni/src/mapgen_fractal.cpp \
jni/src/mapgen_singlenode.cpp \
jni/src/mapgen_v5.cpp \
jni/src/mapgen_v6.cpp \
jni/src/mapgen_v7.cpp \
jni/src/mapgen_valleys.cpp \
jni/src/mapgen/mapgen.cpp \
jni/src/mapgen/mapgen_carpathian.cpp \
jni/src/mapgen/mapgen_flat.cpp \
jni/src/mapgen/mapgen_fractal.cpp \
jni/src/mapgen/mapgen_singlenode.cpp \
jni/src/mapgen/mapgen_v5.cpp \
jni/src/mapgen/mapgen_v6.cpp \
jni/src/mapgen/mapgen_v7.cpp \
jni/src/mapgen/mapgen_valleys.cpp \
jni/src/mapnode.cpp \
jni/src/mapsector.cpp \
jni/src/mesh.cpp \
jni/src/mesh_generator_thread.cpp \
jni/src/metadata.cpp \
jni/src/mg_biome.cpp \
jni/src/mg_decoration.cpp \
jni/src/mg_ore.cpp \
jni/src/mg_schematic.cpp \
jni/src/mapgen/mg_biome.cpp \
jni/src/mapgen/mg_decoration.cpp \
jni/src/mapgen/mg_ore.cpp \
jni/src/mapgen/mg_schematic.cpp \
jni/src/minimap.cpp \
jni/src/mods.cpp \
jni/src/nameidmapping.cpp \
@ -228,7 +228,7 @@ LOCAL_SRC_FILES := \
jni/src/subgame.cpp \
jni/src/tileanimation.cpp \
jni/src/tool.cpp \
jni/src/treegen.cpp \
jni/src/mapgen/treegen.cpp \
jni/src/version.cpp \
jni/src/voxel.cpp \
jni/src/voxelalgorithms.cpp \

@ -371,6 +371,9 @@ add_custom_target(GenerateVersion
add_subdirectory(threading)
add_subdirectory(database)
add_subdirectory(gui)
add_subdirectory(mapgen)
add_subdirectory(network)
add_subdirectory(script)
add_subdirectory(unittest)
@ -378,8 +381,9 @@ add_subdirectory(util)
add_subdirectory(irrlicht_changes)
set(common_SRCS
${database_SRCS}
${mapgen_SRCS}
ban.cpp
cavegen.cpp
chat.cpp
clientiface.cpp
collision.cpp
@ -388,16 +392,8 @@ set(common_SRCS
content_sao.cpp
convert_json.cpp
craftdef.cpp
database-dummy.cpp
database-files.cpp
database-leveldb.cpp
database-postgresql.cpp
database-redis.cpp
database-sqlite3.cpp
database.cpp
debug.cpp
defaultsettings.cpp
dungeongen.cpp
emerge.cpp
environment.cpp
face_position_cache.cpp
@ -414,22 +410,9 @@ set(common_SRCS
map.cpp
map_settings_manager.cpp
mapblock.cpp
mapgen.cpp
mapgen_carpathian.cpp
mapgen_flat.cpp
mapgen_fractal.cpp
mapgen_singlenode.cpp
mapgen_v5.cpp
mapgen_v6.cpp
mapgen_v7.cpp
mapgen_valleys.cpp
mapnode.cpp
mapsector.cpp
metadata.cpp
mg_biome.cpp
mg_decoration.cpp
mg_ore.cpp
mg_schematic.cpp
modchannels.cpp
mods.cpp
nameidmapping.cpp
@ -462,7 +445,6 @@ set(common_SRCS
tileanimation.cpp
tool.cpp
translation.cpp
treegen.cpp
version.cpp
voxel.cpp
voxelalgorithms.cpp
@ -503,6 +485,7 @@ endif(BUILD_CLIENT)
set(client_SRCS
${client_SRCS}
${common_SRCS}
${gui_SRCS}
${sound_SRCS}
${client_network_SRCS}
${client_irrlicht_changes_SRCS}
@ -520,19 +503,9 @@ set(client_SRCS
filecache.cpp
fontengine.cpp
game.cpp
guiChatConsole.cpp
guiEditBoxWithScrollbar.cpp
guiEngine.cpp
guiPathSelectMenu.cpp
guiFormSpecMenu.cpp
guiKeyChangeMenu.cpp
guiPasswordChange.cpp
guiscalingfilter.cpp
guiTable.cpp
guiVolumeChange.cpp
hud.cpp
imagefilters.cpp
intlGUIEditBox.cpp
keycode.cpp
localplayer.cpp
main.cpp

@ -47,7 +47,7 @@ with this program; if not, write to the Free Software Foundation, Inc.,
#include "clientmap.h"
#include "clientmedia.h"
#include "version.h"
#include "database-sqlite3.h"
#include "database/database-sqlite3.h"
#include "serialization.h"
#include "guiscalingfilter.h"
#include "script/scripting_client.h"

@ -17,18 +17,18 @@ with this program; if not, write to the Free Software Foundation, Inc.,
51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
*/
#include "mainmenumanager.h"
#include "gui/mainmenumanager.h"
#include "clouds.h"
#include "server.h"
#include "filesys.h"
#include "guiMainMenu.h"
#include "gui/guiMainMenu.h"
#include "game.h"
#include "player.h"
#include "chat.h"
#include "gettext.h"
#include "profiler.h"
#include "serverlist.h"
#include "guiEngine.h"
#include "gui/guiEngine.h"
#include "fontengine.h"
#include "clientlauncher.h"
#include "version.h"

@ -20,7 +20,7 @@ with this program; if not, write to the Free Software Foundation, Inc.,
#include "util/numeric.h"
#include "inputhandler.h"
#include "mainmenumanager.h"
#include "gui/mainmenumanager.h"
bool MyEventReceiver::OnEvent(const SEvent &event)
{

@ -26,7 +26,7 @@ with this program; if not, write to the Free Software Foundation, Inc.,
#include "renderingengine.h"
#ifdef HAVE_TOUCHSCREENGUI
#include "touchscreengui.h"
#include "gui/touchscreengui.h"
#endif
class KeyList : private std::list<KeyPress>

@ -23,7 +23,7 @@ with this program; if not, write to the Free Software Foundation, Inc.,
#include "settings.h"
#include "gettime.h"
#include "porting.h"
#include "../util/string.h"
#include "util/string.h"
bool JoystickButtonCmb::isTriggered(const irr::SEvent::SJoystickEvent &ev) const
{

@ -0,0 +1,10 @@
set(database_SRCS
${CMAKE_CURRENT_SOURCE_DIR}/database.cpp
${CMAKE_CURRENT_SOURCE_DIR}/database-dummy.cpp
${CMAKE_CURRENT_SOURCE_DIR}/database-files.cpp
${CMAKE_CURRENT_SOURCE_DIR}/database-leveldb.cpp
${CMAKE_CURRENT_SOURCE_DIR}/database-postgresql.cpp
${CMAKE_CURRENT_SOURCE_DIR}/database-redis.cpp
${CMAKE_CURRENT_SOURCE_DIR}/database-sqlite3.cpp
PARENT_SCOPE
)

@ -34,10 +34,10 @@ with this program; if not, write to the Free Software Foundation, Inc.,
#include "log.h"
#include "map.h"
#include "mapblock.h"
#include "mg_biome.h"
#include "mg_ore.h"
#include "mg_decoration.h"
#include "mg_schematic.h"
#include "mapgen/mg_biome.h"
#include "mapgen/mg_ore.h"
#include "mapgen/mg_decoration.h"
#include "mapgen/mg_schematic.h"
#include "nodedef.h"
#include "profiler.h"
#include "scripting_server.h"

@ -24,7 +24,7 @@ with this program; if not, write to the Free Software Foundation, Inc.,
#include "network/networkprotocol.h"
#include "irr_v3d.h"
#include "util/container.h"
#include "mapgen.h" // for MapgenParams
#include "mapgen/mapgen.h" // for MapgenParams
#include "map.h"
#define BLOCK_EMERGE_ALLOW_GEN (1 << 0)

@ -39,12 +39,12 @@ with this program; if not, write to the Free Software Foundation, Inc.,
#include "log.h"
#include "filesys.h"
#include "gettext.h"
#include "guiChatConsole.h"
#include "guiFormSpecMenu.h"
#include "guiKeyChangeMenu.h"
#include "guiPasswordChange.h"
#include "guiVolumeChange.h"
#include "mainmenumanager.h"
#include "gui/guiChatConsole.h"
#include "gui/guiFormSpecMenu.h"
#include "gui/guiKeyChangeMenu.h"
#include "gui/guiPasswordChange.h"
#include "gui/guiVolumeChange.h"
#include "gui/mainmenumanager.h"
#include "mapblock.h"
#include "minimap.h"
#include "nodedef.h" // Needed for determining pointing to nodes

13
src/gui/CMakeLists.txt Normal file

@ -0,0 +1,13 @@
set(gui_SRCS
${CMAKE_CURRENT_SOURCE_DIR}/guiChatConsole.cpp
${CMAKE_CURRENT_SOURCE_DIR}/guiEditBoxWithScrollbar.cpp
${CMAKE_CURRENT_SOURCE_DIR}/guiEngine.cpp
${CMAKE_CURRENT_SOURCE_DIR}/guiFormSpecMenu.cpp
${CMAKE_CURRENT_SOURCE_DIR}/guiKeyChangeMenu.cpp
${CMAKE_CURRENT_SOURCE_DIR}/guiPasswordChange.cpp
${CMAKE_CURRENT_SOURCE_DIR}/guiPathSelectMenu.cpp
${CMAKE_CURRENT_SOURCE_DIR}/guiTable.cpp
${CMAKE_CURRENT_SOURCE_DIR}/guiVolumeChange.cpp
${CMAKE_CURRENT_SOURCE_DIR}/intlGUIEditBox.cpp
PARENT_SCOPE
)

@ -37,7 +37,7 @@ with this program; if not, write to the Free Software Foundation, Inc.,
#include "client/renderingengine.h"
#ifdef HAVE_TOUCHSCREENGUI
#include "touchscreengui.h"
#include "gui/touchscreengui.h"
#endif
Hud::Hud(gui::IGUIEnvironment *guienv, Client *client, LocalPlayer *player,

@ -32,7 +32,7 @@ with this program; if not, write to the Free Software Foundation, Inc.,
#include "quicktune.h"
#include "httpfetch.h"
#include "gameparams.h"
#include "database.h"
#include "database/database.h"
#include "config.h"
#include "player.h"
#include "porting.h"
@ -41,14 +41,14 @@ with this program; if not, write to the Free Software Foundation, Inc.,
#include "terminal_chat_console.h"
#endif
#ifndef SERVER
#include "guiMainMenu.h"
#include "gui/guiMainMenu.h"
#include "client/clientlauncher.h"
#include "guiEngine.h"
#include "mainmenumanager.h"
#include "gui/guiEngine.h"
#include "gui/mainmenumanager.h"
#endif
#ifdef HAVE_TOUCHSCREENGUI
#include "touchscreengui.h"
#include "gui/touchscreengui.h"
#endif
#if !defined(SERVER) && \

@ -37,24 +37,24 @@ with this program; if not, write to the Free Software Foundation, Inc.,
#include "environment.h"
#include "reflowscan.h"
#include "emerge.h"
#include "mapgen_v6.h"
#include "mg_biome.h"
#include "mapgen/mapgen_v6.h"
#include "mapgen/mg_biome.h"
#include "config.h"
#include "server.h"
#include "database.h"
#include "database-dummy.h"
#include "database-sqlite3.h"
#include "database/database.h"
#include "database/database-dummy.h"
#include "database/database-sqlite3.h"
#include "script/scripting_server.h"
#include <deque>
#include <queue>
#if USE_LEVELDB
#include "database-leveldb.h"
#include "database/database-leveldb.h"
#endif
#if USE_REDIS
#include "database-redis.h"
#include "database/database-redis.h"
#endif
#if USE_POSTGRESQL
#include "database-postgresql.h"
#include "database/database-postgresql.h"
#endif

@ -20,7 +20,7 @@ with this program; if not, write to the Free Software Foundation, Inc.,
#include "debug.h"
#include "filesys.h"
#include "log.h"
#include "mapgen.h"
#include "mapgen/mapgen.h"
#include "settings.h"
#include "map_settings_manager.h"

@ -30,7 +30,7 @@ with this program; if not, write to the Free Software Foundation, Inc.,
#include "modifiedstate.h"
#include "util/numeric.h" // getContainerPos
#include "settings.h"
#include "mapgen.h"
#include "mapgen/mapgen.h"
class Map;
class NodeMetadataList;

19
src/mapgen/CMakeLists.txt Normal file

@ -0,0 +1,19 @@
set(mapgen_SRCS
${CMAKE_CURRENT_SOURCE_DIR}/cavegen.cpp
${CMAKE_CURRENT_SOURCE_DIR}/dungeongen.cpp
${CMAKE_CURRENT_SOURCE_DIR}/mapgen_carpathian.cpp
${CMAKE_CURRENT_SOURCE_DIR}/mapgen.cpp
${CMAKE_CURRENT_SOURCE_DIR}/mapgen_flat.cpp
${CMAKE_CURRENT_SOURCE_DIR}/mapgen_fractal.cpp
${CMAKE_CURRENT_SOURCE_DIR}/mapgen_singlenode.cpp
${CMAKE_CURRENT_SOURCE_DIR}/mapgen_v5.cpp
${CMAKE_CURRENT_SOURCE_DIR}/mapgen_v6.cpp
${CMAKE_CURRENT_SOURCE_DIR}/mapgen_v7.cpp
${CMAKE_CURRENT_SOURCE_DIR}/mapgen_valleys.cpp
${CMAKE_CURRENT_SOURCE_DIR}/mg_biome.cpp
${CMAKE_CURRENT_SOURCE_DIR}/mg_decoration.cpp
${CMAKE_CURRENT_SOURCE_DIR}/mg_ore.cpp
${CMAKE_CURRENT_SOURCE_DIR}/mg_schematic.cpp
${CMAKE_CURRENT_SOURCE_DIR}/treegen.cpp
PARENT_SCOPE
)

@ -21,7 +21,7 @@ with this program; if not, write to the Free Software Foundation, Inc.,
#pragma once
#include <cassert>
#include "../threading/thread.h"
#include "threading/thread.h"
#include "connection.h"
namespace con

@ -30,7 +30,7 @@ with this program; if not, write to the Free Software Foundation, Inc.,
#include "tool.h"
#include "serverobject.h"
#include "porting.h"
#include "mg_schematic.h"
#include "mapgen/mg_schematic.h"
#include "noise.h"
#include "util/pointedthing.h"
#include "debug.h" // For FATAL_ERROR

@ -22,7 +22,7 @@ with this program; if not, write to the Free Software Foundation, Inc.,
#include "common/c_converter.h"
#include "log.h"
#include "environment.h"
#include "mapgen.h"
#include "mapgen/mapgen.h"
#include "lua_api/l_env.h"
#include "server.h"

@ -21,7 +21,7 @@ with this program; if not, write to the Free Software Foundation, Inc.,
#include "cpp_api/s_base.h"
#include "util/string.h"
#include "../guiMainMenu.h"
#include "gui/guiMainMenu.h"
class ScriptApiMainMenu : virtual public ScriptApiBase {
public:

@ -30,7 +30,7 @@ with this program; if not, write to the Free Software Foundation, Inc.,
#include "l_internal.h"
#include "lua_api/l_item.h"
#include "lua_api/l_nodemeta.h"
#include "mainmenumanager.h"
#include "gui/mainmenumanager.h"
#include "map.h"
#include "util/string.h"
#include "nodedef.h"

@ -34,7 +34,7 @@ with this program; if not, write to the Free Software Foundation, Inc.,
#include "daynightratio.h"
#include "util/pointedthing.h"
#include "content_sao.h"
#include "treegen.h"
#include "mapgen/treegen.h"
#include "emerge.h"
#include "pathfinder.h"
#include "face_position_cache.h"

@ -21,17 +21,17 @@ with this program; if not, write to the Free Software Foundation, Inc.,
#include "lua_api/l_internal.h"
#include "common/c_content.h"
#include "cpp_api/s_async.h"
#include "guiEngine.h"
#include "guiMainMenu.h"
#include "guiKeyChangeMenu.h"
#include "guiPathSelectMenu.h"
#include "gui/guiEngine.h"
#include "gui/guiMainMenu.h"
#include "gui/guiKeyChangeMenu.h"
#include "gui/guiPathSelectMenu.h"
#include "subgame.h"
#include "version.h"
#include "porting.h"
#include "filesys.h"
#include "convert_json.h"
#include "serverlist.h"
#include "mapgen.h"
#include "mapgen/mapgen.h"
#include "settings.h"
#include <IFileArchive.h>

@ -27,12 +27,12 @@ with this program; if not, write to the Free Software Foundation, Inc.,
#include "server.h"
#include "environment.h"
#include "emerge.h"
#include "mg_biome.h"
#include "mg_ore.h"
#include "mg_decoration.h"
#include "mg_schematic.h"
#include "mapgen_v5.h"
#include "mapgen_v7.h"
#include "mapgen/mg_biome.h"
#include "mapgen/mg_ore.h"
#include "mapgen/mg_decoration.h"
#include "mapgen/mg_schematic.h"
#include "mapgen/mapgen_v5.h"
#include "mapgen/mapgen_v7.h"
#include "filesys.h"
#include "settings.h"
#include "log.h"

@ -21,7 +21,7 @@ with this program; if not, write to the Free Software Foundation, Inc.,
#include "l_sound.h"
#include "l_internal.h"
#include "common/c_content.h"
#include "guiEngine.h"
#include "gui/guiEngine.h"
int ModApiSound::l_sound_play(lua_State *L)

@ -27,7 +27,7 @@ with this program; if not, write to the Free Software Foundation, Inc.,
#include "map.h"
#include "mapblock.h"
#include "server.h"
#include "mapgen.h"
#include "mapgen/mapgen.h"
#include "voxelalgorithms.h"
// garbage collector

@ -44,8 +44,8 @@ with this program; if not, write to the Free Software Foundation, Inc.,
#include "itemdef.h"
#include "craftdef.h"
#include "emerge.h"
#include "mapgen.h"
#include "mg_biome.h"
#include "mapgen/mapgen.h"
#include "mapgen/mg_biome.h"
#include "content_mapnode.h"
#include "content_nodemeta.h"
#include "content_sao.h"
@ -61,7 +61,7 @@ with this program; if not, write to the Free Software Foundation, Inc.,
#include "util/base64.h"
#include "util/sha1.h"
#include "util/hex.h"
#include "database.h"
#include "database/database.h"
#include "chatmessage.h"
#include "chat_interface.h"
#include "remoteplayer.h"

Some files were not shown because too many files have changed in this diff Show More