diff options
Diffstat (limited to 'source/base')
-rw-r--r-- | source/base/CMakeLists.txt | 4 | ||||
-rw-r--r-- | source/base/StarAssets.cpp | 2 | ||||
-rw-r--r-- | source/base/StarVersion.cpp.in | 9 | ||||
-rw-r--r-- | source/base/StarVersion.hpp | 13 |
4 files changed, 2 insertions, 26 deletions
diff --git a/source/base/CMakeLists.txt b/source/base/CMakeLists.txt index e813e45..e77d9ff 100644 --- a/source/base/CMakeLists.txt +++ b/source/base/CMakeLists.txt @@ -18,7 +18,6 @@ SET (star_base_HEADERS StarMixer.hpp StarPackedAssetSource.hpp StarRootBase.hpp - StarVersion.hpp StarVersionOptionParser.hpp StarWorldGeometry.hpp scripting/StarImageLuaBindings.hpp @@ -40,8 +39,7 @@ SET (star_base_SOURCES scripting/StarImageLuaBindings.cpp ) -CONFIGURE_FILE (StarVersion.cpp.in ${CMAKE_CURRENT_BINARY_DIR}/StarVersion.cpp) -ADD_LIBRARY (star_base OBJECT ${star_base_SOURCES} ${star_base_HEADERS} ${CMAKE_CURRENT_BINARY_DIR}/StarVersion.cpp) +ADD_LIBRARY (star_base OBJECT ${star_base_SOURCES} ${star_base_HEADERS}) IF(STAR_PRECOMPILED_HEADERS) TARGET_PRECOMPILE_HEADERS (star_base REUSE_FROM star_core) diff --git a/source/base/StarAssets.cpp b/source/base/StarAssets.cpp index a188291..4a10aab 100644 --- a/source/base/StarAssets.cpp +++ b/source/base/StarAssets.cpp @@ -68,7 +68,7 @@ static void validatePath(AssetPath const& components, bool canContainSubPath, bo throw AssetException::format("Path '{}' cannot contain directives", components); } -static void validatePath(StringView const& path, bool canContainSubPath, bool canContainDirectives) { +static void validatePath(StringView path, bool canContainSubPath, bool canContainDirectives) { std::string_view const& str = path.utf8(); size_t end = str.find_first_of(":?"); diff --git a/source/base/StarVersion.cpp.in b/source/base/StarVersion.cpp.in deleted file mode 100644 index 0529c19..0000000 --- a/source/base/StarVersion.cpp.in +++ /dev/null @@ -1,9 +0,0 @@ -#include "StarVersion.hpp" - -namespace Star { - -char const* const StarVersionString = "1.4.4"; -char const* const StarSourceIdentifierString = "${STAR_SOURCE_IDENTIFIER}"; -char const* const StarArchitectureString = "${STAR_SYSTEM} ${STAR_ARCHITECTURE}"; - -} diff --git a/source/base/StarVersion.hpp b/source/base/StarVersion.hpp deleted file mode 100644 index ad65875..0000000 --- a/source/base/StarVersion.hpp +++ /dev/null @@ -1,13 +0,0 @@ -#pragma once - -#include "StarConfig.hpp" - -namespace Star { - -extern char const* const StarVersionString; -extern char const* const StarSourceIdentifierString; -extern char const* const StarArchitectureString; - -typedef uint32_t VersionNumber; - -} |