From 97b693052cd5da228016afa6b31f07970b37569a Mon Sep 17 00:00:00 2001 From: Perttu Ahola Date: Mon, 19 Mar 2012 23:54:56 +0200 Subject: [PATCH] Flatten share/ and user/ in the source and for the RUN_IN_PLACE build --- .gitignore | 38 ++++++++++++------ CMakeLists.txt | 24 +++++++---- {share/builtin => builtin}/builtin.lua | 0 cmake/Modules/FindGettextLib.cmake | 2 +- .../mesetint/mods/bucket/depends.txt | 0 .../mesetint/mods/bucket/init.lua | 0 .../mesetint/mods/bucket/textures/bucket.png | Bin .../mods/bucket/textures/bucket_lava.png | Bin .../mods/bucket/textures/bucket_water.png | Bin .../mesetint/mods/default/init.lua | 0 .../mesetint/mods/default/textures/crack.png | Bin .../mods/default/textures/default_apple.png | Bin .../mods/default/textures/default_book.png | Bin .../default/textures/default_bookshelf.png | Bin .../mods/default/textures/default_brick.png | Bin .../default/textures/default_cactus_side.png | Bin .../default/textures/default_cactus_top.png | Bin .../default/textures/default_chest_front.png | Bin .../default/textures/default_chest_lock.png | Bin .../default/textures/default_chest_side.png | Bin .../default/textures/default_chest_top.png | Bin .../mods/default/textures/default_clay.png | Bin .../default/textures/default_clay_brick.png | Bin .../default/textures/default_clay_lump.png | Bin .../mods/default/textures/default_cloud.png | Bin .../default/textures/default_coal_lump.png | Bin .../mods/default/textures/default_cobble.png | Bin .../mods/default/textures/default_dirt.png | Bin .../mods/default/textures/default_fence.png | Bin .../textures/default_furnace_front.png | Bin .../default/textures/default_furnace_side.png | Bin .../mods/default/textures/default_glass.png | Bin .../mods/default/textures/default_grass.png | Bin .../textures/default_grass_footsteps.png | Bin .../default/textures/default_grass_side.png | Bin .../mods/default/textures/default_gravel.png | Bin .../default/textures/default_iron_lump.png | Bin .../default/textures/default_junglegrass.png | Bin .../default/textures/default_jungletree.png | Bin .../textures/default_jungletree_top.png | Bin .../mods/default/textures/default_ladder.png | Bin .../mods/default/textures/default_lava.png | Bin .../mods/default/textures/default_leaves.png | Bin .../mods/default/textures/default_mese.png | Bin .../default/textures/default_mineral_coal.png | Bin .../default/textures/default_mineral_iron.png | Bin .../default/textures/default_mossycobble.png | Bin .../mods/default/textures/default_nc_back.png | Bin .../default/textures/default_nc_front.png | Bin .../mods/default/textures/default_nc_rb.png | Bin .../mods/default/textures/default_nc_side.png | Bin .../mods/default/textures/default_paper.png | Bin .../mods/default/textures/default_papyrus.png | Bin .../mods/default/textures/default_rail.png | Bin .../textures/default_rail_crossing.png | Bin .../default/textures/default_rail_curved.png | Bin .../textures/default_rail_t_junction.png | Bin .../mods/default/textures/default_sand.png | Bin .../default/textures/default_sandstone.png | Bin .../mods/default/textures/default_sapling.png | Bin .../textures/default_scorched_stuff.png | Bin .../default/textures/default_sign_wall.png | Bin .../default/textures/default_steel_block.png | Bin .../default/textures/default_steel_ingot.png | Bin .../mods/default/textures/default_stick.png | Bin .../mods/default/textures/default_stone.png | Bin .../default/textures/default_tnt_bottom.png | Bin .../default/textures/default_tnt_side.png | Bin .../mods/default/textures/default_tnt_top.png | Bin .../textures/default_tool_mesepick.png | Bin .../textures/default_tool_steelaxe.png | Bin .../textures/default_tool_steelpick.png | Bin .../textures/default_tool_steelshovel.png | Bin .../textures/default_tool_steelsword.png | Bin .../textures/default_tool_stoneaxe.png | Bin .../textures/default_tool_stonepick.png | Bin .../textures/default_tool_stoneshovel.png | Bin .../textures/default_tool_stonesword.png | Bin .../default/textures/default_tool_woodaxe.png | Bin .../textures/default_tool_woodpick.png | Bin .../textures/default_tool_woodshovel.png | Bin .../textures/default_tool_woodsword.png | Bin .../mods/default/textures/default_torch.png | Bin .../textures/default_torch_on_ceiling.png | Bin .../textures/default_torch_on_floor.png | Bin .../mods/default/textures/default_tree.png | Bin .../default/textures/default_tree_top.png | Bin .../mods/default/textures/default_water.png | Bin .../mods/default/textures/default_wood.png | Bin .../mesetint/mods/default/textures/heart.png | Bin .../mesetint/mods/default/textures/player.png | Bin .../mods/default/textures/player_back.png | Bin .../mods/default/textures/treeprop.png | Bin .../mods/default/textures/wieldhand.png | Bin .../mesetint/mods/experimental/depends.txt | 0 .../mesetint/mods/experimental/init.lua | 0 .../textures/experimental_dummyball.png | Bin .../mods/give_initial_stuff/depends.txt | 0 .../mesetint/mods/give_initial_stuff/init.lua | 0 .../mesetint/mods/legacy/depends.txt | 0 .../mesetint/mods/legacy/init.lua | 0 .../mods/legacy/textures/apple_iron.png | Bin .../mods/legacy/textures/cooked_rat.png | Bin .../mods/legacy/textures/dungeon_master.png | Bin .../mods/legacy/textures/fireball.png | Bin .../mesetint/mods/legacy/textures/firefly.png | Bin .../mesetint/mods/legacy/textures/oerkki1.png | Bin .../mods/legacy/textures/oerkki1_damaged.png | Bin .../mesetint/mods/legacy/textures/rat.png | Bin src/CMakeLists.txt | 3 +- src/main.cpp | 5 --- src/porting.cpp | 23 ++++++----- src/subgame.cpp | 5 --- .../base/pack/fontdejavusansmono.png | Bin .../base/pack/fontlucida.png | Bin .../base/pack/menubg.png | Bin .../base/pack/menulogo.png | Bin .../base/pack/smoke_puff.png | Bin .../base/pack/sunrisebg.png | Bin .../base/pack/unknown_block.png | Bin .../base/pack/unknown_item.png | Bin .../base/pack/unknown_object.png | Bin 122 files changed, 57 insertions(+), 43 deletions(-) rename {share/builtin => builtin}/builtin.lua (100%) rename {share/games => games}/mesetint/mods/bucket/depends.txt (100%) rename {share/games => games}/mesetint/mods/bucket/init.lua (100%) rename {share/games => games}/mesetint/mods/bucket/textures/bucket.png (100%) rename {share/games => games}/mesetint/mods/bucket/textures/bucket_lava.png (100%) rename {share/games => games}/mesetint/mods/bucket/textures/bucket_water.png (100%) rename {share/games => games}/mesetint/mods/default/init.lua (100%) rename {share/games => games}/mesetint/mods/default/textures/crack.png (100%) rename {share/games => games}/mesetint/mods/default/textures/default_apple.png (100%) rename {share/games => games}/mesetint/mods/default/textures/default_book.png (100%) rename {share/games => games}/mesetint/mods/default/textures/default_bookshelf.png (100%) rename {share/games => games}/mesetint/mods/default/textures/default_brick.png (100%) rename {share/games => games}/mesetint/mods/default/textures/default_cactus_side.png (100%) rename {share/games => games}/mesetint/mods/default/textures/default_cactus_top.png (100%) rename {share/games => games}/mesetint/mods/default/textures/default_chest_front.png (100%) rename {share/games => games}/mesetint/mods/default/textures/default_chest_lock.png (100%) rename {share/games => games}/mesetint/mods/default/textures/default_chest_side.png (100%) rename {share/games => games}/mesetint/mods/default/textures/default_chest_top.png (100%) rename {share/games => games}/mesetint/mods/default/textures/default_clay.png (100%) rename {share/games => games}/mesetint/mods/default/textures/default_clay_brick.png (100%) rename {share/games => games}/mesetint/mods/default/textures/default_clay_lump.png (100%) rename {share/games => games}/mesetint/mods/default/textures/default_cloud.png (100%) rename {share/games => games}/mesetint/mods/default/textures/default_coal_lump.png (100%) rename {share/games => games}/mesetint/mods/default/textures/default_cobble.png (100%) rename {share/games => games}/mesetint/mods/default/textures/default_dirt.png (100%) rename {share/games => games}/mesetint/mods/default/textures/default_fence.png (100%) rename {share/games => games}/mesetint/mods/default/textures/default_furnace_front.png (100%) rename {share/games => games}/mesetint/mods/default/textures/default_furnace_side.png (100%) rename {share/games => games}/mesetint/mods/default/textures/default_glass.png (100%) rename {share/games => games}/mesetint/mods/default/textures/default_grass.png (100%) rename {share/games => games}/mesetint/mods/default/textures/default_grass_footsteps.png (100%) rename {share/games => games}/mesetint/mods/default/textures/default_grass_side.png (100%) rename {share/games => games}/mesetint/mods/default/textures/default_gravel.png (100%) rename {share/games => games}/mesetint/mods/default/textures/default_iron_lump.png (100%) rename {share/games => games}/mesetint/mods/default/textures/default_junglegrass.png (100%) rename {share/games => games}/mesetint/mods/default/textures/default_jungletree.png (100%) rename {share/games => games}/mesetint/mods/default/textures/default_jungletree_top.png (100%) rename {share/games => games}/mesetint/mods/default/textures/default_ladder.png (100%) rename {share/games => games}/mesetint/mods/default/textures/default_lava.png (100%) rename {share/games => games}/mesetint/mods/default/textures/default_leaves.png (100%) rename {share/games => games}/mesetint/mods/default/textures/default_mese.png (100%) rename {share/games => games}/mesetint/mods/default/textures/default_mineral_coal.png (100%) rename {share/games => games}/mesetint/mods/default/textures/default_mineral_iron.png (100%) rename {share/games => games}/mesetint/mods/default/textures/default_mossycobble.png (100%) rename {share/games => games}/mesetint/mods/default/textures/default_nc_back.png (100%) rename {share/games => games}/mesetint/mods/default/textures/default_nc_front.png (100%) rename {share/games => games}/mesetint/mods/default/textures/default_nc_rb.png (100%) rename {share/games => games}/mesetint/mods/default/textures/default_nc_side.png (100%) rename {share/games => games}/mesetint/mods/default/textures/default_paper.png (100%) rename {share/games => games}/mesetint/mods/default/textures/default_papyrus.png (100%) rename {share/games => games}/mesetint/mods/default/textures/default_rail.png (100%) rename {share/games => games}/mesetint/mods/default/textures/default_rail_crossing.png (100%) rename {share/games => games}/mesetint/mods/default/textures/default_rail_curved.png (100%) rename {share/games => games}/mesetint/mods/default/textures/default_rail_t_junction.png (100%) rename {share/games => games}/mesetint/mods/default/textures/default_sand.png (100%) rename {share/games => games}/mesetint/mods/default/textures/default_sandstone.png (100%) rename {share/games => games}/mesetint/mods/default/textures/default_sapling.png (100%) rename {share/games => games}/mesetint/mods/default/textures/default_scorched_stuff.png (100%) rename {share/games => games}/mesetint/mods/default/textures/default_sign_wall.png (100%) rename {share/games => games}/mesetint/mods/default/textures/default_steel_block.png (100%) rename {share/games => games}/mesetint/mods/default/textures/default_steel_ingot.png (100%) rename {share/games => games}/mesetint/mods/default/textures/default_stick.png (100%) rename {share/games => games}/mesetint/mods/default/textures/default_stone.png (100%) rename {share/games => games}/mesetint/mods/default/textures/default_tnt_bottom.png (100%) rename {share/games => games}/mesetint/mods/default/textures/default_tnt_side.png (100%) rename {share/games => games}/mesetint/mods/default/textures/default_tnt_top.png (100%) rename {share/games => games}/mesetint/mods/default/textures/default_tool_mesepick.png (100%) rename {share/games => games}/mesetint/mods/default/textures/default_tool_steelaxe.png (100%) rename {share/games => games}/mesetint/mods/default/textures/default_tool_steelpick.png (100%) rename {share/games => games}/mesetint/mods/default/textures/default_tool_steelshovel.png (100%) rename {share/games => games}/mesetint/mods/default/textures/default_tool_steelsword.png (100%) rename {share/games => games}/mesetint/mods/default/textures/default_tool_stoneaxe.png (100%) rename {share/games => games}/mesetint/mods/default/textures/default_tool_stonepick.png (100%) rename {share/games => games}/mesetint/mods/default/textures/default_tool_stoneshovel.png (100%) rename {share/games => games}/mesetint/mods/default/textures/default_tool_stonesword.png (100%) rename {share/games => games}/mesetint/mods/default/textures/default_tool_woodaxe.png (100%) rename {share/games => games}/mesetint/mods/default/textures/default_tool_woodpick.png (100%) rename {share/games => games}/mesetint/mods/default/textures/default_tool_woodshovel.png (100%) rename {share/games => games}/mesetint/mods/default/textures/default_tool_woodsword.png (100%) rename {share/games => games}/mesetint/mods/default/textures/default_torch.png (100%) rename {share/games => games}/mesetint/mods/default/textures/default_torch_on_ceiling.png (100%) rename {share/games => games}/mesetint/mods/default/textures/default_torch_on_floor.png (100%) rename {share/games => games}/mesetint/mods/default/textures/default_tree.png (100%) rename {share/games => games}/mesetint/mods/default/textures/default_tree_top.png (100%) rename {share/games => games}/mesetint/mods/default/textures/default_water.png (100%) rename {share/games => games}/mesetint/mods/default/textures/default_wood.png (100%) rename {share/games => games}/mesetint/mods/default/textures/heart.png (100%) rename {share/games => games}/mesetint/mods/default/textures/player.png (100%) rename {share/games => games}/mesetint/mods/default/textures/player_back.png (100%) rename {share/games => games}/mesetint/mods/default/textures/treeprop.png (100%) rename {share/games => games}/mesetint/mods/default/textures/wieldhand.png (100%) rename {share/games => games}/mesetint/mods/experimental/depends.txt (100%) rename {share/games => games}/mesetint/mods/experimental/init.lua (100%) rename {share/games => games}/mesetint/mods/experimental/textures/experimental_dummyball.png (100%) rename {share/games => games}/mesetint/mods/give_initial_stuff/depends.txt (100%) rename {share/games => games}/mesetint/mods/give_initial_stuff/init.lua (100%) rename {share/games => games}/mesetint/mods/legacy/depends.txt (100%) rename {share/games => games}/mesetint/mods/legacy/init.lua (100%) rename {share/games => games}/mesetint/mods/legacy/textures/apple_iron.png (100%) rename {share/games => games}/mesetint/mods/legacy/textures/cooked_rat.png (100%) rename {share/games => games}/mesetint/mods/legacy/textures/dungeon_master.png (100%) rename {share/games => games}/mesetint/mods/legacy/textures/fireball.png (100%) rename {share/games => games}/mesetint/mods/legacy/textures/firefly.png (100%) rename {share/games => games}/mesetint/mods/legacy/textures/oerkki1.png (100%) rename {share/games => games}/mesetint/mods/legacy/textures/oerkki1_damaged.png (100%) rename {share/games => games}/mesetint/mods/legacy/textures/rat.png (100%) rename {share/textures => textures}/base/pack/fontdejavusansmono.png (100%) rename {share/textures => textures}/base/pack/fontlucida.png (100%) rename {share/textures => textures}/base/pack/menubg.png (100%) rename {share/textures => textures}/base/pack/menulogo.png (100%) rename {share/textures => textures}/base/pack/smoke_puff.png (100%) rename {share/textures => textures}/base/pack/sunrisebg.png (100%) rename {share/textures => textures}/base/pack/unknown_block.png (100%) rename {share/textures => textures}/base/pack/unknown_item.png (100%) rename {share/textures => textures}/base/pack/unknown_object.png (100%) diff --git a/.gitignore b/.gitignore index 1d89854f7..c386b77be 100644 --- a/.gitignore +++ b/.gitignore @@ -1,6 +1,26 @@ +## Generic ignorable patterns and files *~ -map/* -world/* +.*.swp +*bak* +tags +*.vim + +## Non-static Minetest directories +bin/ +games/ +!games/mesetint +cache/ +textures/ +sounds/ +mods/ +worlds/ +world/ + +## Configuration/log files +minetest.conf +debug.txt + +## Build files CMakeFiles/* src/CMakeFiles/* src/Makefile @@ -10,19 +30,13 @@ src/jthread/CMakeFiles/* src/jthread/Makefile src/jthread/cmake_config.h src/jthread/cmake_install.cmake -.*.swp -minetest.conf -bin/ +src/jthread/libjthread.a +src/lua/build/ +src/lua/CMakeFiles/ CMakeCache.txt CPackConfig.cmake CPackSourceConfig.cmake Makefile cmake_install.cmake -src/jthread/libjthread.a -debug.txt -bin/debug.txt -minetestmapper/map.png locale/ -src/lua/build/ -src/lua/CMakeFiles/ -*bak* + diff --git a/CMakeLists.txt b/CMakeLists.txt index 9ec8d7757..01d03a574 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -49,25 +49,29 @@ find_package(Irrlicht) # if(WIN32) - set(SHAREDIR "share") + set(SHAREDIR ".") set(BINDIR "bin") set(DOCDIR "doc") - set(EXAMPLE_CONF_DIR "user") + set(EXAMPLE_CONF_DIR ".") + set(LOCALEDIR "locale") elseif(APPLE) - # random placeholders + # Random placeholders; this isn't usually used and may not work + # See https://github.com/toabi/minetest-mac/ set(SHAREDIR "share/${PROJECT_NAME}") set(BINDIR "bin") set(DOCDIR "share/doc/${PROJECT_NAME}") set(EXAMPLE_CONF_DIR ${DOCDIR}) + set(LOCALEDIR "locale") elseif(UNIX) # Linux, BSD etc if(RUN_IN_PLACE) - set(SHAREDIR "share") + set(SHAREDIR ".") set(BINDIR "bin") set(DOCDIR "doc") - set(MANDIR "share/unix/man") - set(EXAMPLE_CONF_DIR ${DOCDIR}) - set(XDG_APPS_DIR "share/unix/applications") - set(ICONDIR "share/unix/icons") + set(EXAMPLE_CONF_DIR ".") + set(MANDIR "unix/man") + set(XDG_APPS_DIR "unix/applications") + set(ICONDIR "unix/icons") + set(LOCALEDIR "locale") else() set(SHAREDIR "share/${PROJECT_NAME}") set(BINDIR "bin") @@ -76,9 +80,13 @@ elseif(UNIX) # Linux, BSD etc set(EXAMPLE_CONF_DIR ${DOCDIR}) set(XDG_APPS_DIR "share/applications") set(ICONDIR "share/icons") + set(LOCALEDIR "share/locale") endif() endif() +install(DIRECTORY "${CMAKE_CURRENT_SOURCE_DIR}/builtin" DESTINATION "${SHAREDIR}/") +install(DIRECTORY "${CMAKE_CURRENT_SOURCE_DIR}/games/mesetint" DESTINATION "${SHAREDIR}/games/") + install(FILES "README.txt" DESTINATION "${DOCDIR}") install(FILES "minetest.conf.example" DESTINATION "${EXAMPLE_CONF_DIR}") diff --git a/share/builtin/builtin.lua b/builtin/builtin.lua similarity index 100% rename from share/builtin/builtin.lua rename to builtin/builtin.lua diff --git a/cmake/Modules/FindGettextLib.cmake b/cmake/Modules/FindGettextLib.cmake index 5779b6b64..bc7ea367f 100644 --- a/cmake/Modules/FindGettextLib.cmake +++ b/cmake/Modules/FindGettextLib.cmake @@ -59,7 +59,7 @@ ENDIF() IF(GETTEXT_FOUND) SET(GETTEXT_PO_PATH ${CMAKE_SOURCE_DIR}/po) SET(GETTEXT_MO_BUILD_PATH ${CMAKE_BINARY_DIR}/locale//LC_MESSAGES) - SET(GETTEXT_MO_DEST_PATH ${DATADIR}/../locale//LC_MESSAGES) + SET(GETTEXT_MO_DEST_PATH ${LOCALEDIR}//LC_MESSAGES) FILE(GLOB GETTEXT_AVAILABLE_LOCALES RELATIVE ${GETTEXT_PO_PATH} "${GETTEXT_PO_PATH}/*") LIST(REMOVE_ITEM GETTEXT_AVAILABLE_LOCALES minetest.pot) MACRO(SET_MO_PATHS _buildvar _destvar _locale) diff --git a/share/games/mesetint/mods/bucket/depends.txt b/games/mesetint/mods/bucket/depends.txt similarity index 100% rename from share/games/mesetint/mods/bucket/depends.txt rename to games/mesetint/mods/bucket/depends.txt diff --git a/share/games/mesetint/mods/bucket/init.lua b/games/mesetint/mods/bucket/init.lua similarity index 100% rename from share/games/mesetint/mods/bucket/init.lua rename to games/mesetint/mods/bucket/init.lua diff --git a/share/games/mesetint/mods/bucket/textures/bucket.png b/games/mesetint/mods/bucket/textures/bucket.png similarity index 100% rename from share/games/mesetint/mods/bucket/textures/bucket.png rename to games/mesetint/mods/bucket/textures/bucket.png diff --git a/share/games/mesetint/mods/bucket/textures/bucket_lava.png b/games/mesetint/mods/bucket/textures/bucket_lava.png similarity index 100% rename from share/games/mesetint/mods/bucket/textures/bucket_lava.png rename to games/mesetint/mods/bucket/textures/bucket_lava.png diff --git a/share/games/mesetint/mods/bucket/textures/bucket_water.png b/games/mesetint/mods/bucket/textures/bucket_water.png similarity index 100% rename from share/games/mesetint/mods/bucket/textures/bucket_water.png rename to games/mesetint/mods/bucket/textures/bucket_water.png diff --git a/share/games/mesetint/mods/default/init.lua b/games/mesetint/mods/default/init.lua similarity index 100% rename from share/games/mesetint/mods/default/init.lua rename to games/mesetint/mods/default/init.lua diff --git a/share/games/mesetint/mods/default/textures/crack.png b/games/mesetint/mods/default/textures/crack.png similarity index 100% rename from share/games/mesetint/mods/default/textures/crack.png rename to games/mesetint/mods/default/textures/crack.png diff --git a/share/games/mesetint/mods/default/textures/default_apple.png b/games/mesetint/mods/default/textures/default_apple.png similarity index 100% rename from share/games/mesetint/mods/default/textures/default_apple.png rename to games/mesetint/mods/default/textures/default_apple.png diff --git a/share/games/mesetint/mods/default/textures/default_book.png b/games/mesetint/mods/default/textures/default_book.png similarity index 100% rename from share/games/mesetint/mods/default/textures/default_book.png rename to games/mesetint/mods/default/textures/default_book.png diff --git a/share/games/mesetint/mods/default/textures/default_bookshelf.png b/games/mesetint/mods/default/textures/default_bookshelf.png similarity index 100% rename from share/games/mesetint/mods/default/textures/default_bookshelf.png rename to games/mesetint/mods/default/textures/default_bookshelf.png diff --git a/share/games/mesetint/mods/default/textures/default_brick.png b/games/mesetint/mods/default/textures/default_brick.png similarity index 100% rename from share/games/mesetint/mods/default/textures/default_brick.png rename to games/mesetint/mods/default/textures/default_brick.png diff --git a/share/games/mesetint/mods/default/textures/default_cactus_side.png b/games/mesetint/mods/default/textures/default_cactus_side.png similarity index 100% rename from share/games/mesetint/mods/default/textures/default_cactus_side.png rename to games/mesetint/mods/default/textures/default_cactus_side.png diff --git a/share/games/mesetint/mods/default/textures/default_cactus_top.png b/games/mesetint/mods/default/textures/default_cactus_top.png similarity index 100% rename from share/games/mesetint/mods/default/textures/default_cactus_top.png rename to games/mesetint/mods/default/textures/default_cactus_top.png diff --git a/share/games/mesetint/mods/default/textures/default_chest_front.png b/games/mesetint/mods/default/textures/default_chest_front.png similarity index 100% rename from share/games/mesetint/mods/default/textures/default_chest_front.png rename to games/mesetint/mods/default/textures/default_chest_front.png diff --git a/share/games/mesetint/mods/default/textures/default_chest_lock.png b/games/mesetint/mods/default/textures/default_chest_lock.png similarity index 100% rename from share/games/mesetint/mods/default/textures/default_chest_lock.png rename to games/mesetint/mods/default/textures/default_chest_lock.png diff --git a/share/games/mesetint/mods/default/textures/default_chest_side.png b/games/mesetint/mods/default/textures/default_chest_side.png similarity index 100% rename from share/games/mesetint/mods/default/textures/default_chest_side.png rename to games/mesetint/mods/default/textures/default_chest_side.png diff --git a/share/games/mesetint/mods/default/textures/default_chest_top.png b/games/mesetint/mods/default/textures/default_chest_top.png similarity index 100% rename from share/games/mesetint/mods/default/textures/default_chest_top.png rename to games/mesetint/mods/default/textures/default_chest_top.png diff --git a/share/games/mesetint/mods/default/textures/default_clay.png b/games/mesetint/mods/default/textures/default_clay.png similarity index 100% rename from share/games/mesetint/mods/default/textures/default_clay.png rename to games/mesetint/mods/default/textures/default_clay.png diff --git a/share/games/mesetint/mods/default/textures/default_clay_brick.png b/games/mesetint/mods/default/textures/default_clay_brick.png similarity index 100% rename from share/games/mesetint/mods/default/textures/default_clay_brick.png rename to games/mesetint/mods/default/textures/default_clay_brick.png diff --git a/share/games/mesetint/mods/default/textures/default_clay_lump.png b/games/mesetint/mods/default/textures/default_clay_lump.png similarity index 100% rename from share/games/mesetint/mods/default/textures/default_clay_lump.png rename to games/mesetint/mods/default/textures/default_clay_lump.png diff --git a/share/games/mesetint/mods/default/textures/default_cloud.png b/games/mesetint/mods/default/textures/default_cloud.png similarity index 100% rename from share/games/mesetint/mods/default/textures/default_cloud.png rename to games/mesetint/mods/default/textures/default_cloud.png diff --git a/share/games/mesetint/mods/default/textures/default_coal_lump.png b/games/mesetint/mods/default/textures/default_coal_lump.png similarity index 100% rename from share/games/mesetint/mods/default/textures/default_coal_lump.png rename to games/mesetint/mods/default/textures/default_coal_lump.png diff --git a/share/games/mesetint/mods/default/textures/default_cobble.png b/games/mesetint/mods/default/textures/default_cobble.png similarity index 100% rename from share/games/mesetint/mods/default/textures/default_cobble.png rename to games/mesetint/mods/default/textures/default_cobble.png diff --git a/share/games/mesetint/mods/default/textures/default_dirt.png b/games/mesetint/mods/default/textures/default_dirt.png similarity index 100% rename from share/games/mesetint/mods/default/textures/default_dirt.png rename to games/mesetint/mods/default/textures/default_dirt.png diff --git a/share/games/mesetint/mods/default/textures/default_fence.png b/games/mesetint/mods/default/textures/default_fence.png similarity index 100% rename from share/games/mesetint/mods/default/textures/default_fence.png rename to games/mesetint/mods/default/textures/default_fence.png diff --git a/share/games/mesetint/mods/default/textures/default_furnace_front.png b/games/mesetint/mods/default/textures/default_furnace_front.png similarity index 100% rename from share/games/mesetint/mods/default/textures/default_furnace_front.png rename to games/mesetint/mods/default/textures/default_furnace_front.png diff --git a/share/games/mesetint/mods/default/textures/default_furnace_side.png b/games/mesetint/mods/default/textures/default_furnace_side.png similarity index 100% rename from share/games/mesetint/mods/default/textures/default_furnace_side.png rename to games/mesetint/mods/default/textures/default_furnace_side.png diff --git a/share/games/mesetint/mods/default/textures/default_glass.png b/games/mesetint/mods/default/textures/default_glass.png similarity index 100% rename from share/games/mesetint/mods/default/textures/default_glass.png rename to games/mesetint/mods/default/textures/default_glass.png diff --git a/share/games/mesetint/mods/default/textures/default_grass.png b/games/mesetint/mods/default/textures/default_grass.png similarity index 100% rename from share/games/mesetint/mods/default/textures/default_grass.png rename to games/mesetint/mods/default/textures/default_grass.png diff --git a/share/games/mesetint/mods/default/textures/default_grass_footsteps.png b/games/mesetint/mods/default/textures/default_grass_footsteps.png similarity index 100% rename from share/games/mesetint/mods/default/textures/default_grass_footsteps.png rename to games/mesetint/mods/default/textures/default_grass_footsteps.png diff --git a/share/games/mesetint/mods/default/textures/default_grass_side.png b/games/mesetint/mods/default/textures/default_grass_side.png similarity index 100% rename from share/games/mesetint/mods/default/textures/default_grass_side.png rename to games/mesetint/mods/default/textures/default_grass_side.png diff --git a/share/games/mesetint/mods/default/textures/default_gravel.png b/games/mesetint/mods/default/textures/default_gravel.png similarity index 100% rename from share/games/mesetint/mods/default/textures/default_gravel.png rename to games/mesetint/mods/default/textures/default_gravel.png diff --git a/share/games/mesetint/mods/default/textures/default_iron_lump.png b/games/mesetint/mods/default/textures/default_iron_lump.png similarity index 100% rename from share/games/mesetint/mods/default/textures/default_iron_lump.png rename to games/mesetint/mods/default/textures/default_iron_lump.png diff --git a/share/games/mesetint/mods/default/textures/default_junglegrass.png b/games/mesetint/mods/default/textures/default_junglegrass.png similarity index 100% rename from share/games/mesetint/mods/default/textures/default_junglegrass.png rename to games/mesetint/mods/default/textures/default_junglegrass.png diff --git a/share/games/mesetint/mods/default/textures/default_jungletree.png b/games/mesetint/mods/default/textures/default_jungletree.png similarity index 100% rename from share/games/mesetint/mods/default/textures/default_jungletree.png rename to games/mesetint/mods/default/textures/default_jungletree.png diff --git a/share/games/mesetint/mods/default/textures/default_jungletree_top.png b/games/mesetint/mods/default/textures/default_jungletree_top.png similarity index 100% rename from share/games/mesetint/mods/default/textures/default_jungletree_top.png rename to games/mesetint/mods/default/textures/default_jungletree_top.png diff --git a/share/games/mesetint/mods/default/textures/default_ladder.png b/games/mesetint/mods/default/textures/default_ladder.png similarity index 100% rename from share/games/mesetint/mods/default/textures/default_ladder.png rename to games/mesetint/mods/default/textures/default_ladder.png diff --git a/share/games/mesetint/mods/default/textures/default_lava.png b/games/mesetint/mods/default/textures/default_lava.png similarity index 100% rename from share/games/mesetint/mods/default/textures/default_lava.png rename to games/mesetint/mods/default/textures/default_lava.png diff --git a/share/games/mesetint/mods/default/textures/default_leaves.png b/games/mesetint/mods/default/textures/default_leaves.png similarity index 100% rename from share/games/mesetint/mods/default/textures/default_leaves.png rename to games/mesetint/mods/default/textures/default_leaves.png diff --git a/share/games/mesetint/mods/default/textures/default_mese.png b/games/mesetint/mods/default/textures/default_mese.png similarity index 100% rename from share/games/mesetint/mods/default/textures/default_mese.png rename to games/mesetint/mods/default/textures/default_mese.png diff --git a/share/games/mesetint/mods/default/textures/default_mineral_coal.png b/games/mesetint/mods/default/textures/default_mineral_coal.png similarity index 100% rename from share/games/mesetint/mods/default/textures/default_mineral_coal.png rename to games/mesetint/mods/default/textures/default_mineral_coal.png diff --git a/share/games/mesetint/mods/default/textures/default_mineral_iron.png b/games/mesetint/mods/default/textures/default_mineral_iron.png similarity index 100% rename from share/games/mesetint/mods/default/textures/default_mineral_iron.png rename to games/mesetint/mods/default/textures/default_mineral_iron.png diff --git a/share/games/mesetint/mods/default/textures/default_mossycobble.png b/games/mesetint/mods/default/textures/default_mossycobble.png similarity index 100% rename from share/games/mesetint/mods/default/textures/default_mossycobble.png rename to games/mesetint/mods/default/textures/default_mossycobble.png diff --git a/share/games/mesetint/mods/default/textures/default_nc_back.png b/games/mesetint/mods/default/textures/default_nc_back.png similarity index 100% rename from share/games/mesetint/mods/default/textures/default_nc_back.png rename to games/mesetint/mods/default/textures/default_nc_back.png diff --git a/share/games/mesetint/mods/default/textures/default_nc_front.png b/games/mesetint/mods/default/textures/default_nc_front.png similarity index 100% rename from share/games/mesetint/mods/default/textures/default_nc_front.png rename to games/mesetint/mods/default/textures/default_nc_front.png diff --git a/share/games/mesetint/mods/default/textures/default_nc_rb.png b/games/mesetint/mods/default/textures/default_nc_rb.png similarity index 100% rename from share/games/mesetint/mods/default/textures/default_nc_rb.png rename to games/mesetint/mods/default/textures/default_nc_rb.png diff --git a/share/games/mesetint/mods/default/textures/default_nc_side.png b/games/mesetint/mods/default/textures/default_nc_side.png similarity index 100% rename from share/games/mesetint/mods/default/textures/default_nc_side.png rename to games/mesetint/mods/default/textures/default_nc_side.png diff --git a/share/games/mesetint/mods/default/textures/default_paper.png b/games/mesetint/mods/default/textures/default_paper.png similarity index 100% rename from share/games/mesetint/mods/default/textures/default_paper.png rename to games/mesetint/mods/default/textures/default_paper.png diff --git a/share/games/mesetint/mods/default/textures/default_papyrus.png b/games/mesetint/mods/default/textures/default_papyrus.png similarity index 100% rename from share/games/mesetint/mods/default/textures/default_papyrus.png rename to games/mesetint/mods/default/textures/default_papyrus.png diff --git a/share/games/mesetint/mods/default/textures/default_rail.png b/games/mesetint/mods/default/textures/default_rail.png similarity index 100% rename from share/games/mesetint/mods/default/textures/default_rail.png rename to games/mesetint/mods/default/textures/default_rail.png diff --git a/share/games/mesetint/mods/default/textures/default_rail_crossing.png b/games/mesetint/mods/default/textures/default_rail_crossing.png similarity index 100% rename from share/games/mesetint/mods/default/textures/default_rail_crossing.png rename to games/mesetint/mods/default/textures/default_rail_crossing.png diff --git a/share/games/mesetint/mods/default/textures/default_rail_curved.png b/games/mesetint/mods/default/textures/default_rail_curved.png similarity index 100% rename from share/games/mesetint/mods/default/textures/default_rail_curved.png rename to games/mesetint/mods/default/textures/default_rail_curved.png diff --git a/share/games/mesetint/mods/default/textures/default_rail_t_junction.png b/games/mesetint/mods/default/textures/default_rail_t_junction.png similarity index 100% rename from share/games/mesetint/mods/default/textures/default_rail_t_junction.png rename to games/mesetint/mods/default/textures/default_rail_t_junction.png diff --git a/share/games/mesetint/mods/default/textures/default_sand.png b/games/mesetint/mods/default/textures/default_sand.png similarity index 100% rename from share/games/mesetint/mods/default/textures/default_sand.png rename to games/mesetint/mods/default/textures/default_sand.png diff --git a/share/games/mesetint/mods/default/textures/default_sandstone.png b/games/mesetint/mods/default/textures/default_sandstone.png similarity index 100% rename from share/games/mesetint/mods/default/textures/default_sandstone.png rename to games/mesetint/mods/default/textures/default_sandstone.png diff --git a/share/games/mesetint/mods/default/textures/default_sapling.png b/games/mesetint/mods/default/textures/default_sapling.png similarity index 100% rename from share/games/mesetint/mods/default/textures/default_sapling.png rename to games/mesetint/mods/default/textures/default_sapling.png diff --git a/share/games/mesetint/mods/default/textures/default_scorched_stuff.png b/games/mesetint/mods/default/textures/default_scorched_stuff.png similarity index 100% rename from share/games/mesetint/mods/default/textures/default_scorched_stuff.png rename to games/mesetint/mods/default/textures/default_scorched_stuff.png diff --git a/share/games/mesetint/mods/default/textures/default_sign_wall.png b/games/mesetint/mods/default/textures/default_sign_wall.png similarity index 100% rename from share/games/mesetint/mods/default/textures/default_sign_wall.png rename to games/mesetint/mods/default/textures/default_sign_wall.png diff --git a/share/games/mesetint/mods/default/textures/default_steel_block.png b/games/mesetint/mods/default/textures/default_steel_block.png similarity index 100% rename from share/games/mesetint/mods/default/textures/default_steel_block.png rename to games/mesetint/mods/default/textures/default_steel_block.png diff --git a/share/games/mesetint/mods/default/textures/default_steel_ingot.png b/games/mesetint/mods/default/textures/default_steel_ingot.png similarity index 100% rename from share/games/mesetint/mods/default/textures/default_steel_ingot.png rename to games/mesetint/mods/default/textures/default_steel_ingot.png diff --git a/share/games/mesetint/mods/default/textures/default_stick.png b/games/mesetint/mods/default/textures/default_stick.png similarity index 100% rename from share/games/mesetint/mods/default/textures/default_stick.png rename to games/mesetint/mods/default/textures/default_stick.png diff --git a/share/games/mesetint/mods/default/textures/default_stone.png b/games/mesetint/mods/default/textures/default_stone.png similarity index 100% rename from share/games/mesetint/mods/default/textures/default_stone.png rename to games/mesetint/mods/default/textures/default_stone.png diff --git a/share/games/mesetint/mods/default/textures/default_tnt_bottom.png b/games/mesetint/mods/default/textures/default_tnt_bottom.png similarity index 100% rename from share/games/mesetint/mods/default/textures/default_tnt_bottom.png rename to games/mesetint/mods/default/textures/default_tnt_bottom.png diff --git a/share/games/mesetint/mods/default/textures/default_tnt_side.png b/games/mesetint/mods/default/textures/default_tnt_side.png similarity index 100% rename from share/games/mesetint/mods/default/textures/default_tnt_side.png rename to games/mesetint/mods/default/textures/default_tnt_side.png diff --git a/share/games/mesetint/mods/default/textures/default_tnt_top.png b/games/mesetint/mods/default/textures/default_tnt_top.png similarity index 100% rename from share/games/mesetint/mods/default/textures/default_tnt_top.png rename to games/mesetint/mods/default/textures/default_tnt_top.png diff --git a/share/games/mesetint/mods/default/textures/default_tool_mesepick.png b/games/mesetint/mods/default/textures/default_tool_mesepick.png similarity index 100% rename from share/games/mesetint/mods/default/textures/default_tool_mesepick.png rename to games/mesetint/mods/default/textures/default_tool_mesepick.png diff --git a/share/games/mesetint/mods/default/textures/default_tool_steelaxe.png b/games/mesetint/mods/default/textures/default_tool_steelaxe.png similarity index 100% rename from share/games/mesetint/mods/default/textures/default_tool_steelaxe.png rename to games/mesetint/mods/default/textures/default_tool_steelaxe.png diff --git a/share/games/mesetint/mods/default/textures/default_tool_steelpick.png b/games/mesetint/mods/default/textures/default_tool_steelpick.png similarity index 100% rename from share/games/mesetint/mods/default/textures/default_tool_steelpick.png rename to games/mesetint/mods/default/textures/default_tool_steelpick.png diff --git a/share/games/mesetint/mods/default/textures/default_tool_steelshovel.png b/games/mesetint/mods/default/textures/default_tool_steelshovel.png similarity index 100% rename from share/games/mesetint/mods/default/textures/default_tool_steelshovel.png rename to games/mesetint/mods/default/textures/default_tool_steelshovel.png diff --git a/share/games/mesetint/mods/default/textures/default_tool_steelsword.png b/games/mesetint/mods/default/textures/default_tool_steelsword.png similarity index 100% rename from share/games/mesetint/mods/default/textures/default_tool_steelsword.png rename to games/mesetint/mods/default/textures/default_tool_steelsword.png diff --git a/share/games/mesetint/mods/default/textures/default_tool_stoneaxe.png b/games/mesetint/mods/default/textures/default_tool_stoneaxe.png similarity index 100% rename from share/games/mesetint/mods/default/textures/default_tool_stoneaxe.png rename to games/mesetint/mods/default/textures/default_tool_stoneaxe.png diff --git a/share/games/mesetint/mods/default/textures/default_tool_stonepick.png b/games/mesetint/mods/default/textures/default_tool_stonepick.png similarity index 100% rename from share/games/mesetint/mods/default/textures/default_tool_stonepick.png rename to games/mesetint/mods/default/textures/default_tool_stonepick.png diff --git a/share/games/mesetint/mods/default/textures/default_tool_stoneshovel.png b/games/mesetint/mods/default/textures/default_tool_stoneshovel.png similarity index 100% rename from share/games/mesetint/mods/default/textures/default_tool_stoneshovel.png rename to games/mesetint/mods/default/textures/default_tool_stoneshovel.png diff --git a/share/games/mesetint/mods/default/textures/default_tool_stonesword.png b/games/mesetint/mods/default/textures/default_tool_stonesword.png similarity index 100% rename from share/games/mesetint/mods/default/textures/default_tool_stonesword.png rename to games/mesetint/mods/default/textures/default_tool_stonesword.png diff --git a/share/games/mesetint/mods/default/textures/default_tool_woodaxe.png b/games/mesetint/mods/default/textures/default_tool_woodaxe.png similarity index 100% rename from share/games/mesetint/mods/default/textures/default_tool_woodaxe.png rename to games/mesetint/mods/default/textures/default_tool_woodaxe.png diff --git a/share/games/mesetint/mods/default/textures/default_tool_woodpick.png b/games/mesetint/mods/default/textures/default_tool_woodpick.png similarity index 100% rename from share/games/mesetint/mods/default/textures/default_tool_woodpick.png rename to games/mesetint/mods/default/textures/default_tool_woodpick.png diff --git a/share/games/mesetint/mods/default/textures/default_tool_woodshovel.png b/games/mesetint/mods/default/textures/default_tool_woodshovel.png similarity index 100% rename from share/games/mesetint/mods/default/textures/default_tool_woodshovel.png rename to games/mesetint/mods/default/textures/default_tool_woodshovel.png diff --git a/share/games/mesetint/mods/default/textures/default_tool_woodsword.png b/games/mesetint/mods/default/textures/default_tool_woodsword.png similarity index 100% rename from share/games/mesetint/mods/default/textures/default_tool_woodsword.png rename to games/mesetint/mods/default/textures/default_tool_woodsword.png diff --git a/share/games/mesetint/mods/default/textures/default_torch.png b/games/mesetint/mods/default/textures/default_torch.png similarity index 100% rename from share/games/mesetint/mods/default/textures/default_torch.png rename to games/mesetint/mods/default/textures/default_torch.png diff --git a/share/games/mesetint/mods/default/textures/default_torch_on_ceiling.png b/games/mesetint/mods/default/textures/default_torch_on_ceiling.png similarity index 100% rename from share/games/mesetint/mods/default/textures/default_torch_on_ceiling.png rename to games/mesetint/mods/default/textures/default_torch_on_ceiling.png diff --git a/share/games/mesetint/mods/default/textures/default_torch_on_floor.png b/games/mesetint/mods/default/textures/default_torch_on_floor.png similarity index 100% rename from share/games/mesetint/mods/default/textures/default_torch_on_floor.png rename to games/mesetint/mods/default/textures/default_torch_on_floor.png diff --git a/share/games/mesetint/mods/default/textures/default_tree.png b/games/mesetint/mods/default/textures/default_tree.png similarity index 100% rename from share/games/mesetint/mods/default/textures/default_tree.png rename to games/mesetint/mods/default/textures/default_tree.png diff --git a/share/games/mesetint/mods/default/textures/default_tree_top.png b/games/mesetint/mods/default/textures/default_tree_top.png similarity index 100% rename from share/games/mesetint/mods/default/textures/default_tree_top.png rename to games/mesetint/mods/default/textures/default_tree_top.png diff --git a/share/games/mesetint/mods/default/textures/default_water.png b/games/mesetint/mods/default/textures/default_water.png similarity index 100% rename from share/games/mesetint/mods/default/textures/default_water.png rename to games/mesetint/mods/default/textures/default_water.png diff --git a/share/games/mesetint/mods/default/textures/default_wood.png b/games/mesetint/mods/default/textures/default_wood.png similarity index 100% rename from share/games/mesetint/mods/default/textures/default_wood.png rename to games/mesetint/mods/default/textures/default_wood.png diff --git a/share/games/mesetint/mods/default/textures/heart.png b/games/mesetint/mods/default/textures/heart.png similarity index 100% rename from share/games/mesetint/mods/default/textures/heart.png rename to games/mesetint/mods/default/textures/heart.png diff --git a/share/games/mesetint/mods/default/textures/player.png b/games/mesetint/mods/default/textures/player.png similarity index 100% rename from share/games/mesetint/mods/default/textures/player.png rename to games/mesetint/mods/default/textures/player.png diff --git a/share/games/mesetint/mods/default/textures/player_back.png b/games/mesetint/mods/default/textures/player_back.png similarity index 100% rename from share/games/mesetint/mods/default/textures/player_back.png rename to games/mesetint/mods/default/textures/player_back.png diff --git a/share/games/mesetint/mods/default/textures/treeprop.png b/games/mesetint/mods/default/textures/treeprop.png similarity index 100% rename from share/games/mesetint/mods/default/textures/treeprop.png rename to games/mesetint/mods/default/textures/treeprop.png diff --git a/share/games/mesetint/mods/default/textures/wieldhand.png b/games/mesetint/mods/default/textures/wieldhand.png similarity index 100% rename from share/games/mesetint/mods/default/textures/wieldhand.png rename to games/mesetint/mods/default/textures/wieldhand.png diff --git a/share/games/mesetint/mods/experimental/depends.txt b/games/mesetint/mods/experimental/depends.txt similarity index 100% rename from share/games/mesetint/mods/experimental/depends.txt rename to games/mesetint/mods/experimental/depends.txt diff --git a/share/games/mesetint/mods/experimental/init.lua b/games/mesetint/mods/experimental/init.lua similarity index 100% rename from share/games/mesetint/mods/experimental/init.lua rename to games/mesetint/mods/experimental/init.lua diff --git a/share/games/mesetint/mods/experimental/textures/experimental_dummyball.png b/games/mesetint/mods/experimental/textures/experimental_dummyball.png similarity index 100% rename from share/games/mesetint/mods/experimental/textures/experimental_dummyball.png rename to games/mesetint/mods/experimental/textures/experimental_dummyball.png diff --git a/share/games/mesetint/mods/give_initial_stuff/depends.txt b/games/mesetint/mods/give_initial_stuff/depends.txt similarity index 100% rename from share/games/mesetint/mods/give_initial_stuff/depends.txt rename to games/mesetint/mods/give_initial_stuff/depends.txt diff --git a/share/games/mesetint/mods/give_initial_stuff/init.lua b/games/mesetint/mods/give_initial_stuff/init.lua similarity index 100% rename from share/games/mesetint/mods/give_initial_stuff/init.lua rename to games/mesetint/mods/give_initial_stuff/init.lua diff --git a/share/games/mesetint/mods/legacy/depends.txt b/games/mesetint/mods/legacy/depends.txt similarity index 100% rename from share/games/mesetint/mods/legacy/depends.txt rename to games/mesetint/mods/legacy/depends.txt diff --git a/share/games/mesetint/mods/legacy/init.lua b/games/mesetint/mods/legacy/init.lua similarity index 100% rename from share/games/mesetint/mods/legacy/init.lua rename to games/mesetint/mods/legacy/init.lua diff --git a/share/games/mesetint/mods/legacy/textures/apple_iron.png b/games/mesetint/mods/legacy/textures/apple_iron.png similarity index 100% rename from share/games/mesetint/mods/legacy/textures/apple_iron.png rename to games/mesetint/mods/legacy/textures/apple_iron.png diff --git a/share/games/mesetint/mods/legacy/textures/cooked_rat.png b/games/mesetint/mods/legacy/textures/cooked_rat.png similarity index 100% rename from share/games/mesetint/mods/legacy/textures/cooked_rat.png rename to games/mesetint/mods/legacy/textures/cooked_rat.png diff --git a/share/games/mesetint/mods/legacy/textures/dungeon_master.png b/games/mesetint/mods/legacy/textures/dungeon_master.png similarity index 100% rename from share/games/mesetint/mods/legacy/textures/dungeon_master.png rename to games/mesetint/mods/legacy/textures/dungeon_master.png diff --git a/share/games/mesetint/mods/legacy/textures/fireball.png b/games/mesetint/mods/legacy/textures/fireball.png similarity index 100% rename from share/games/mesetint/mods/legacy/textures/fireball.png rename to games/mesetint/mods/legacy/textures/fireball.png diff --git a/share/games/mesetint/mods/legacy/textures/firefly.png b/games/mesetint/mods/legacy/textures/firefly.png similarity index 100% rename from share/games/mesetint/mods/legacy/textures/firefly.png rename to games/mesetint/mods/legacy/textures/firefly.png diff --git a/share/games/mesetint/mods/legacy/textures/oerkki1.png b/games/mesetint/mods/legacy/textures/oerkki1.png similarity index 100% rename from share/games/mesetint/mods/legacy/textures/oerkki1.png rename to games/mesetint/mods/legacy/textures/oerkki1.png diff --git a/share/games/mesetint/mods/legacy/textures/oerkki1_damaged.png b/games/mesetint/mods/legacy/textures/oerkki1_damaged.png similarity index 100% rename from share/games/mesetint/mods/legacy/textures/oerkki1_damaged.png rename to games/mesetint/mods/legacy/textures/oerkki1_damaged.png diff --git a/share/games/mesetint/mods/legacy/textures/rat.png b/games/mesetint/mods/legacy/textures/rat.png similarity index 100% rename from share/games/mesetint/mods/legacy/textures/rat.png rename to games/mesetint/mods/legacy/textures/rat.png diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt index 448f2f6b8..16ab45c5c 100644 --- a/src/CMakeLists.txt +++ b/src/CMakeLists.txt @@ -313,7 +313,8 @@ endif() if(BUILD_CLIENT) install(TARGETS ${PROJECT_NAME} DESTINATION ${BINDIR}) - install(DIRECTORY "${CMAKE_CURRENT_SOURCE_DIR}/../share/" DESTINATION ${SHAREDIR}) + #install(DIRECTORY "${CMAKE_CURRENT_SOURCE_DIR}/../sounds/base/pack" DESTINATION "${SHAREDIR}/sounds/base/") + install(DIRECTORY "${CMAKE_CURRENT_SOURCE_DIR}/../textures/base/pack" DESTINATION "${SHAREDIR}/textures/base/") if(USE_GETTEXT) foreach(LOCALE ${GETTEXT_AVAILABLE_LOCALES}) diff --git a/src/main.cpp b/src/main.cpp index 35595e5aa..75ff569aa 100644 --- a/src/main.cpp +++ b/src/main.cpp @@ -1034,12 +1034,7 @@ int main(int argc, char *argv[]) // Check if the world is found from the default directory, and if // not, see if the legacy world directory exists. world_path = porting::path_user + DIR_DELIM + "worlds" + DIR_DELIM + "world"; -#ifdef RUN_IN_PLACE - std::string legacy_world_path = porting::path_user + DIR_DELIM + - ".." + DIR_DELIM + "world"; -#else std::string legacy_world_path = porting::path_user + DIR_DELIM + "world"; -#endif if(!fs::PathExists(world_path) && fs::PathExists(legacy_world_path)){ errorstream<<"Warning: Using legacy world directory \"" <" len = GetEnvironmentVariable("APPDATA", buf, buflen); @@ -247,7 +248,7 @@ void initializePaths() //path_share = std::string(INSTALL_PREFIX) + "/share/" + PROJECT_NAME; if (!fs::PathExists(path_share)) { dstream<<"WARNING: system-wide share not found at \""< getAvailableWorlds() } // Check old world location do{ -#ifdef RUN_IN_PLACE - std::string fullpath = porting::path_user + DIR_DELIM + ".." - + DIR_DELIM + "world"; -#else std::string fullpath = porting::path_user + DIR_DELIM + "world"; -#endif if(!fs::PathExists(fullpath)) break; std::string name = "Old World"; diff --git a/share/textures/base/pack/fontdejavusansmono.png b/textures/base/pack/fontdejavusansmono.png similarity index 100% rename from share/textures/base/pack/fontdejavusansmono.png rename to textures/base/pack/fontdejavusansmono.png diff --git a/share/textures/base/pack/fontlucida.png b/textures/base/pack/fontlucida.png similarity index 100% rename from share/textures/base/pack/fontlucida.png rename to textures/base/pack/fontlucida.png diff --git a/share/textures/base/pack/menubg.png b/textures/base/pack/menubg.png similarity index 100% rename from share/textures/base/pack/menubg.png rename to textures/base/pack/menubg.png diff --git a/share/textures/base/pack/menulogo.png b/textures/base/pack/menulogo.png similarity index 100% rename from share/textures/base/pack/menulogo.png rename to textures/base/pack/menulogo.png diff --git a/share/textures/base/pack/smoke_puff.png b/textures/base/pack/smoke_puff.png similarity index 100% rename from share/textures/base/pack/smoke_puff.png rename to textures/base/pack/smoke_puff.png diff --git a/share/textures/base/pack/sunrisebg.png b/textures/base/pack/sunrisebg.png similarity index 100% rename from share/textures/base/pack/sunrisebg.png rename to textures/base/pack/sunrisebg.png diff --git a/share/textures/base/pack/unknown_block.png b/textures/base/pack/unknown_block.png similarity index 100% rename from share/textures/base/pack/unknown_block.png rename to textures/base/pack/unknown_block.png diff --git a/share/textures/base/pack/unknown_item.png b/textures/base/pack/unknown_item.png similarity index 100% rename from share/textures/base/pack/unknown_item.png rename to textures/base/pack/unknown_item.png diff --git a/share/textures/base/pack/unknown_object.png b/textures/base/pack/unknown_object.png similarity index 100% rename from share/textures/base/pack/unknown_object.png rename to textures/base/pack/unknown_object.png