From 0366b24bd7d64c8916c38afd55d55900a81978f5 Mon Sep 17 00:00:00 2001 From: Jan Date: Sat, 5 Apr 2025 11:56:32 +0200 Subject: [PATCH 1/2] fix: game name in linker paths must be lowercase for linux --- src/Linker/LinkerPaths.cpp | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/src/Linker/LinkerPaths.cpp b/src/Linker/LinkerPaths.cpp index 2be5b015..7142259e 100644 --- a/src/Linker/LinkerPaths.cpp +++ b/src/Linker/LinkerPaths.cpp @@ -3,6 +3,7 @@ #include "SearchPath/IWD.h" #include "SearchPath/SearchPathFilesystem.h" #include "SearchPath/SearchPaths.h" +#include "Utils/StringUtils.h" #include #include @@ -215,7 +216,10 @@ namespace { if (!curTemplate.CanRender(PROJECT_MASK) && curTemplate.CanRender(GAME_MASK)) { - auto renderedTemplate = curTemplate.Render(m_bin_dir, m_base_dir, projectName, GameId_Names[static_cast(game)]); + std::string gameName(GameId_Names[static_cast(game)]); + utils::MakeStringLowerCase(gameName); + + auto renderedTemplate = curTemplate.Render(m_bin_dir, m_base_dir, projectName, gameName); if (AddSearchPath(addedSearchPaths, searchPaths, renderedTemplate)) hasSearchPath = true; } From 820fe474739eab1105672431cde25b06e7240ad8 Mon Sep 17 00:00:00 2001 From: Jan Date: Sat, 5 Apr 2025 11:59:14 +0200 Subject: [PATCH 2/2] fix: always use lowercase extensions for xmodels --- src/ObjWriting/XModel/XModelDumper.cpp.template | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/src/ObjWriting/XModel/XModelDumper.cpp.template b/src/ObjWriting/XModel/XModelDumper.cpp.template index 0af964b9..a60db804 100644 --- a/src/ObjWriting/XModel/XModelDumper.cpp.template +++ b/src/ObjWriting/XModel/XModelDumper.cpp.template @@ -569,7 +569,7 @@ namespace void DumpXModelExportLod(const XModelCommon& common, const AssetDumpingContext& context, const XAssetInfo* asset, const unsigned lod) { const auto* model = asset->Asset(); - const auto assetFile = context.OpenAssetFile(GetFileNameForLod(model->name, lod, ".XMODEL_EXPORT")); + const auto assetFile = context.OpenAssetFile(GetFileNameForLod(model->name, lod, ".xmodel_export")); if (!assetFile) return; @@ -664,13 +664,13 @@ namespace switch (ObjWriting::Configuration.ModelOutputFormat) { case ObjWriting::Configuration_t::ModelOutputFormat_e::XMODEL_EXPORT: - return ".XMODEL_EXPORT"; + return ".xmodel_export"; case ObjWriting::Configuration_t::ModelOutputFormat_e::OBJ: - return ".OBJ"; + return ".obj"; case ObjWriting::Configuration_t::ModelOutputFormat_e::GLTF: - return ".GLTF"; + return ".gltf"; case ObjWriting::Configuration_t::ModelOutputFormat_e::GLB: - return ".GLB"; + return ".glb"; default: assert(false); return "";