Remove unnecessary prefix from socketengine source files.

This commit is contained in:
Sadie Powell 2021-03-05 08:19:21 +00:00
parent be0cfca236
commit f644b58a01
8 changed files with 5 additions and 6 deletions

2
configure vendored
View File

@ -181,7 +181,7 @@ push @socketengines, 'select';
if (defined $opt_socketengine) {
unless (grep { $_ eq $opt_socketengine } @socketengines) {
my $reason = -f "src/socketengines/socketengine_$opt_socketengine.cpp" ? 'is not available on this platform' : 'does not exist';
my $reason = -f "src/socketengines/$opt_socketengine.cpp" ? 'is not available on this platform' : 'does not exist';
print_error "The socket engine you requested ($opt_socketengine) $reason!",
'Available socket engines are:',
map { " * $_" } @socketengines;

View File

@ -80,10 +80,9 @@ all: inspircd modules
END
my(@core_deps, @modlist);
for my $file (<*.cpp>, <socketengines/*.cpp>) {
for my $file (<*.cpp>, "socketengines/$ENV{SOCKETENGINE}.cpp") {
my $out = find_output $file;
dep_cpp $file, $out, 'gen-o';
next if $file =~ m#^socketengines/# && $file ne "socketengines/socketengine_$ENV{SOCKETENGINE}.cpp";
# Having a module in the src directory is a bad idea because it will be linked to the core binary
if ($file =~ /^(m|core)_.*\.cpp/) {
my $correctsubdir = ($file =~ /^m_/ ? "modules" : "coremods");

View File

@ -58,8 +58,8 @@ our @EXPORT = qw(CONFIGURE_CACHE_FILE
sub __get_socketengines {
my @socketengines;
for (<${\CONFIGURE_ROOT}/src/socketengines/socketengine_*.cpp>) {
s/src\/socketengines\/socketengine_(\w+)\.cpp/$1/;
for (<${\CONFIGURE_ROOT}/src/socketengines/*.cpp>) {
s/src\/socketengines\/(\w+)\.cpp/$1/;
push @socketengines, $1;
}
return @socketengines;

View File

@ -44,7 +44,7 @@ endif(MSVC)
file(GLOB INSPIRCD_SOURCES RELATIVE ${CMAKE_CURRENT_SOURCE_DIR}
"${INSPIRCD_BASE}/win/inspircd_win32wrapper.cpp"
"${INSPIRCD_BASE}/win/win32service.cpp" "${INSPIRCD_BASE}/src/*.cpp"
"${INSPIRCD_BASE}/src/socketengines/socketengine_select.cpp"
"${INSPIRCD_BASE}/src/socketengines/select.cpp"
)
list(SORT INSPIRCD_SOURCES)