Skip to content
Open
Show file tree
Hide file tree
Changes from 33 commits
Commits
Show all changes
41 commits
Select commit Hold shift + click to select a range
2aa1a17
Implement a base cmake file that produces the same compile flags as a…
hemagx May 1, 2026
60fac90
Addition of cmake files for 3rdparty dependencies we will keep buildi…
hemagx May 1, 2026
608c04e
Removal of pcre, zlib, cjson, libbacktrace and mariadb connector from…
hemagx May 1, 2026
2e936b2
Addition of the previously removed libraries from 3rdparty to cmake t…
hemagx May 1, 2026
22f30cb
Add target for common library to cmake
hemagx May 1, 2026
29bbdc9
Implement configuration options from original configure into cmake
hemagx May 2, 2026
476d2c8
Move sysninfo.inc to build directory and corrected CFLAGS passed to i…
hemagx May 2, 2026
a3be0c9
Addition of CMakeFileLists to compile login, char, map and api server
hemagx May 2, 2026
d05a2ee
Update sysinfo generation to use custom which gives a more stable aut…
hemagx May 2, 2026
4107283
Migrate conan file to python file instead to be abel to selectively d…
hemagx May 2, 2026
058389e
Implement deployment of conan built libraries and RPATH handling of i…
hemagx May 3, 2026
6956aad
Add support for compiling plugins, still missing custom compiler flag…
hemagx May 3, 2026
7fa1405
Fix config headers was not being correctly added to server targets
hemagx May 3, 2026
280679d
Implement tests building and integeration with ctest
hemagx May 3, 2026
8210fec
Change plugins now to reside in their own directory and have their ow…
hemagx May 7, 2026
90a6063
Implement doxygen docs generation target
hemagx May 7, 2026
e876946
Implement HPM hooks generation target
hemagx May 7, 2026
5439a0d
Removal of the old makefile and autoconf build system
hemagx May 7, 2026
f916ae0
Implement the ability for plugins to pass custom compiler flags
hemagx May 7, 2026
55bd4bf
Fix compile errors/warnings with plugin test_equippos
hemagx May 7, 2026
79b262d
Add sql custom target to emulate make file build behavior
hemagx May 7, 2026
74cfc0c
Add -Wno-null-dereference to libconfig build as the lexer generated f…
hemagx May 7, 2026
e76d768
Change file globs to have the flag CONFIGURE_DEPENDS
hemagx May 7, 2026
eb4a3c4
Implement import config template copying routine in cmake
hemagx May 9, 2026
20b7fc5
Disable TLS verification in mariadb options
hemagx May 9, 2026
617b8c6
Move of tests under a cmake option ENABLE_TESTING so it's not compile…
hemagx May 9, 2026
05634e3
Add a default installation target into source_dir/bin
hemagx May 12, 2026
ff113e9
Change hercules plugins install path to herc-plugins so it doesn't co…
hemagx May 12, 2026
ca6529b
Remove libgif from 3rdparty and move to conan package
hemagx May 12, 2026
837b9ce
Move nullpo_backtrace_get_executable_path to be a core function and d…
hemagx May 13, 2026
3453b25
Change hercules plugin directory to be relative to executable path an…
hemagx May 13, 2026
cd73505
Removal of dbghelpplug plugin for windows
hemagx May 13, 2026
2ce3eb2
Source changes to correctly build on windows with cmake and required …
hemagx May 13, 2026
be73746
Removal of project files for MSVS
hemagx May 13, 2026
491e843
Update windows bat files to reflect the new default directory structure
hemagx May 13, 2026
dcd5234
Update bash scripts and athena-start to reflect new directory structure
hemagx May 13, 2026
cdd24c4
Add missing options to linker for sanitized builds
hemagx May 23, 2026
acdad69
Addition of ENABLE_CLASSIC_AUTOSPELL option to cmake
hemagx May 23, 2026
83e3ad0
Update github actions to work with the new cmake setup
hemagx May 13, 2026
2dae023
Remove xcode and mac specific files
hemagx May 23, 2026
3742918
Change gcc-snapshot CI build to just current gcc and make it the main…
hemagx May 23, 2026
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
The table of contents is too big for display.
Diff view
Diff view
  •  
  •  
  •  
34 changes: 33 additions & 1 deletion .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -121,7 +121,27 @@ Thumbs.db
/src/tool/obj_all

# /src/plugins/
/src/plugins/Makefile
/src/plugins/*
!/src/plugins/HPMHooking/
!/src/plugins/HPMHooking/*
!/src/plugins/constdb2doc/
!/src/plugins/constdb2doc/*
!/src/plugins/db2sql/
!/src/plugins/db2sql/*
!/src/plugins/dbghelpplug/
!/src/plugins/dbghelpplug/*
Comment on lines +131 to +132
Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

These lines should be removed along with the dbghelpplug plugin

!/src/plugins/generate-translations/
!/src/plugins/generate-translations/*
!/src/plugins/httpsample/
!/src/plugins/httpsample/*
!/src/plugins/mapcache/
!/src/plugins/mapcache/*
!/src/plugins/sample/
!/src/plugins/sample/*
!/src/plugins/script_mapquit/
!/src/plugins/script_mapquit/*
!/src/plugins/test_equippos/
!/src/plugins/test_equippos/*

# /tools/
/tools/convert
Expand All @@ -148,3 +168,15 @@ Thumbs.db

# visual studio
/.vs/

# Default build directory
/build/

# Default install directory
/bin/

# Cache directroy created by clangd
/.cache/

# venv
/.venv/
26 changes: 26 additions & 0 deletions 3rdparty/CMakeLists.txt
Original file line number Diff line number Diff line change
@@ -0,0 +1,26 @@
# This file is part of Hercules.
# http://herc.ws - http://github.com/HerculesWS/Hercules
#
# Copyright (C) 2026 Hercules Dev Team
#
# Hercules is free software: you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
# the Free Software Foundation, either version 3 of the License, or
# (at your option) any later version.
#
# This program is distributed in the hope that it will be useful,
# but WITHOUT ANY WARRANTY; without even the implied warranty of
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
# GNU General Public License for more details.
#
# You should have received a copy of the GNU General Public License
# along with this program. If not, see <http://www.gnu.org/licenses/>.

add_subdirectory(libconfig)
add_subdirectory(mt19937ar)
add_subdirectory(multipart-parser)
if(WITH_HTTP_PARSER STREQUAL "http-parser")
add_subdirectory(http-parser)
else()
add_subdirectory(llhttp)
endif()
23 changes: 0 additions & 23 deletions 3rdparty/cJSON/.editorconfig

This file was deleted.

8 changes: 0 additions & 8 deletions 3rdparty/cJSON/.gitattributes

This file was deleted.

54 changes: 0 additions & 54 deletions 3rdparty/cJSON/.github/CONTRIBUTING.md

This file was deleted.

102 changes: 0 additions & 102 deletions 3rdparty/cJSON/.github/workflows/CI.yml

This file was deleted.

18 changes: 0 additions & 18 deletions 3rdparty/cJSON/.gitignore

This file was deleted.

28 changes: 0 additions & 28 deletions 3rdparty/cJSON/.travis.yml

This file was deleted.

Loading