Skip to content

Commit

Permalink
feat: support to client 11+ assets loading
Browse files Browse the repository at this point in the history
Co-Authored-By: Marcos <[email protected]>
  • Loading branch information
dudantas and marcosvf132 committed Jan 29, 2024
1 parent 2e447d9 commit 454990b
Show file tree
Hide file tree
Showing 98 changed files with 2,199 additions and 12,395 deletions.
7 changes: 3 additions & 4 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -58,7 +58,6 @@ cmake-build-debug/
*.exe
*.pdb
*.rar
vcpkg_installed/
*.ilk
remeres.exe.manifest
remeres
*.lzma
*.dat
*.manifest
32 changes: 26 additions & 6 deletions CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,17 @@ cmake_minimum_required(VERSION 3.22)

project(cmake)

# *****************************************************************************
# Append cmake search path
# *****************************************************************************
list(APPEND CMAKE_MODULE_PATH ${CMAKE_CURRENT_SOURCE_DIR}/cmake)

# *****************************************************************************
# Include cmake tools
# *****************************************************************************
include(MessageColors)
include(LoggingHelper)

# *****************************************************************************
# Vcpkg Configs
# *****************************************************************************
Expand Down Expand Up @@ -41,6 +52,20 @@ set(CMAKE_EXPORT_COMPILE_COMMANDS ON)
option(OPTIONS_ENABLE_CCACHE "Enable ccache" OFF)
option(OPTIONS_ENABLE_SCCACHE "Use sccache to speed up compilation process" OFF)
option(OPTIONS_ENABLE_IPO "Check and Enable interprocedural optimization (IPO/LTO)" ON)
option(ASAN_ENABLED "Build this target with AddressSanitizer" ON)

# === ASAN ===
if(ASAN_ENABLED AND (CMAKE_BUILD_TYPE STREQUAL "Debug" OR CMAKE_BUILD_TYPE STREQUAL "RelWithDebInfo"))
log_option_enabled("asan")
if(MSVC)
add_compile_options(/fsanitize=address)
else()
add_compile_options(-fsanitize=address)
link_libraries(-fsanitize=address)
endif()
else()
log_option_disabled("asan")
endif()

# *****************************************************************************
# Set Sanity Check
Expand All @@ -67,12 +92,6 @@ endif()
# *****************************************************************************
list(APPEND CMAKE_MODULE_PATH ${CMAKE_CURRENT_SOURCE_DIR}/cmake)

# *****************************************************************************
# Include cmake tools
# *****************************************************************************
include(MessageColors)
include(LoggingHelper)

# *****************************************************************************
# Options Code
# *****************************************************************************
Expand Down Expand Up @@ -119,4 +138,5 @@ endif()
# *****************************************************************************
# Add source project
# *****************************************************************************
add_subdirectory(source/protobuf)
add_subdirectory(source)
28 changes: 18 additions & 10 deletions CMakePresets.json
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@
"configurePresets": [
{
"name": "windows-release",
"displayName": "Windows - Release",
"displayName": "1-Windows (Release)",
"description": "Sets Ninja generator, compilers, build and install directory and set build type as release",
"generator": "Ninja",
"binaryDir": "${sourceDir}/build/${presetName}",
Expand Down Expand Up @@ -36,6 +36,22 @@
"rhs": "Windows"
}
},
{
"name": "windows-release-asan",
"inherits": "windows-release",
"displayName": "2-Windows (ReleaseDebInfo + ASAN)",
"description": "Release Mode with ASAN",
"cacheVariables": {
"ASAN_ENABLED": "ON",
"DEBUG_LOG": "ON",
"BUILD_STATIC_LIBRARY": "OFF",
"VCPKG_TARGET_TRIPLET": "x64-windows"
},
"architecture": {
"value": "x64",
"strategy": "external"
}
},
{
"name": "linux-release",
"displayName": "Linux - Release",
Expand Down Expand Up @@ -79,7 +95,7 @@
{
"name": "windows-debug",
"inherits": "windows-release",
"displayName": "Windows - Debug",
"displayName": "3-Windows (Debug)",
"description": "Build Debug Mode",
"cacheVariables": {
"CMAKE_BUILD_TYPE": "Debug",
Expand Down Expand Up @@ -120,14 +136,6 @@
"name": "linux-debug",
"configurePreset": "linux-debug"
},
{
"name": "windows-release",
"configurePreset": "windows-release"
},
{
"name": "windows-Xdebug",
"configurePreset": "windows-debug"
},
{
"name": "macos-release",
"configurePreset": "macos-release"
Expand Down
Binary file removed data/items/items.otb
Binary file not shown.
Loading

0 comments on commit 454990b

Please sign in to comment.