From fd47a422b5585d40fda31fdfba28d7ec41cfba42 Mon Sep 17 00:00:00 2001 From: "Marco Antonio J. Costa" Date: Mon, 27 Jul 2026 12:39:51 -0300 Subject: [PATCH] ja2export is not vendored, we own that + fix errors stop lying about it by keeping it in ext/ fix three errors in clang-cl --- CMakeLists.txt | 2 +- {ext/export => export}/src/CMakeLists.txt | 4 ++-- {ext/export => export}/src/export/jsd/export_jsd.cpp | 2 +- {ext/export => export}/src/export/jsd/export_jsd.h | 0 {ext/export => export}/src/export/jsd/structure.cpp | 0 {ext/export => export}/src/export/jsd/structure.h | 0 {ext/export => export}/src/export/slf/export_slf.cpp | 2 +- {ext/export => export}/src/export/slf/export_slf.h | 0 {ext/export => export}/src/export/sti/Image.cpp | 0 {ext/export => export}/src/export/sti/Image.h | 0 {ext/export => export}/src/export/sti/STCI_lib.cpp | 0 {ext/export => export}/src/export/sti/STCI_lib.h | 0 {ext/export => export}/src/export/sti/export_sti.cpp | 0 {ext/export => export}/src/export/sti/export_sti.h | 0 {ext/export => export}/src/export/sti/stci_image_utils.cpp | 0 {ext/export => export}/src/export/sti/stci_image_utils.h | 0 {ext/export => export}/src/exporter_base.h | 0 {ext/export => export}/src/init_vfs.cpp | 0 {ext/export => export}/src/init_vfs.h | 0 {ext/export => export}/src/ja2/Structure Internals.h | 0 {ext/export => export}/src/ja2/XMLWriter.cpp | 2 +- {ext/export => export}/src/ja2/XMLWriter.h | 0 {ext/export => export}/src/ja2/himage.cpp | 0 {ext/export => export}/src/ja2/himage.h | 0 {ext/export => export}/src/ja2/imgfmt.h | 0 {ext/export => export}/src/ja2/sgp_auto_memory.h | 0 {ext/export => export}/src/ja2/types.h | 0 {ext/export => export}/src/main.cpp | 0 {ext/export => export}/src/progress_bar.cpp | 0 {ext/export => export}/src/progress_bar.h | 0 30 files changed, 6 insertions(+), 6 deletions(-) rename {ext/export => export}/src/CMakeLists.txt (89%) rename {ext/export => export}/src/export/jsd/export_jsd.cpp (94%) rename {ext/export => export}/src/export/jsd/export_jsd.h (100%) rename {ext/export => export}/src/export/jsd/structure.cpp (100%) rename {ext/export => export}/src/export/jsd/structure.h (100%) rename {ext/export => export}/src/export/slf/export_slf.cpp (94%) rename {ext/export => export}/src/export/slf/export_slf.h (100%) rename {ext/export => export}/src/export/sti/Image.cpp (100%) rename {ext/export => export}/src/export/sti/Image.h (100%) rename {ext/export => export}/src/export/sti/STCI_lib.cpp (100%) rename {ext/export => export}/src/export/sti/STCI_lib.h (100%) rename {ext/export => export}/src/export/sti/export_sti.cpp (100%) rename {ext/export => export}/src/export/sti/export_sti.h (100%) rename {ext/export => export}/src/export/sti/stci_image_utils.cpp (100%) rename {ext/export => export}/src/export/sti/stci_image_utils.h (100%) rename {ext/export => export}/src/exporter_base.h (100%) rename {ext/export => export}/src/init_vfs.cpp (100%) rename {ext/export => export}/src/init_vfs.h (100%) rename {ext/export => export}/src/ja2/Structure Internals.h (100%) rename {ext/export => export}/src/ja2/XMLWriter.cpp (94%) rename {ext/export => export}/src/ja2/XMLWriter.h (100%) rename {ext/export => export}/src/ja2/himage.cpp (100%) rename {ext/export => export}/src/ja2/himage.h (100%) rename {ext/export => export}/src/ja2/imgfmt.h (100%) rename {ext/export => export}/src/ja2/sgp_auto_memory.h (100%) rename {ext/export => export}/src/ja2/types.h (100%) rename {ext/export => export}/src/main.cpp (100%) rename {ext/export => export}/src/progress_bar.cpp (100%) rename {ext/export => export}/src/progress_bar.h (100%) diff --git a/CMakeLists.txt b/CMakeLists.txt index f31cb25dd..1c4279617 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -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) diff --git a/ext/export/src/CMakeLists.txt b/export/src/CMakeLists.txt similarity index 89% rename from ext/export/src/CMakeLists.txt rename to export/src/CMakeLists.txt index fb750d055..5d8d1042c 100644 --- a/ext/export/src/CMakeLists.txt +++ b/export/src/CMakeLists.txt @@ -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() diff --git a/ext/export/src/export/jsd/export_jsd.cpp b/export/src/export/jsd/export_jsd.cpp similarity index 94% rename from ext/export/src/export/jsd/export_jsd.cpp rename to export/src/export/jsd/export_jsd.cpp index e7bb66301..b8e80eb7f 100644 --- a/ext/export/src/export/jsd/export_jsd.cpp +++ b/export/src/export/jsd/export_jsd.cpp @@ -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; } } diff --git a/ext/export/src/export/jsd/export_jsd.h b/export/src/export/jsd/export_jsd.h similarity index 100% rename from ext/export/src/export/jsd/export_jsd.h rename to export/src/export/jsd/export_jsd.h diff --git a/ext/export/src/export/jsd/structure.cpp b/export/src/export/jsd/structure.cpp similarity index 100% rename from ext/export/src/export/jsd/structure.cpp rename to export/src/export/jsd/structure.cpp diff --git a/ext/export/src/export/jsd/structure.h b/export/src/export/jsd/structure.h similarity index 100% rename from ext/export/src/export/jsd/structure.h rename to export/src/export/jsd/structure.h diff --git a/ext/export/src/export/slf/export_slf.cpp b/export/src/export/slf/export_slf.cpp similarity index 94% rename from ext/export/src/export/slf/export_slf.cpp rename to export/src/export/slf/export_slf.cpp index f133f8087..faea5ec05 100644 --- a/ext/export/src/export/slf/export_slf.cpp +++ b/export/src/export/slf/export_slf.cpp @@ -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)) { diff --git a/ext/export/src/export/slf/export_slf.h b/export/src/export/slf/export_slf.h similarity index 100% rename from ext/export/src/export/slf/export_slf.h rename to export/src/export/slf/export_slf.h diff --git a/ext/export/src/export/sti/Image.cpp b/export/src/export/sti/Image.cpp similarity index 100% rename from ext/export/src/export/sti/Image.cpp rename to export/src/export/sti/Image.cpp diff --git a/ext/export/src/export/sti/Image.h b/export/src/export/sti/Image.h similarity index 100% rename from ext/export/src/export/sti/Image.h rename to export/src/export/sti/Image.h diff --git a/ext/export/src/export/sti/STCI_lib.cpp b/export/src/export/sti/STCI_lib.cpp similarity index 100% rename from ext/export/src/export/sti/STCI_lib.cpp rename to export/src/export/sti/STCI_lib.cpp diff --git a/ext/export/src/export/sti/STCI_lib.h b/export/src/export/sti/STCI_lib.h similarity index 100% rename from ext/export/src/export/sti/STCI_lib.h rename to export/src/export/sti/STCI_lib.h diff --git a/ext/export/src/export/sti/export_sti.cpp b/export/src/export/sti/export_sti.cpp similarity index 100% rename from ext/export/src/export/sti/export_sti.cpp rename to export/src/export/sti/export_sti.cpp diff --git a/ext/export/src/export/sti/export_sti.h b/export/src/export/sti/export_sti.h similarity index 100% rename from ext/export/src/export/sti/export_sti.h rename to export/src/export/sti/export_sti.h diff --git a/ext/export/src/export/sti/stci_image_utils.cpp b/export/src/export/sti/stci_image_utils.cpp similarity index 100% rename from ext/export/src/export/sti/stci_image_utils.cpp rename to export/src/export/sti/stci_image_utils.cpp diff --git a/ext/export/src/export/sti/stci_image_utils.h b/export/src/export/sti/stci_image_utils.h similarity index 100% rename from ext/export/src/export/sti/stci_image_utils.h rename to export/src/export/sti/stci_image_utils.h diff --git a/ext/export/src/exporter_base.h b/export/src/exporter_base.h similarity index 100% rename from ext/export/src/exporter_base.h rename to export/src/exporter_base.h diff --git a/ext/export/src/init_vfs.cpp b/export/src/init_vfs.cpp similarity index 100% rename from ext/export/src/init_vfs.cpp rename to export/src/init_vfs.cpp diff --git a/ext/export/src/init_vfs.h b/export/src/init_vfs.h similarity index 100% rename from ext/export/src/init_vfs.h rename to export/src/init_vfs.h diff --git a/ext/export/src/ja2/Structure Internals.h b/export/src/ja2/Structure Internals.h similarity index 100% rename from ext/export/src/ja2/Structure Internals.h rename to export/src/ja2/Structure Internals.h diff --git a/ext/export/src/ja2/XMLWriter.cpp b/export/src/ja2/XMLWriter.cpp similarity index 94% rename from ext/export/src/ja2/XMLWriter.cpp rename to export/src/ja2/XMLWriter.cpp index 01ff6f0c3..79b9fad6d 100644 --- a/ext/export/src/ja2/XMLWriter.cpp +++ b/export/src/ja2/XMLWriter.cpp @@ -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; } diff --git a/ext/export/src/ja2/XMLWriter.h b/export/src/ja2/XMLWriter.h similarity index 100% rename from ext/export/src/ja2/XMLWriter.h rename to export/src/ja2/XMLWriter.h diff --git a/ext/export/src/ja2/himage.cpp b/export/src/ja2/himage.cpp similarity index 100% rename from ext/export/src/ja2/himage.cpp rename to export/src/ja2/himage.cpp diff --git a/ext/export/src/ja2/himage.h b/export/src/ja2/himage.h similarity index 100% rename from ext/export/src/ja2/himage.h rename to export/src/ja2/himage.h diff --git a/ext/export/src/ja2/imgfmt.h b/export/src/ja2/imgfmt.h similarity index 100% rename from ext/export/src/ja2/imgfmt.h rename to export/src/ja2/imgfmt.h diff --git a/ext/export/src/ja2/sgp_auto_memory.h b/export/src/ja2/sgp_auto_memory.h similarity index 100% rename from ext/export/src/ja2/sgp_auto_memory.h rename to export/src/ja2/sgp_auto_memory.h diff --git a/ext/export/src/ja2/types.h b/export/src/ja2/types.h similarity index 100% rename from ext/export/src/ja2/types.h rename to export/src/ja2/types.h diff --git a/ext/export/src/main.cpp b/export/src/main.cpp similarity index 100% rename from ext/export/src/main.cpp rename to export/src/main.cpp diff --git a/ext/export/src/progress_bar.cpp b/export/src/progress_bar.cpp similarity index 100% rename from ext/export/src/progress_bar.cpp rename to export/src/progress_bar.cpp diff --git a/ext/export/src/progress_bar.h b/export/src/progress_bar.h similarity index 100% rename from ext/export/src/progress_bar.h rename to export/src/progress_bar.h