From 61e5bcef2629e2d68b805a956a96fff264d4f74d Mon Sep 17 00:00:00 2001 From: untodesu Date: Sat, 28 Jun 2025 01:59:49 +0500 Subject: Restructure dependencies and update to C++20 - Nuked static_assert from almost everywhere in the project - Nuked binary dependency support. Might add one later though - Separated dependency headers into a separate include subdirectory - Grafted a thirdpartylegalnotices.txt generator from RITEG - Pushed development snapshot version to 2126 (26th week of 2025) --- core/CMakeLists.txt | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) (limited to 'core/CMakeLists.txt') diff --git a/core/CMakeLists.txt b/core/CMakeLists.txt index a8a5468..7bac586 100644 --- a/core/CMakeLists.txt +++ b/core/CMakeLists.txt @@ -7,6 +7,7 @@ add_library(core STATIC "${CMAKE_CURRENT_LIST_DIR}/buffer.cc" "${CMAKE_CURRENT_LIST_DIR}/cmdline.hh" "${CMAKE_CURRENT_LIST_DIR}/cmdline.cc" + "${CMAKE_CURRENT_LIST_DIR}/concepts.hh" "${CMAKE_CURRENT_LIST_DIR}/config.cc" "${CMAKE_CURRENT_LIST_DIR}/config.hh" "${CMAKE_CURRENT_LIST_DIR}/constexpr.hh" @@ -14,7 +15,6 @@ add_library(core STATIC "${CMAKE_CURRENT_LIST_DIR}/crc64.hh" "${CMAKE_CURRENT_LIST_DIR}/epoch.cc" "${CMAKE_CURRENT_LIST_DIR}/epoch.hh" - "${CMAKE_CURRENT_LIST_DIR}/feature.hh" "${CMAKE_CURRENT_LIST_DIR}/floathacks.hh" "${CMAKE_CURRENT_LIST_DIR}/image.cc" "${CMAKE_CURRENT_LIST_DIR}/image.hh" @@ -22,12 +22,13 @@ add_library(core STATIC "${CMAKE_CURRENT_LIST_DIR}/resource.hh" "${CMAKE_CURRENT_LIST_DIR}/strtools.cc" "${CMAKE_CURRENT_LIST_DIR}/strtools.hh" + "${CMAKE_CURRENT_LIST_DIR}/version.cc" "${CMAKE_CURRENT_LIST_DIR}/version.hh") -target_compile_features(core PUBLIC cxx_std_17) +target_compile_features(core PUBLIC cxx_std_20) target_include_directories(core PUBLIC "${DEPS_INCLUDE_DIR}") target_include_directories(core PUBLIC "${PROJECT_SOURCE_DIR}") target_precompile_headers(core PRIVATE "${CMAKE_CURRENT_LIST_DIR}/pch.hh") -target_link_libraries(core PUBLIC enet physfs spdlog stb) +target_link_libraries(core PUBLIC enet emhash glm physfs spdlog stb) if(WIN32) target_compile_definitions(core PUBLIC _CRT_SECURE_NO_WARNINGS) @@ -39,5 +40,4 @@ if(MSVC) target_compile_options(core PUBLIC /utf-8) endif() -configure_file("${CMAKE_CURRENT_LIST_DIR}/feature.hh.in" "${CMAKE_CURRENT_LIST_DIR}/feature.hh") -configure_file("${CMAKE_CURRENT_LIST_DIR}/version.hh.in" "${CMAKE_CURRENT_LIST_DIR}/version.hh") +configure_file("${CMAKE_CURRENT_LIST_DIR}/version.cc.in" "${CMAKE_CURRENT_LIST_DIR}/version.cc") -- cgit