From 355570198de0f66b41b5bb61ff517f7d60985a4c Mon Sep 17 00:00:00 2001 From: Christoph Oelckers Date: Fri, 20 Jan 2017 22:59:31 +0100 Subject: [PATCH] - moved statusbar code to a separate directory before starting work on it. --- src/CMakeLists.txt | 16 ++++++++-------- src/{g_shared => g_statusbar}/sbar.h | 0 src/{g_shared => g_statusbar}/sbar_mugshot.cpp | 0 src/{g_shared => g_statusbar}/sbarinfo.cpp | 0 src/{g_shared => g_statusbar}/sbarinfo.h | 0 .../sbarinfo_commands.cpp | 0 src/{g_shared => g_statusbar}/shared_sbar.cpp | 0 src/{g_strife => g_statusbar}/strife_sbar.cpp | 0 8 files changed, 8 insertions(+), 8 deletions(-) rename src/{g_shared => g_statusbar}/sbar.h (100%) rename src/{g_shared => g_statusbar}/sbar_mugshot.cpp (100%) rename src/{g_shared => g_statusbar}/sbarinfo.cpp (100%) rename src/{g_shared => g_statusbar}/sbarinfo.h (100%) rename src/{g_shared => g_statusbar}/sbarinfo_commands.cpp (100%) rename src/{g_shared => g_statusbar}/shared_sbar.cpp (100%) rename src/{g_strife => g_statusbar}/strife_sbar.cpp (100%) diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt index ad0f28267..2668356cf 100644 --- a/src/CMakeLists.txt +++ b/src/CMakeLists.txt @@ -773,8 +773,8 @@ file( GLOB HEADER_FILES ${EXTRA_HEADER_DIRS} fragglescript/*.h g_shared/*.h + g_statusbar/*.h g_inventory/*.h - g_strife/*.h intermission/*.h menu/*.h oplsynth/*.h @@ -818,7 +818,7 @@ set( NOT_COMPILED_SOURCE_FILES ${OTHER_SYSTEM_SOURCES} sc_man_scanner.h sc_man_scanner.re - g_shared/sbarinfo_commands.cpp + g_statusbar/sbarinfo_commands.cpp xlat/xlat_parser.y xlat_parser.c xlat_parser.h @@ -1148,7 +1148,6 @@ set (PCH_SOURCES g_inventory/a_keys.cpp g_inventory/a_pickups.cpp g_inventory/a_weapons.cpp - g_strife/strife_sbar.cpp g_shared/a_action.cpp g_shared/a_decals.cpp g_shared/a_flashfader.cpp @@ -1157,10 +1156,11 @@ set (PCH_SOURCES g_shared/a_quake.cpp g_shared/a_specialspot.cpp g_shared/hudmessages.cpp - g_shared/sbarinfo.cpp - g_shared/sbar_mugshot.cpp g_shared/shared_hud.cpp - g_shared/shared_sbar.cpp + g_statusbar/sbarinfo.cpp + g_statusbar/sbar_mugshot.cpp + g_statusbar/shared_sbar.cpp + g_statusbar/strife_sbar.cpp resourcefiles/ancientzip.cpp resourcefiles/file_7z.cpp resourcefiles/file_grp.cpp @@ -1274,7 +1274,7 @@ endif() target_link_libraries( zdoom ${ZDOOM_LIBS} gdtoa dumb lzma ) include_directories( . - g_strife + g_statusbar g_shared g_inventory oplsynth @@ -1403,7 +1403,6 @@ 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\\SFMT" REGULAR_EXPRESSION "^${CMAKE_CURRENT_SOURCE_DIR}/sfmt/.+") source_group("FraggleScript" REGULAR_EXPRESSION "^${CMAKE_CURRENT_SOURCE_DIR}/fragglescript/.+") -source_group("Games\\Strife Game" REGULAR_EXPRESSION "^${CMAKE_CURRENT_SOURCE_DIR}/g_strife/.+") source_group("Intermission" REGULAR_EXPRESSION "^${CMAKE_CURRENT_SOURCE_DIR}/intermission/.+") source_group("Inventory" REGULAR_EXPRESSION "^${CMAKE_CURRENT_SOURCE_DIR}/g_inventory/.+") source_group("Menu" REGULAR_EXPRESSION "^${CMAKE_CURRENT_SOURCE_DIR}/menu/.+") @@ -1440,6 +1439,7 @@ source_group("Scripting\\Code Generation" REGULAR_EXPRESSION "^${CMAKE_CURRENT_S source_group("Scripting\\VM" REGULAR_EXPRESSION "^${CMAKE_CURRENT_SOURCE_DIR}/scripting/vm/.+") source_group("Scripting" REGULAR_EXPRESSION "^${CMAKE_CURRENT_SOURCE_DIR}/scripting/.+") source_group("Shared Game" REGULAR_EXPRESSION "^${CMAKE_CURRENT_SOURCE_DIR}/g_shared/.+") +source_group("Statusbar" REGULAR_EXPRESSION "^${CMAKE_CURRENT_SOURCE_DIR}/g_statusbar/.+") source_group("Versioning" FILES version.h win32/zdoom.rc) source_group("Xlat" REGULAR_EXPRESSION "^${CMAKE_CURRENT_SOURCE_DIR}/xlat/.+" FILES ${CMAKE_CURRENT_BINARY_DIR}/xlat_parser.c ${CMAKE_CURRENT_BINARY_DIR}/xlat_parser.h) source_group("Source Files" FILES ${CMAKE_CURRENT_BINARY_DIR}/sc_man_scanner.h sc_man_scanner.re) diff --git a/src/g_shared/sbar.h b/src/g_statusbar/sbar.h similarity index 100% rename from src/g_shared/sbar.h rename to src/g_statusbar/sbar.h diff --git a/src/g_shared/sbar_mugshot.cpp b/src/g_statusbar/sbar_mugshot.cpp similarity index 100% rename from src/g_shared/sbar_mugshot.cpp rename to src/g_statusbar/sbar_mugshot.cpp diff --git a/src/g_shared/sbarinfo.cpp b/src/g_statusbar/sbarinfo.cpp similarity index 100% rename from src/g_shared/sbarinfo.cpp rename to src/g_statusbar/sbarinfo.cpp diff --git a/src/g_shared/sbarinfo.h b/src/g_statusbar/sbarinfo.h similarity index 100% rename from src/g_shared/sbarinfo.h rename to src/g_statusbar/sbarinfo.h diff --git a/src/g_shared/sbarinfo_commands.cpp b/src/g_statusbar/sbarinfo_commands.cpp similarity index 100% rename from src/g_shared/sbarinfo_commands.cpp rename to src/g_statusbar/sbarinfo_commands.cpp diff --git a/src/g_shared/shared_sbar.cpp b/src/g_statusbar/shared_sbar.cpp similarity index 100% rename from src/g_shared/shared_sbar.cpp rename to src/g_statusbar/shared_sbar.cpp diff --git a/src/g_strife/strife_sbar.cpp b/src/g_statusbar/strife_sbar.cpp similarity index 100% rename from src/g_strife/strife_sbar.cpp rename to src/g_statusbar/strife_sbar.cpp