From ec52e90e54a09011b8c74b3613bbb18149509116 Mon Sep 17 00:00:00 2001 From: Christoph Oelckers Date: Sun, 14 Jul 2019 14:39:21 +0200 Subject: [PATCH] - moved more files out of the root src directory. --- src/skins.cpp => docs/skins.txt | 0 src/CMakeLists.txt | 21 ++++++++++----------- src/{ => console}/c_bind.cpp | 0 src/{ => console}/c_bind.h | 0 src/{ => console}/c_cmds.cpp | 0 src/{ => console}/c_console.cpp | 0 src/{ => console}/c_console.h | 0 src/{ => console}/c_consolebuffer.cpp | 0 src/{ => console}/c_consolebuffer.h | 0 src/{ => console}/c_cvars.cpp | 1 - src/{ => console}/c_cvars.h | 0 src/{ => console}/c_dispatch.cpp | 0 src/{ => console}/c_dispatch.h | 0 src/{ => console}/c_expr.cpp | 0 src/{ => console}/c_functions.cpp | 0 src/{ => console}/c_functions.h | 0 src/{ => gamedata}/gametype.h | 0 src/{ => gamedata}/p_blockmap.h | 0 src/{ => playsim}/actionspecials.h | 0 src/{ => playsim}/d_player.h | 0 src/{ => r_data}/v_colortables.h | 0 21 files changed, 10 insertions(+), 12 deletions(-) rename src/skins.cpp => docs/skins.txt (100%) rename src/{ => console}/c_bind.cpp (100%) rename src/{ => console}/c_bind.h (100%) rename src/{ => console}/c_cmds.cpp (100%) rename src/{ => console}/c_console.cpp (100%) rename src/{ => console}/c_console.h (100%) rename src/{ => console}/c_consolebuffer.cpp (100%) rename src/{ => console}/c_consolebuffer.h (100%) rename src/{ => console}/c_cvars.cpp (99%) rename src/{ => console}/c_cvars.h (100%) rename src/{ => console}/c_dispatch.cpp (100%) rename src/{ => console}/c_dispatch.h (100%) rename src/{ => console}/c_expr.cpp (100%) rename src/{ => console}/c_functions.cpp (100%) rename src/{ => console}/c_functions.h (100%) rename src/{ => gamedata}/gametype.h (100%) rename src/{ => gamedata}/p_blockmap.h (100%) rename src/{ => playsim}/actionspecials.h (100%) rename src/{ => playsim}/d_player.h (100%) rename src/{ => r_data}/v_colortables.h (100%) diff --git a/src/skins.cpp b/docs/skins.txt similarity index 100% rename from src/skins.cpp rename to docs/skins.txt diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt index 96918eccd1..26d3a72377 100644 --- a/src/CMakeLists.txt +++ b/src/CMakeLists.txt @@ -658,6 +658,7 @@ add_definitions(-DOPNMIDI_DISABLE_GX_EMULATOR) # Project files should be aware of the header files. We can GLOB these since # there's generally a new cpp for every header so this file will get changed file( GLOB HEADER_FILES + console/*.h playsim/*.h playsim/bots/*.h playsim/fragglescript/*.h @@ -937,14 +938,14 @@ set (PCH_SOURCES playsim/bots/b_move.cpp playsim/bots/b_think.cpp bbannouncer.cpp - c_bind.cpp - c_cmds.cpp - c_console.cpp - c_consolebuffer.cpp - c_cvars.cpp - c_dispatch.cpp - c_expr.cpp - c_functions.cpp + console/c_bind.cpp + console/c_cmds.cpp + console/c_console.cpp + console/c_consolebuffer.cpp + console/c_cvars.cpp + console/c_dispatch.cpp + console/c_expr.cpp + console/c_functions.cpp ct_chat.cpp d_iwad.cpp d_main.cpp @@ -1377,6 +1378,7 @@ target_link_libraries( zdoom ${ZDOOM_LIBS} gdtoa dumb lzma ) include_directories( . g_statusbar + console playsim playsim/bots playsim/mapthinkers @@ -1501,9 +1503,6 @@ source_group("Audio Files\\MIDI Devices" REGULAR_EXPRESSION "^${CMAKE_CURRENT_SO source_group("Audio Files\\MIDI Sources" REGULAR_EXPRESSION "^${CMAKE_CURRENT_SOURCE_DIR}/sound/midisources/.+") source_group("Audio Files\\Music formats" REGULAR_EXPRESSION "^${CMAKE_CURRENT_SOURCE_DIR}/sound/musicformats/.+") source_group("Audio Files\\Third-party" REGULAR_EXPRESSION "^${CMAKE_CURRENT_SOURCE_DIR}/sound/thirdparty/.+") -source_group("External\\Math" REGULAR_EXPRESSION "^${CMAKE_CURRENT_SOURCE_DIR}/math/.+") -source_group("External\\RapidJSON" REGULAR_EXPRESSION "^${CMAKE_CURRENT_SOURCE_DIR}/rapidjson/.+") -source_group("External\\SFMT" REGULAR_EXPRESSION "^${CMAKE_CURRENT_SOURCE_DIR}/sfmt/.+") source_group("Game Data" REGULAR_EXPRESSION "^${CMAKE_CURRENT_SOURCE_DIR}/gamedata/.+") source_group("Game Data\\Resource Files" REGULAR_EXPRESSION "^${CMAKE_CURRENT_SOURCE_DIR}/gamedata/resourcefiles/.+") source_group("Game Data\\Fonts" REGULAR_EXPRESSION "^${CMAKE_CURRENT_SOURCE_DIR}/gamedata/fonts/.+") diff --git a/src/c_bind.cpp b/src/console/c_bind.cpp similarity index 100% rename from src/c_bind.cpp rename to src/console/c_bind.cpp diff --git a/src/c_bind.h b/src/console/c_bind.h similarity index 100% rename from src/c_bind.h rename to src/console/c_bind.h diff --git a/src/c_cmds.cpp b/src/console/c_cmds.cpp similarity index 100% rename from src/c_cmds.cpp rename to src/console/c_cmds.cpp diff --git a/src/c_console.cpp b/src/console/c_console.cpp similarity index 100% rename from src/c_console.cpp rename to src/console/c_console.cpp diff --git a/src/c_console.h b/src/console/c_console.h similarity index 100% rename from src/c_console.h rename to src/console/c_console.h diff --git a/src/c_consolebuffer.cpp b/src/console/c_consolebuffer.cpp similarity index 100% rename from src/c_consolebuffer.cpp rename to src/console/c_consolebuffer.cpp diff --git a/src/c_consolebuffer.h b/src/console/c_consolebuffer.h similarity index 100% rename from src/c_consolebuffer.h rename to src/console/c_consolebuffer.h diff --git a/src/c_cvars.cpp b/src/console/c_cvars.cpp similarity index 99% rename from src/c_cvars.cpp rename to src/console/c_cvars.cpp index 1a41aa1f40..af65f82d2e 100644 --- a/src/c_cvars.cpp +++ b/src/console/c_cvars.cpp @@ -498,7 +498,6 @@ static uint8_t HexToByte (const char *hex) UCVarValue FBaseCVar::FromString (const char *value, ECVarType type) { UCVarValue ret; - int i; switch (type) { diff --git a/src/c_cvars.h b/src/console/c_cvars.h similarity index 100% rename from src/c_cvars.h rename to src/console/c_cvars.h diff --git a/src/c_dispatch.cpp b/src/console/c_dispatch.cpp similarity index 100% rename from src/c_dispatch.cpp rename to src/console/c_dispatch.cpp diff --git a/src/c_dispatch.h b/src/console/c_dispatch.h similarity index 100% rename from src/c_dispatch.h rename to src/console/c_dispatch.h diff --git a/src/c_expr.cpp b/src/console/c_expr.cpp similarity index 100% rename from src/c_expr.cpp rename to src/console/c_expr.cpp diff --git a/src/c_functions.cpp b/src/console/c_functions.cpp similarity index 100% rename from src/c_functions.cpp rename to src/console/c_functions.cpp diff --git a/src/c_functions.h b/src/console/c_functions.h similarity index 100% rename from src/c_functions.h rename to src/console/c_functions.h diff --git a/src/gametype.h b/src/gamedata/gametype.h similarity index 100% rename from src/gametype.h rename to src/gamedata/gametype.h diff --git a/src/p_blockmap.h b/src/gamedata/p_blockmap.h similarity index 100% rename from src/p_blockmap.h rename to src/gamedata/p_blockmap.h diff --git a/src/actionspecials.h b/src/playsim/actionspecials.h similarity index 100% rename from src/actionspecials.h rename to src/playsim/actionspecials.h diff --git a/src/d_player.h b/src/playsim/d_player.h similarity index 100% rename from src/d_player.h rename to src/playsim/d_player.h diff --git a/src/v_colortables.h b/src/r_data/v_colortables.h similarity index 100% rename from src/v_colortables.h rename to src/r_data/v_colortables.h