- moved the contents of g_inventory to g_shared and gamedata subfolders.

a_pickups only contains a few native remains of the inventory code and the other two only the static data maintenance for their items.
This commit is contained in:
Christoph Oelckers 2019-02-01 18:13:12 +01:00
parent edb34b9f7f
commit 3f90764faa
7 changed files with 6 additions and 5 deletions

View File

@ -647,7 +647,7 @@ file( GLOB HEADER_FILES
fragglescript/*.h fragglescript/*.h
g_shared/*.h g_shared/*.h
g_statusbar/*.h g_statusbar/*.h
g_inventory/*.h gamedata/*.h
intermission/*.h intermission/*.h
maploader/*.h maploader/*.h
menu/*.h menu/*.h
@ -973,9 +973,9 @@ set (PCH_SOURCES
v_video.cpp v_video.cpp
w_wad.cpp w_wad.cpp
wi_stuff.cpp wi_stuff.cpp
g_inventory/a_keys.cpp gamedata/a_keys.cpp
g_inventory/a_pickups.cpp gamedata/a_weapons.cpp
g_inventory/a_weapons.cpp g_shared/a_pickups.cpp
g_shared/a_action.cpp g_shared/a_action.cpp
g_shared/a_decals.cpp g_shared/a_decals.cpp
g_shared/a_doors.cpp g_shared/a_doors.cpp
@ -1321,7 +1321,7 @@ target_link_libraries( zdoom ${ZDOOM_LIBS} gdtoa dumb lzma )
include_directories( . include_directories( .
g_statusbar g_statusbar
g_shared g_shared
g_inventory gamedata
rendering rendering
sound sound
textures textures
@ -1439,6 +1439,7 @@ source_group("External\\Math" REGULAR_EXPRESSION "^${CMAKE_CURRENT_SOURCE_DIR}/m
source_group("External\\RapidJSON" REGULAR_EXPRESSION "^${CMAKE_CURRENT_SOURCE_DIR}/rapidjson/.+") source_group("External\\RapidJSON" REGULAR_EXPRESSION "^${CMAKE_CURRENT_SOURCE_DIR}/rapidjson/.+")
source_group("External\\SFMT" REGULAR_EXPRESSION "^${CMAKE_CURRENT_SOURCE_DIR}/sfmt/.+") source_group("External\\SFMT" REGULAR_EXPRESSION "^${CMAKE_CURRENT_SOURCE_DIR}/sfmt/.+")
source_group("FraggleScript" REGULAR_EXPRESSION "^${CMAKE_CURRENT_SOURCE_DIR}/fragglescript/.+") source_group("FraggleScript" REGULAR_EXPRESSION "^${CMAKE_CURRENT_SOURCE_DIR}/fragglescript/.+")
source_group("Game Data" REGULAR_EXPRESSION "^${CMAKE_CURRENT_SOURCE_DIR}/gamedata/.+")
source_group("Intermission" REGULAR_EXPRESSION "^${CMAKE_CURRENT_SOURCE_DIR}/intermission/.+") source_group("Intermission" REGULAR_EXPRESSION "^${CMAKE_CURRENT_SOURCE_DIR}/intermission/.+")
source_group("Map Loader" REGULAR_EXPRESSION "^${CMAKE_CURRENT_SOURCE_DIR}/maploader/.+") source_group("Map Loader" REGULAR_EXPRESSION "^${CMAKE_CURRENT_SOURCE_DIR}/maploader/.+")
source_group("Menu" REGULAR_EXPRESSION "^${CMAKE_CURRENT_SOURCE_DIR}/menu/.+") source_group("Menu" REGULAR_EXPRESSION "^${CMAKE_CURRENT_SOURCE_DIR}/menu/.+")