Skip to content

Commit

Permalink
update database project (jasongdove#48)
Browse files Browse the repository at this point in the history
* common and database projects build

* game project builds

* bnetserver builds

* worldserver builds

* revert logging changes to game project

* fix db logging

* use boost process, update database updater

* fix startup and login
  • Loading branch information
jasongdove authored Oct 6, 2024
1 parent 5c38b62 commit a49100d
Show file tree
Hide file tree
Showing 215 changed files with 22,674 additions and 14,261 deletions.
1 change: 0 additions & 1 deletion dep/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,6 @@

add_subdirectory(threads)
add_subdirectory(boost)
add_subdirectory(process)
add_subdirectory(zlib)
add_subdirectory(g3dlite)
add_subdirectory(recastnavigation)
Expand Down
51 changes: 19 additions & 32 deletions dep/fmt/CMakeLists.txt
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
# Copyright (C) 2008-2019 TrinityCore <https://www.trinitycore.org/>
# This file is part of the TrinityCore Project. See AUTHORS file for Copyright information
#
# This file is free software; as a special exception the author gives
# unlimited permission to copy and/or distribute it, with or without
Expand All @@ -8,43 +8,30 @@
# WITHOUT ANY WARRANTY, to the extent permitted by law; without even the
# implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.

include(CheckSymbolExists)
if (WIN32)
check_symbol_exists(open io.h HAVE_OPEN)
else ()
check_symbol_exists(open fcntl.h HAVE_OPEN)
endif ()
set(FMT_HEADERS
include/fmt/args.h
include/fmt/chrono.h
include/fmt/color.h
include/fmt/compile.h
include/fmt/core.h
include/fmt/format.h
include/fmt/format-inl.h
include/fmt/os.h
include/fmt/ostream.h
include/fmt/printf.h
include/fmt/ranges.h
include/fmt/std.h
include/fmt/xchar.h)

set(FMT_SOURCES
${CMAKE_CURRENT_SOURCE_DIR}/fmt/container.h
${CMAKE_CURRENT_SOURCE_DIR}/fmt/format.h
${CMAKE_CURRENT_SOURCE_DIR}/fmt/format.cc
${CMAKE_CURRENT_SOURCE_DIR}/fmt/ostream.h
${CMAKE_CURRENT_SOURCE_DIR}/fmt/ostream.cc
${CMAKE_CURRENT_SOURCE_DIR}/fmt/printf.h
${CMAKE_CURRENT_SOURCE_DIR}/fmt/printf.cc
${CMAKE_CURRENT_SOURCE_DIR}/fmt/string.h
${CMAKE_CURRENT_SOURCE_DIR}/fmt/time.h)
src/format.cc
src/os.cc)

if (HAVE_OPEN)
set(FMT_SOURCES ${FMT_SOURCES}
${CMAKE_CURRENT_SOURCE_DIR}/fmt/posix.h
${CMAKE_CURRENT_SOURCE_DIR}/fmt/posix.cc)
endif()

add_library(fmt STATIC ${FMT_SOURCES})
add_library(fmt STATIC ${FMT_SOURCES} ${FMT_HEADERS})

target_include_directories(fmt
PUBLIC
${CMAKE_CURRENT_SOURCE_DIR})

target_compile_definitions(fmt
PUBLIC
-DFMT_USE_OVERRIDE
-DFMT_USE_VARIADIC_TEMPLATES
-DFMT_USE_RVALUE_REFERENCES
-DFMT_USE_DELETED_FUNCTIONS
-DFMT_USE_EXTERN_TEMPLATES)
${CMAKE_CURRENT_SOURCE_DIR}/include)

target_link_libraries(fmt
PRIVATE
Expand Down
20 changes: 20 additions & 0 deletions dep/fmt/CONTRIBUTING.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,20 @@
Contributing to {fmt}
=====================

By submitting a pull request or a patch, you represent that you have the right
to license your contribution to the {fmt} project owners and the community,
agree that your contributions are licensed under the {fmt} license, and agree
to future changes to the licensing.

All C++ code must adhere to [Google C++ Style Guide](
https://google.github.io/styleguide/cppguide.html) with the following
exceptions:

* Exceptions are permitted
* snake_case should be used instead of UpperCamelCase for function and type
names

All documentation must adhere to the [Google Developer Documentation Style
Guide](https://developers.google.com/style).

Thanks for contributing!
11 changes: 0 additions & 11 deletions dep/fmt/CONTRIBUTING.rst

This file was deleted.

Loading

0 comments on commit a49100d

Please sign in to comment.