pa/eqemu-server
2
0
Fork 0
mirror of https://github.com/EQEmu/Server.git synced 2026-06-28 17:37:18 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

CMake cleanup (#5082)
Build / Linux (push) Has been cancelled
Details
Build / Windows (push) Has been cancelled
Details

Browse Source
This commit is contained in:
brainiac
2026-05-17 15:05:46 -07:00
committed by GitHub
parent 7d98b10c18
commit 11a8e46ee8
21 changed files with 1643 additions and 1665 deletions
Download Patch File Download Diff File Expand all files Collapse all files
.github/workflows/build.yaml
+4 -4
View File
@@ -39,7 +39,7 @@ jobs:
- name: Configure - name: Configure
run: | run: |
cmake -S . -B build -G Ninja \ cmake -S . -B build -G Ninja \
-DCMAKE_BUILD_TYPE=RelWithDebInfo \ -DCMAKE_BUILD_TYPE=Release \
-DCMAKE_C_COMPILER_LAUNCHER=ccache \ -DCMAKE_C_COMPILER_LAUNCHER=ccache \
-DCMAKE_CXX_COMPILER_LAUNCHER=ccache \ -DCMAKE_CXX_COMPILER_LAUNCHER=ccache \
-DEQEMU_BUILD_TESTS=ON \ -DEQEMU_BUILD_TESTS=ON \
@@ -89,7 +89,7 @@ jobs:
shell: pwsh shell: pwsh
run: | run: |
cmake -S . -B build -G "Visual Studio 17 2022" -A x64 ` cmake -S . -B build -G "Visual Studio 17 2022" -A x64 `
-DCMAKE_BUILD_TYPE=RelWithDebInfo ` -DCMAKE_BUILD_TYPE=Release `
-DEQEMU_BUILD_TESTS=ON ` -DEQEMU_BUILD_TESTS=ON `
-DEQEMU_BUILD_LOGIN=ON ` -DEQEMU_BUILD_LOGIN=ON `
-DEQEMU_BUILD_LUA=ON ` -DEQEMU_BUILD_LUA=ON `
@@ -98,8 +98,8 @@ jobs:
- name: Build - name: Build
shell: pwsh shell: pwsh
run: cmake --build build --config RelWithDebInfo --target ALL_BUILD -- /m run: cmake --build build --config Release --target ALL_BUILD -- /m
- name: Test - name: Test
working-directory: build working-directory: build
run: ./bin/RelWithDebInfo/tests.exe run: ./bin/Release/tests.exe
CMakeLists.txt
+21 -16
View File
@@ -18,6 +18,17 @@ if(NOT CMAKE_TOOLCHAIN_FILE)
endif() endif()
endif() endif()
# Uncomment to generate just the standard Debug and Release configurations
#set(CMAKE_BUILD_TYPE "Debug")
#set(CMAKE_CONFIGURATION_TYPES "Debug;Release" CACHE STRING "" FORCE)
set(CMAKE_EXPORT_COMPILE_COMMANDS ON)
set(CMAKE_CXX_STANDARD 20)
set(CMAKE_CXX_STANDARD_REQUIRED ON)
set(CMAKE_CXX_EXTENSIONS OFF)
set(dummy "${CMAKE_C_COMPILER}")
project(EQEmu project(EQEmu
VERSION 24.10.3 VERSION 24.10.3
LANGUAGES CXX LANGUAGES CXX
@@ -27,34 +38,28 @@ set_property(GLOBAL PROPERTY USE_FOLDERS ON)
#explicitly set CMP0167 for Find Boost #explicitly set CMP0167 for Find Boost
if(POLICY CMP0167) if(POLICY CMP0167)
cmake_policy(SET CMP0167 NEW) cmake_policy(SET CMP0167 NEW)
endif() endif()
if(NOT CMAKE_CONFIGURATION_TYPES AND NOT CMAKE_BUILD_TYPE) option(EQEMU_BUILD_PCH "Build with precompiled headers" ON)
set(CMAKE_BUILD_TYPE "RelWithDebInfo" CACHE STRING "Build type")
endif()
set(CMAKE_CXX_STANDARD 20) include_directories("${CMAKE_CURRENT_SOURCE_DIR}")
set(CMAKE_CXX_STANDARD_REQUIRED ON)
set(CMAKE_CXX_EXTENSIONS OFF)
option(EQEMU_BUILD_PCH "Build with precompiled headers (Windows)" ON)
if(MSVC) if(MSVC)
add_compile_options(/bigobj) # Always build with debug symbols
add_compile_definitions(_CRT_SECURE_NO_WARNINGS NOMINMAX WIN32_LEAN_AND_MEAN CRASH_LOGGING) add_compile_options("$<$<CONFIG:RELEASE>:/Zi>")
set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} /MP") add_link_options("$<$<CONFIG:RELEASE>:/DEBUG /OPT:REF /OPT:ICF>")
option(EQEMU_DISABLE_MSVC_WARNINGS "Disable MSVC compile warnings." OFF) add_compile_options(/bigobj /MP)
if(EQEMU_DISABLE_MSVC_WARNINGS) add_compile_definitions(_CRT_SECURE_NO_WARNINGS NOMINMAX WIN32_LEAN_AND_MEAN CRASH_LOGGING)
add_compile_options(/W0 /wd4005 /wd4996 /nologo /Os)
endif()
option(EQEMU_MSVC_DEBUG_CRT "Use the debug CRT on MSVC debug builds" OFF) option(EQEMU_MSVC_DEBUG_CRT "Use the debug CRT on MSVC debug builds" OFF)
if(EQEMU_MSVC_DEBUG_CRT) if(EQEMU_MSVC_DEBUG_CRT)
add_compile_definitions(_CRT_DBG_MAP_ALLOC) add_compile_definitions(_CRT_DBG_MAP_ALLOC)
endif() endif()
else() else()
add_compile_options("$<$<CONFIG:RELEASE>:-g>")
add_compile_definitions(HAS_UNION_SEMUN) add_compile_definitions(HAS_UNION_SEMUN)
endif() endif()
CMakePresets.json
+72 -47
View File
@@ -1,49 +1,74 @@
{ {
"version": 3, "version": 3,
"cmakeMinimumRequired": { "cmakeMinimumRequired": {
"major": 3, "major": 3,
"minor": 19, "minor": 20,
"patch": 0 "patch": 0
}, },
"configurePresets": [ "configurePresets": [
{ {
"name": "linux-debug", "name": "linux",
"displayName": "Linux Debug", "displayName": "Linux-Ninja",
"generator": "Ninja", "generator": "Ninja",
"binaryDir": "${sourceDir}/build", "binaryDir": "${sourceDir}/build",
"cacheVariables": { "cacheVariables": {
"CMAKE_BUILD_TYPE": "Debug", "EQEMU_BUILD_TESTS": "ON"
"CMAKE_EXPORT_COMPILE_COMMANDS": "ON", }
"CMAKE_C_COMPILER_LAUNCHER": "ccache", },
"CMAKE_CXX_COMPILER_LAUNCHER": "ccache", {
"EQEMU_BUILD_LOGIN": "ON", "name": "linux-clang",
"EQEMU_BUILD_TESTS": "ON", "displayName": "Linux-Ninja (Clang)",
"EQEMU_ADD_PROFILER": "ON" "generator": "Ninja",
} "binaryDir": "${sourceDir}/build",
}, "cacheVariables": {
{ "EQEMU_BUILD_TESTS": "ON",
"name": "linux-release", "CMAKE_C_COMPILER": "clang",
"displayName": "Linux Release", "CMAKE_CXX_COMPILER": "clang++"
"generator": "Ninja", }
"binaryDir": "${sourceDir}/build/release", },
"cacheVariables": { {
"CMAKE_BUILD_TYPE": "Release", "name": "linux-ccache",
"CMAKE_C_COMPILER_LAUNCHER": "ccache", "displayName": "Linux-Ninja (Ccache)",
"CMAKE_CXX_COMPILER_LAUNCHER": "ccache", "generator": "Ninja",
"EQEMU_BUILD_LOGIN": "ON" "binaryDir": "${sourceDir}/build",
} "cacheVariables": {
}, "CMAKE_C_COMPILER_LAUNCHER": "ccache",
{ "CMAKE_CXX_COMPILER_LAUNCHER": "ccache",
"name": "win-msvc", "EQEMU_BUILD_TESTS": "ON"
"displayName": "Windows MSVC (VS 2022)", }
"generator": "Visual Studio 17 2022", },
"binaryDir": "${sourceDir}/build/${presetName}", {
"architecture": { "value": "x64" }, "name": "linux-clang-ccache",
"cacheVariables": { "displayName": "Linux-Ninja (Clang, Ccache)",
"CMAKE_CONFIGURATION_TYPES": "Debug;Release", "generator": "Ninja",
"EQEMU_BUILD_LOGIN": "ON", "binaryDir": "${sourceDir}/build",
"EQEMU_BUILD_TESTS": "ON" "cacheVariables": {
} "CMAKE_C_COMPILER_LAUNCHER": "ccache",
} "CMAKE_CXX_COMPILER_LAUNCHER": "ccache",
] "EQEMU_BUILD_TESTS": "ON",
"CMAKE_C_COMPILER": "clang",
"CMAKE_CXX_COMPILER": "clang++"
}
},
{
"name": "win-msvc-2022",
"displayName": "Windows MSVC (VS 2022)",
"generator": "Visual Studio 17 2022",
"binaryDir": "${sourceDir}/build",
"architecture": { "value": "x64" },
"cacheVariables": {
"EQEMU_BUILD_TESTS": "ON"
}
},
{
"name": "win-msvc-2026",
"displayName": "Windows MSVC (VS 2026)",
"generator": "Visual Studio 18 2026",
"binaryDir": "${sourceDir}/build",
"architecture": { "value": "x64" },
"cacheVariables": {
"EQEMU_BUILD_TESTS": "ON"
}
}
]
} }
client_files/CMakeLists.txt
-2
View File
@@ -1,4 +1,2 @@
cmake_minimum_required(VERSION 3.20)
add_subdirectory(import) add_subdirectory(import)
add_subdirectory(export) add_subdirectory(export)
client_files/export/CMakeLists.txt
-3
View File
@@ -1,5 +1,3 @@
cmake_minimum_required(VERSION 3.20.0)
set(export_sources set(export_sources
main.cpp main.cpp
) )
@@ -12,7 +10,6 @@ add_executable(export_client_files ${export_sources} ${export_headers})
install(TARGETS export_client_files RUNTIME DESTINATION ${CMAKE_INSTALL_PREFIX}/bin) install(TARGETS export_client_files RUNTIME DESTINATION ${CMAKE_INSTALL_PREFIX}/bin)
target_link_libraries(export_client_files common) target_link_libraries(export_client_files common)
target_include_directories(export_client_files PRIVATE ../..)
set(EXECUTABLE_OUTPUT_PATH ${PROJECT_BINARY_DIR}/bin) set(EXECUTABLE_OUTPUT_PATH ${PROJECT_BINARY_DIR}/bin)
set_property(TARGET export_client_files PROPERTY FOLDER executables/tools) set_property(TARGET export_client_files PROPERTY FOLDER executables/tools)
client_files/import/CMakeLists.txt
-3
View File
@@ -1,5 +1,3 @@
cmake_minimum_required(VERSION 3.20.0)
set(import_sources set(import_sources
main.cpp main.cpp
) )
@@ -12,7 +10,6 @@ add_executable(import_client_files ${import_sources} ${import_headers})
install(TARGETS import_client_files RUNTIME DESTINATION ${CMAKE_INSTALL_PREFIX}/bin) install(TARGETS import_client_files RUNTIME DESTINATION ${CMAKE_INSTALL_PREFIX}/bin)
target_link_libraries(import_client_files common) target_link_libraries(import_client_files common)
target_include_directories(import_client_files PRIVATE ../..)
set(EXECUTABLE_OUTPUT_PATH ${PROJECT_BINARY_DIR}/bin) set(EXECUTABLE_OUTPUT_PATH ${PROJECT_BINARY_DIR}/bin)
set_property(TARGET import_client_files PROPERTY FOLDER executables/tools) set_property(TARGET import_client_files PROPERTY FOLDER executables/tools)
common/CMakeLists.txt
+744 -753
View File
File diff suppressed because it is too large Load Diff
eqlaunch/CMakeLists.txt
-3
View File
@@ -1,5 +1,3 @@
cmake_minimum_required(VERSION 3.20)
set(eqlaunch_sources set(eqlaunch_sources
eqlaunch.cpp eqlaunch.cpp
worldserver.cpp worldserver.cpp
@@ -16,7 +14,6 @@ add_executable(eqlaunch ${eqlaunch_sources} ${eqlaunch_headers})
install(TARGETS eqlaunch RUNTIME DESTINATION ${CMAKE_INSTALL_PREFIX}/bin) install(TARGETS eqlaunch RUNTIME DESTINATION ${CMAKE_INSTALL_PREFIX}/bin)
target_link_libraries(eqlaunch common) target_link_libraries(eqlaunch common)
target_include_directories(eqlaunch PRIVATE ..)
set(EXECUTABLE_OUTPUT_PATH ${PROJECT_BINARY_DIR}/bin) set(EXECUTABLE_OUTPUT_PATH ${PROJECT_BINARY_DIR}/bin)
set_property(TARGET eqlaunch PROPERTY FOLDER executables/tools) set_property(TARGET eqlaunch PROPERTY FOLDER executables/tools)
libs/perlbind/CMakeLists.txt
+34 -34
View File
@@ -3,58 +3,58 @@ cmake_minimum_required(VERSION 3.20.0)
project(perlbind LANGUAGES CXX) project(perlbind LANGUAGES CXX)
set(PERLBIND_HEADERS set(PERLBIND_HEADERS
include/perlbind/array.h include/perlbind/array.h
include/perlbind/forward.h include/perlbind/forward.h
include/perlbind/function.h include/perlbind/function.h
include/perlbind/hash.h include/perlbind/hash.h
include/perlbind/interpreter.h include/perlbind/interpreter.h
include/perlbind/iterator.h include/perlbind/iterator.h
include/perlbind/package.h include/perlbind/package.h
include/perlbind/perlbind.h include/perlbind/perlbind.h
include/perlbind/scalar.h include/perlbind/scalar.h
include/perlbind/stack.h include/perlbind/stack.h
include/perlbind/stack_push.h include/perlbind/stack_push.h
include/perlbind/stack_read.h include/perlbind/stack_read.h
include/perlbind/subcaller.h include/perlbind/subcaller.h
include/perlbind/traits.h include/perlbind/traits.h
include/perlbind/typemap.h include/perlbind/typemap.h
include/perlbind/types.h include/perlbind/types.h
include/perlbind/util.h include/perlbind/util.h
include/perlbind/version.h include/perlbind/version.h
) )
set(PERLBIND_SOURCES set(PERLBIND_SOURCES
src/function.cpp src/function.cpp
src/hash.cpp src/hash.cpp
src/interpreter.cpp src/interpreter.cpp
src/package.cpp src/package.cpp
) )
if(MSVC) if(MSVC)
set(PERLBIND_SOURCES ${PERLBIND_SOURCES} src/perlbind.natvis) set(PERLBIND_SOURCES ${PERLBIND_SOURCES} src/perlbind.natvis)
endif() endif()
add_library(perlbind ${PERLBIND_SOURCES} ${PERLBIND_HEADERS}) add_library(perlbind ${PERLBIND_SOURCES} ${PERLBIND_HEADERS})
target_include_directories(perlbind PUBLIC target_include_directories(perlbind PUBLIC
${PERL_INCLUDE_PATH} ${PERL_INCLUDE_PATH}
$<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/include> $<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/include>
$<INSTALL_INTERFACE:include>) $<INSTALL_INTERFACE:include>)
option(PERLBIND_BUILD_TESTS "Build tests" OFF) option(PERLBIND_BUILD_TESTS "Build tests" OFF)
option(PERLBIND_ENABLE_ASAN "Build with address sanitizer" OFF) option(PERLBIND_ENABLE_ASAN "Build with address sanitizer" OFF)
if(PERLBIND_ENABLE_ASAN) if(PERLBIND_ENABLE_ASAN)
target_compile_options(perlbind PRIVATE -fsanitize=address -fno-omit-frame-pointer) target_compile_options(perlbind PRIVATE -fsanitize=address -fno-omit-frame-pointer)
target_link_options(perlbind PRIVATE -fsanitize=address -fno-omit-frame-pointer) target_link_options(perlbind PRIVATE -fsanitize=address -fno-omit-frame-pointer)
endif() endif()
if(PERLBIND_BUILD_TESTS) if(PERLBIND_BUILD_TESTS)
enable_testing() enable_testing()
add_subdirectory(test) add_subdirectory(test)
set_property(DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR} PROPERTY VS_STARTUP_PROJECT tests) set_property(DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR} PROPERTY VS_STARTUP_PROJECT tests)
target_include_directories(tests PRIVATE target_include_directories(tests PRIVATE
${PERL_INCLUDE_PATH} ${PERL_INCLUDE_PATH}
${CMAKE_CURRENT_SOURCE_DIR}/include) ${CMAKE_CURRENT_SOURCE_DIR}/include)
endif() endif()
loginserver/CMakeLists.txt
+6 -9
View File
@@ -1,5 +1,3 @@
cmake_minimum_required(VERSION 3.20)
set(eqlogin_sources set(eqlogin_sources
account_management.cpp account_management.cpp
client.cpp client.cpp
@@ -33,17 +31,16 @@ add_executable(loginserver ${eqlogin_sources} ${eqlogin_headers})
install(TARGETS loginserver RUNTIME DESTINATION ${CMAKE_INSTALL_PREFIX}/bin) install(TARGETS loginserver RUNTIME DESTINATION ${CMAKE_INSTALL_PREFIX}/bin)
target_link_libraries(loginserver common) target_link_libraries(loginserver common)
target_include_directories(loginserver PRIVATE ..)
set(EXECUTABLE_OUTPUT_PATH ${PROJECT_BINARY_DIR}/bin) set(EXECUTABLE_OUTPUT_PATH ${PROJECT_BINARY_DIR}/bin)
set_property(TARGET loginserver PROPERTY FOLDER executables/servers) set_property(TARGET loginserver PROPERTY FOLDER executables/servers)
# vcpkg doesn't copy legacy.dll automatically because it is loaded at runtime, not via the import table. # vcpkg doesn't copy legacy.dll automatically because it is loaded at runtime, not via the import table.
if(WIN32 AND DEFINED VCPKG_INSTALLED_DIR AND DEFINED VCPKG_TARGET_TRIPLET) if(WIN32 AND DEFINED VCPKG_INSTALLED_DIR AND DEFINED VCPKG_TARGET_TRIPLET)
add_custom_command(TARGET loginserver POST_BUILD add_custom_command(TARGET loginserver POST_BUILD
COMMAND ${CMAKE_COMMAND} -E copy_if_different COMMAND ${CMAKE_COMMAND} -E copy_if_different
"$<IF:$<CONFIG:Debug>,${VCPKG_INSTALLED_DIR}/${VCPKG_TARGET_TRIPLET}/debug/bin/legacy.dll,${VCPKG_INSTALLED_DIR}/${VCPKG_TARGET_TRIPLET}/bin/legacy.dll>" "$<IF:$<CONFIG:Debug>,${VCPKG_INSTALLED_DIR}/${VCPKG_TARGET_TRIPLET}/debug/bin/legacy.dll,${VCPKG_INSTALLED_DIR}/${VCPKG_TARGET_TRIPLET}/bin/legacy.dll>"
"$<TARGET_FILE_DIR:loginserver>/legacy.dll" "$<TARGET_FILE_DIR:loginserver>/legacy.dll"
VERBATIM VERBATIM
) )
endif() endif()
queryserv/CMakeLists.txt
+13 -16
View File
@@ -1,22 +1,20 @@
cmake_minimum_required(VERSION 3.20)
set(qserv_sources set(qserv_sources
database.cpp database.cpp
lfguild.cpp lfguild.cpp
queryserv.cpp queryserv.cpp
queryservconfig.cpp queryservconfig.cpp
worldserver.cpp worldserver.cpp
zonelist.cpp zonelist.cpp
zoneserver.cpp zoneserver.cpp
) )
set(qserv_headers set(qserv_headers
database.h database.h
lfguild.h lfguild.h
queryservconfig.h queryservconfig.h
worldserver.h worldserver.h
zonelist.h zonelist.h
zoneserver.h zoneserver.h
) )
add_executable(queryserv ${qserv_sources} ${qserv_headers}) add_executable(queryserv ${qserv_sources} ${qserv_headers})
@@ -26,7 +24,6 @@ install(TARGETS queryserv RUNTIME DESTINATION ${CMAKE_INSTALL_PREFIX}/bin)
add_definitions(-DQSERV) add_definitions(-DQSERV)
target_link_libraries(queryserv common) target_link_libraries(queryserv common)
target_include_directories(queryserv PRIVATE ..)
set(EXECUTABLE_OUTPUT_PATH ${PROJECT_BINARY_DIR}/bin) set(EXECUTABLE_OUTPUT_PATH ${PROJECT_BINARY_DIR}/bin)
set_property(TARGET queryserv PROPERTY FOLDER executables/servers) set_property(TARGET queryserv PROPERTY FOLDER executables/servers)
shared_memory/CMakeLists.txt
-3
View File
@@ -1,5 +1,3 @@
cmake_minimum_required(VERSION 3.17.0)
set(shared_memory_sources set(shared_memory_sources
items.cpp items.cpp
main.cpp main.cpp
@@ -16,7 +14,6 @@ add_executable(shared_memory ${shared_memory_sources} ${shared_memory_headers})
install(TARGETS shared_memory RUNTIME DESTINATION ${CMAKE_INSTALL_PREFIX}/bin) install(TARGETS shared_memory RUNTIME DESTINATION ${CMAKE_INSTALL_PREFIX}/bin)
target_link_libraries(shared_memory common) target_link_libraries(shared_memory common)
target_include_directories(shared_memory PRIVATE ..)
set(EXECUTABLE_OUTPUT_PATH ${PROJECT_BINARY_DIR}/bin) set(EXECUTABLE_OUTPUT_PATH ${PROJECT_BINARY_DIR}/bin)
set_property(TARGET shared_memory PROPERTY FOLDER executables/servers) set_property(TARGET shared_memory PROPERTY FOLDER executables/servers)
tests/CMakeLists.txt
-3
View File
@@ -1,5 +1,3 @@
cmake_minimum_required(VERSION 3.20.0)
add_subdirectory(cppunit) add_subdirectory(cppunit)
set(tests_sources set(tests_sources
@@ -22,7 +20,6 @@ set(tests_headers
add_executable(tests ${tests_sources} ${tests_headers}) add_executable(tests ${tests_sources} ${tests_headers})
target_link_libraries(tests common cppunit) target_link_libraries(tests common cppunit)
target_include_directories(tests PRIVATE ..)
install(TARGETS tests RUNTIME DESTINATION ${CMAKE_INSTALL_PREFIX}/bin) install(TARGETS tests RUNTIME DESTINATION ${CMAKE_INSTALL_PREFIX}/bin)
tests/cppunit/CMakeLists.txt
-2
View File
@@ -1,5 +1,3 @@
cmake_minimum_required(VERSION 3.20.0)
set(cppunit_sources set(cppunit_sources
collectoroutput.cpp collectoroutput.cpp
compileroutput.cpp compileroutput.cpp
ucs/CMakeLists.txt
-3
View File
@@ -1,5 +1,3 @@
cmake_minimum_required(VERSION 3.20)
set(ucs_sources set(ucs_sources
chatchannel.cpp chatchannel.cpp
clientlist.cpp clientlist.cpp
@@ -24,7 +22,6 @@ install(TARGETS ucs RUNTIME DESTINATION ${CMAKE_INSTALL_PREFIX}/bin)
add_definitions(-DUCS) add_definitions(-DUCS)
target_link_libraries(ucs common) target_link_libraries(ucs common)
target_include_directories(ucs PRIVATE ..)
set(EXECUTABLE_OUTPUT_PATH ${PROJECT_BINARY_DIR}/bin) set(EXECUTABLE_OUTPUT_PATH ${PROJECT_BINARY_DIR}/bin)
set_property(TARGET ucs PROPERTY FOLDER executables/servers) set_property(TARGET ucs PROPERTY FOLDER executables/servers)
utils/deprecated/pfs_list/CMakeLists.txt
+1 -3
View File
@@ -1,9 +1,7 @@
CMAKE_MINIMUM_REQUIRED(VERSION 2.6)
PROJECT(PFSUtil) PROJECT(PFSUtil)
IF(NOT CMAKE_BUILD_TYPE) IF(NOT CMAKE_BUILD_TYPE)
SET(CMAKE_BUILD_TYPE "Debug") SET(CMAKE_BUILD_TYPE "Debug")
ENDIF(NOT CMAKE_BUILD_TYPE) ENDIF(NOT CMAKE_BUILD_TYPE)
IF(WIN32) IF(WIN32)
utils/deprecated/pfs_list/Common/CMakeLists.txt
+6 -8
View File
@@ -1,15 +1,13 @@
CMAKE_MINIMUM_REQUIRED(VERSION 2.6)
SET(common_sources SET(common_sources
Source/PFSArchive.cpp Source/PFSArchive.cpp
Source/Compression.cpp Source/Compression.cpp
) )
SET(common_headers SET(common_headers
Include/Archive.h Include/Archive.h
Include/PFSArchive.h Include/PFSArchive.h
Include/PFSDataStructs.h Include/PFSDataStructs.h
Include/Compression.h Include/Compression.h
) )
INCLUDE_DIRECTORIES(Include) INCLUDE_DIRECTORIES(Include)
utils/deprecated/pfs_list/PFSList/CMakeLists.txt
+2 -4
View File
@@ -1,7 +1,5 @@
CMAKE_MINIMUM_REQUIRED(VERSION 2.6)
SET(pfslist_sources SET(pfslist_sources
Source/main.cpp Source/main.cpp
) )
SET(pfslist_headers SET(pfslist_headers
@@ -17,7 +15,7 @@ TARGET_LINK_LIBRARIES(PFSList Common ${ZLIB_LIBRARY} "Ws2_32.lib")
IF(MSVC) IF(MSVC)
ADD_DEFINITIONS(/D _CONSOLE) ADD_DEFINITIONS(/D _CONSOLE)
SET_TARGET_PROPERTIES(PFSList PROPERTIES LINK_FLAGS_RELEASE "/OPT:REF /OPT:ICF") SET_TARGET_PROPERTIES(PFSList PROPERTIES LINK_FLAGS_RELEASE "/OPT:REF /OPT:ICF")
ENDIF(MSVC) ENDIF(MSVC)
SET(EXECUTABLE_OUTPUT_PATH ../Build/PFSList) SET(EXECUTABLE_OUTPUT_PATH ../Build/PFSList)
utils/scripts/build/linux-build.sh
+2 -2
View File
@@ -14,12 +14,12 @@ perl utils/scripts/build/tag-version.pl
mkdir -p build && cd build && \ mkdir -p build && cd build && \
cmake -DEQEMU_BUILD_TESTS=ON \ cmake -DEQEMU_BUILD_TESTS=ON \
-DCMAKE_BUILD_TYPE=RelWithDebInfo \ -DCMAKE_BUILD_TYPE=Release \
-DEQEMU_BUILD_STATIC=ON \ -DEQEMU_BUILD_STATIC=ON \
-DEQEMU_BUILD_LOGIN=ON \ -DEQEMU_BUILD_LOGIN=ON \
-DEQEMU_BUILD_LUA=ON \ -DEQEMU_BUILD_LUA=ON \
-DEQEMU_BUILD_PERL=ON \ -DEQEMU_BUILD_PERL=ON \
-DCMAKE_CXX_FLAGS_RELWITHDEBINFO:STRING="-g -Wno-everything" \ -DCMAKE_CXX_FLAGS_RELEASE:STRING="-g -Wno-everything" \
-DCMAKE_CXX_COMPILER_LAUNCHER=ccache \ -DCMAKE_CXX_COMPILER_LAUNCHER=ccache \
-G 'Unix Makefiles' \ -G 'Unix Makefiles' \
.. && make -j$((`nproc`-2)) .. && make -j$((`nproc`-2))
world/CMakeLists.txt
+85 -88
View File
@@ -1,92 +1,90 @@
cmake_minimum_required(VERSION 3.20)
set(world_sources set(world_sources
adventure.cpp adventure.cpp
adventure_manager.cpp adventure_manager.cpp
cli/cli_bots_disable.cpp cli/cli_bots_disable.cpp
cli/cli_bots_enable.cpp cli/cli_bots_enable.cpp
cli/cli_copy_character.cpp cli/cli_copy_character.cpp
cli/cli_database_concurrency.cpp cli/cli_database_concurrency.cpp
cli/cli_database_dump.cpp cli/cli_database_dump.cpp
cli/cli_database_get_schema.cpp cli/cli_database_get_schema.cpp
cli/cli_database_set_account_status.cpp cli/cli_database_set_account_status.cpp
cli/cli_database_updates.cpp cli/cli_database_updates.cpp
cli/cli_database_version.cpp cli/cli_database_version.cpp
cli/cli_etl_get_settings.cpp cli/cli_etl_get_settings.cpp
cli/cli_mercs_disable.cpp cli/cli_mercs_disable.cpp
cli/cli_mercs_enable.cpp cli/cli_mercs_enable.cpp
cli/cli_test.cpp cli/cli_test.cpp
cli/cli_test_colors.cpp cli/cli_test_colors.cpp
cli/cli_test_expansion.cpp cli/cli_test_expansion.cpp
cli/cli_test_repository.cpp cli/cli_test_repository.cpp
cli/cli_test_repository_2.cpp cli/cli_test_repository_2.cpp
cli/cli_test_string_benchmark.cpp cli/cli_test_string_benchmark.cpp
cli/cli_version.cpp cli/cli_version.cpp
client.cpp client.cpp
cliententry.cpp cliententry.cpp
clientlist.cpp clientlist.cpp
console.cpp console.cpp
dynamic_zone.cpp dynamic_zone.cpp
dynamic_zone_manager.cpp dynamic_zone_manager.cpp
eqemu_api_world_data_service.cpp eqemu_api_world_data_service.cpp
eql_config.cpp eql_config.cpp
launcher_link.cpp launcher_link.cpp
launcher_list.cpp launcher_list.cpp
lfplist.cpp lfplist.cpp
login_server.cpp login_server.cpp
login_server_list.cpp login_server_list.cpp
main.cpp main.cpp
queryserv.cpp queryserv.cpp
shared_task_manager.cpp shared_task_manager.cpp
shared_task_world_messaging.cpp shared_task_world_messaging.cpp
ucs.cpp ucs.cpp
web_interface.cpp web_interface.cpp
web_interface_eqw.cpp web_interface_eqw.cpp
wguild_mgr.cpp wguild_mgr.cpp
world_boot.cpp world_boot.cpp
world_config.cpp world_config.cpp
world_console_connection.cpp world_console_connection.cpp
world_event_scheduler.cpp world_event_scheduler.cpp
world_server_cli.cpp world_server_cli.cpp
worlddb.cpp worlddb.cpp
zonelist.cpp zonelist.cpp
zoneserver.cpp zoneserver.cpp
) )
set(world_headers set(world_headers
adventure.h adventure.h
adventure_manager.h adventure_manager.h
adventure_template.h adventure_template.h
client.h client.h
cliententry.h cliententry.h
clientlist.h clientlist.h
console.h console.h
dynamic_zone.h dynamic_zone.h
dynamic_zone_manager.h dynamic_zone_manager.h
eqemu_api_world_data_service.h eqemu_api_world_data_service.h
eql_config.h eql_config.h
launcher_link.h launcher_link.h
launcher_list.h launcher_list.h
lfplist.h lfplist.h
login_server.h login_server.h
login_server_list.h login_server_list.h
queryserv.h queryserv.h
shared_task_manager.h shared_task_manager.h
shared_task_world_messaging.h shared_task_world_messaging.h
sof_char_create_data.h sof_char_create_data.h
ucs.h ucs.h
web_interface.h web_interface.h
web_interface_eqw.h web_interface_eqw.h
wguild_mgr.h wguild_mgr.h
world_boot.h world_boot.h
world_config.h world_config.h
world_console_connection.h world_console_connection.h
world_event_scheduler.h world_event_scheduler.h
world_server_cli.h world_server_cli.h
world_tcp_connection.h world_tcp_connection.h
worlddb.h worlddb.h
zonelist.h zonelist.h
zoneserver.h zoneserver.h
) )
source_group("cli" REGULAR_EXPRESSION "cli/.*") source_group("cli" REGULAR_EXPRESSION "cli/.*")
@@ -96,10 +94,9 @@ add_executable(world ${world_sources} ${world_headers})
target_compile_definitions(world PRIVATE WORLD) target_compile_definitions(world PRIVATE WORLD)
target_link_libraries(world common) target_link_libraries(world common)
target_include_directories(world PRIVATE ..)
if(WIN32 AND EQEMU_BUILD_PCH) if(EQEMU_BUILD_PCH)
target_precompile_headers(world PRIVATE ../common/pch/std-pch.h) target_precompile_headers(world PRIVATE ../common/pch/std-pch.h)
endif() endif()
install(TARGETS world RUNTIME DESTINATION ${CMAKE_INSTALL_PREFIX}/bin) install(TARGETS world RUNTIME DESTINATION ${CMAKE_INSTALL_PREFIX}/bin)
zone/CMakeLists.txt
+650 -656
View File
File diff suppressed because it is too large Load Diff