Finalize Linux build cleanup

2 files changed, 10 insertions, 10 deletions

diff --git a/libs/archive/src/archive.cpp b/libs/archive/src/archive.cpp
index 6d35366..ca3aa03 100644
--- a/libs/archive/src/archive.cpp
+++ b/libs/archive/src/archive.cpp
@@ -269,7 +269,7 @@ HRESULT ArchiveImpl::loadFormats()
 }
 
 ArchiveImpl::ArchiveImpl()
-    : m_Valid(false), m_LastError(Error::ERROR_NONE), m_Library("dlls/7zip.dll"),
+    : m_Valid(false), m_LastError(Error::ERROR_NONE), m_Library("lib/7z.so"),
       m_PasswordCallback{}
 {
   // Reset the log callback:
diff --git a/libs/archive/src/library.h b/libs/archive/src/library.h
index 9fec56d..a0656f2 100644
--- a/libs/archive/src/library.h
+++ b/libs/archive/src/library.h
@@ -94,22 +94,22 @@ private:
         exeDir = exeDir.substr(0, slash);
     }
 
-    // AppImage: check MO2_DLLS_DIR env var first (writable dir next to AppImage)
-    std::string envDlls;
-    const char* envVal = std::getenv("MO2_DLLS_DIR");
+    // AppImage: check MO2_LIBS_DIR env var first (writable dir next to AppImage)
+    std::string envLibs;
+    const char* envVal = std::getenv("MO2_LIBS_DIR");
     if (envVal && envVal[0] != '\0') {
-      envDlls = envVal;
+      envLibs = envVal;
     }
 
-    // Try bundled 7z.so locations first (env override, exe dir, dlls/ subdir)
+    // Try bundled 7z.so locations first (env override, exe dir, lib/ subdir)
     std::vector<std::string> tryPaths;
-    if (!envDlls.empty()) {
-      tryPaths.push_back(envDlls + "/7z.so");
+    if (!envLibs.empty()) {
+      tryPaths.push_back(envLibs + "/7z.so");
     }
     tryPaths.push_back(exeDir + "/7z.so");
-    tryPaths.push_back(exeDir + "/dlls/7z.so");
+    tryPaths.push_back(exeDir + "/lib/7z.so");
     tryPaths.push_back("7z.so");
-    tryPaths.push_back("dlls/7z.so");
+    tryPaths.push_back("lib/7z.so");
     tryPaths.push_back("/usr/lib/p7zip/7z.so");
     tryPaths.push_back("/usr/lib64/p7zip/7z.so");
     tryPaths.push_back("/usr/libexec/p7zip/7z.so");