diff options
| author |  Sadie Powell | 2023-07-15 08:18:05 +0100 |
|---|---|---|
| committer | Sadie Powell | 2023-07-15 10:31:48 +0100 |
| commit | fd564cd44acf5efe80b6ecaee178e733bb77605e (patch) | |
| tree | 57aca8ef30bc3ac7ba62eed45d100afbcb9d6207 | |
| parent | Simplify the codes that InspIRCd can exit with. (diff) | |
Rename several Windows files to use the same naming scheme.
[skip alpine ci]
[skip irctest ci]
[skip macos ci]
[skip ubuntu ci]
| -rw-r--r-- | include/compat.h | 2 | ||||
| -rw-r--r-- | win/CMakeLists.txt | 6 | ||||
| -rw-r--r-- | win/modules/CMakeLists.txt | 4 | ||||
| -rw-r--r-- | win/win32memory.cpp (renamed from win/inspircd_memory_functions.cpp) | 0 | ||||
| -rw-r--r-- | win/win32wrapper.cpp (renamed from win/inspircd_win32wrapper.cpp) | 0 | ||||
| -rw-r--r-- | win/win32wrapper.h (renamed from win/inspircd_win32wrapper.h) | 0 |
6 files changed, 6 insertions, 6 deletions
diff --git a/include/compat.h b/include/compat.h index d2cb18b86..7cee76142 100644 --- a/include/compat.h +++ b/include/compat.h @@ -37,7 +37,7 @@ * order to build on Windows correctly. */ #if defined _WIN32 -# include "inspircd_win32wrapper.h" +# include "win32wrapper.h" #else # define DllExport __attribute__ ((visibility ("default"))) # define CoreExport __attribute__ ((visibility ("default"))) diff --git a/win/CMakeLists.txt b/win/CMakeLists.txt index 676c313b0..6ec76d5e8 100644 --- a/win/CMakeLists.txt +++ b/win/CMakeLists.txt @@ -45,7 +45,7 @@ string(REGEX REPLACE ".*InspIRCd-([^\"]+).*" "\\1" VERSION_FULL "${VERSIONSH}") file(GLOB INSPIRCD_SOURCES RELATIVE ${CMAKE_CURRENT_SOURCE_DIR} "${INSPIRCD_BASE}/src/*.cpp" "${INSPIRCD_BASE}/src/socketengines/select.cpp" - "${INSPIRCD_BASE}/win/inspircd_win32wrapper.cpp" + "${INSPIRCD_BASE}/win/win32wrapper.cpp" "${INSPIRCD_BASE}/win/win32service.cpp" ) list(SORT INSPIRCD_SOURCES) @@ -54,14 +54,14 @@ include_directories("${INSPIRCD_BASE}/win" "${INSPIRCD_BASE}/include") include_directories(SYSTEM "${INSPIRCD_BASE}/vendor") if(MSVC) - add_library(win32_memory STATIC "${INSPIRCD_BASE}/win/inspircd_memory_functions.cpp") + add_library(win32memory STATIC "${INSPIRCD_BASE}/win/win32memory.cpp") endif() configure_file("${INSPIRCD_BASE}/win/inspircd.rc.cmake" "${INSPIRCD_BASE}/win/inspircd.rc") configure_file("${INSPIRCD_BASE}/make/template/config.h" "${INSPIRCD_BASE}/include/config.h") add_executable(inspircd ${INSPIRCD_SOURCES} "${INSPIRCD_BASE}/win/inspircd.rc") -target_link_libraries(inspircd win32_memory) +target_link_libraries(inspircd win32memory) set_target_properties(inspircd PROPERTIES COMPILE_DEFINITIONS "FMT_LIB_EXPORT" ENABLE_EXPORTS ON) install(TARGETS inspircd RUNTIME DESTINATION .) diff --git a/win/modules/CMakeLists.txt b/win/modules/CMakeLists.txt index 751f4ae3e..36219cfb0 100644 --- a/win/modules/CMakeLists.txt +++ b/win/modules/CMakeLists.txt @@ -64,8 +64,8 @@ foreach(MODULE_NAME ${INSPIRCD_MODULES}) target_link_libraries(${BASE_NAME} inspircd)
add_dependencies(${BASE_NAME} inspircd)
if(MSVC)
- target_link_libraries(${BASE_NAME} win32_memory)
- add_dependencies(${BASE_NAME} win32_memory)
+ target_link_libraries(${BASE_NAME} win32memory)
+ add_dependencies(${BASE_NAME} win32memory)
endif()
if(CONAN_CXX_FLAGS)
diff --git a/win/inspircd_memory_functions.cpp b/win/win32memory.cpp index c2535091f..c2535091f 100644 --- a/win/inspircd_memory_functions.cpp +++ b/win/win32memory.cpp diff --git a/win/inspircd_win32wrapper.cpp b/win/win32wrapper.cpp index 7fa0f8513..7fa0f8513 100644 --- a/win/inspircd_win32wrapper.cpp +++ b/win/win32wrapper.cpp diff --git a/win/inspircd_win32wrapper.h b/win/win32wrapper.h index 72f97caf1..72f97caf1 100644 --- a/win/inspircd_win32wrapper.h +++ b/win/win32wrapper.h |