Skip to content

Commit

Permalink
Move files to subdirectories (#6599)
Browse files Browse the repository at this point in the history
* Move files around
  • Loading branch information
numberZero authored and nerzhul committed Nov 8, 2017
1 parent fc9747e commit 20a85d7
Show file tree
Hide file tree
Showing 118 changed files with 236 additions and 221 deletions.
60 changes: 30 additions & 30 deletions build/android/jni/Android.mk
Original file line number Diff line number Diff line change
Expand Up @@ -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 \
Expand All @@ -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 \
Expand All @@ -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 \
Expand All @@ -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 \
Expand Down Expand Up @@ -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 \
Expand Down
39 changes: 6 additions & 33 deletions src/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -371,15 +371,19 @@ 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)
add_subdirectory(util)
add_subdirectory(irrlicht_changes)

set(common_SRCS
${database_SRCS}
${mapgen_SRCS}
ban.cpp
cavegen.cpp
chat.cpp
clientiface.cpp
collision.cpp
Expand All @@ -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
Expand All @@ -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
Expand Down Expand Up @@ -462,7 +445,6 @@ set(common_SRCS
tileanimation.cpp
tool.cpp
translation.cpp
treegen.cpp
version.cpp
voxel.cpp
voxelalgorithms.cpp
Expand Down Expand Up @@ -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}
Expand All @@ -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
Expand Down
2 changes: 1 addition & 1 deletion src/client.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
6 changes: 3 additions & 3 deletions src/client/clientlauncher.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
2 changes: 1 addition & 1 deletion src/client/inputhandler.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -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)
{
Expand Down
2 changes: 1 addition & 1 deletion src/client/inputhandler.h
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand Down
2 changes: 1 addition & 1 deletion src/client/joystick_controller.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -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
{
Expand Down
10 changes: 10 additions & 0 deletions src/database/CMakeLists.txt
Original file line number Diff line number Diff line change
@@ -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
)
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
8 changes: 4 additions & 4 deletions src/emerge.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
2 changes: 1 addition & 1 deletion src/emerge.h
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down
12 changes: 6 additions & 6 deletions src/game.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
13 changes: 13 additions & 0 deletions src/gui/CMakeLists.txt
Original file line number Diff line number Diff line change
@@ -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
)
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.