ja2export is not vendored, we own that + fix errors

stop lying about it by keeping it in ext/
fix three errors in clang-cl
This commit is contained in:
Marco Antonio J. Costa
2026-07-27 13:07:29 -03:00
committed by majcosta
parent fc1c1dfe77
commit fd47a422b5
30 changed files with 6 additions and 6 deletions
+1 -1
View File
@@ -88,7 +88,7 @@ add_subdirectory("ext/VFS")
target_link_libraries(bfVFS PRIVATE 7z)
# ja2export utility
add_subdirectory("ext/export/src")
add_subdirectory("export/src")
# static libraries whose translation units don't rely on Application preprocessor definitions.
add_subdirectory(lua)
@@ -1,4 +1,4 @@
option(BUILD_JA2EXPORT "Build the Ja2Export tool." OFF)
option(BUILD_JA2EXPORT "Build the Ja2Export tool." ON)
if(BUILD_JA2EXPORT)
message(STATUS "Configuring Ja2Export")
@@ -25,5 +25,5 @@ if(BUILD_JA2EXPORT)
RUNTIME_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}
)
else()
message(STATUS "BUILD_JA2EXPORT set to \"OFF\", not configuring Ja2Export by default")
message(STATUS "BUILD_JA2EXPORT set to \"OFF\", not configuring Ja2Export")
endif()
@@ -48,7 +48,7 @@ bool ja2xp::convertJSDtoXML(vfs::Path const& sSrc, vfs::Path const& sDst)
vfs::COpenWriteFile wfile(out_name,true,true);
if(!ConvertStructure(it.value(), &wfile.file()))
{
printf("Error converting file : %s", vfs::String::as_utf8(it.value()->getPath()()));
printf("Error converting file : %s", vfs::String::as_utf8(it.value()->getPath()()).c_str());
continue;
}
}
@@ -43,7 +43,7 @@ bool ja2xp::convertSLFto7z(vfs::tReadableFile* pInFile, vfs::tWritableFile *pOut
vfs::Path filename = it.value()->getPath();
if(vfs::StrCmp::Equal(filename().substr(filename().length()-4,4), L".sti"))
{
vfs::Path path = filename().substr(0,filename.length()-4) + L".jpc.7z";
vfs::Path path = vfs::String(filename().substr(0,filename.length()-4) + L".jpc.7z");
temp_file = new vfs::CBufferFile(path);
if(convertSTItoJPC(vfs::tReadableFile::cast(it.value()), vfs::tWritableFile::cast(temp_file), bPngOffsets, false))
{
@@ -76,7 +76,7 @@ bool XMLWriter::writeToFile(vfs::tWritableFile* pFile)
try
{
vfs::COpenWriteFile file(pFile);
std::string &str = m_ssBuffer.str();
const std::string str = m_ssBuffer.str();
pFile->write(str.c_str(), str.length() * sizeof(std::string::value_type));
return true;
}