Linuxではp7zipに合わせて7z.soを読み込むよう変更。

[tpi/lychee.git] / src / plugin / 7zArc / 7zArc.cpp

diff --git a/src/plugin/7zArc/7zArc.cpp b/src/plugin/7zArc/7zArc.cpp
index 60c1cb2..2ed33e6 100644 (file)
--- a/src/plugin/7zArc/7zArc.cpp
+++ b/src/plugin/7zArc/7zArc.cpp
@@ -30,6 +30,12 @@
 #include <wx/dynlib.h>\r
 #include "7zArc.h"\r
 \r
+#ifdef __LINUX__\r
+#define LIB_NAME wxT("7z.so")\r
+#else\r
+#define LIB_NAME g_hLib.CanonicalizeName(wxT("7z"))\r
+#endif\r
+\r
 //******************************************************************************\r
 //    Global varients\r
 //******************************************************************************\r
@@ -121,7 +127,7 @@ int __stdcall GetFormatInformation2(TPI_FORMATINFO * _fiInfo, wxULongLong_t & nI
        _fiInfo->nRecoveryRecordMax = 0;\r
        _fiInfo->szTypeName.Empty();\r
        _fiInfo->szSuffix.Empty();\r
-       _fiInfo->szEngineName       = g_hLib.CanonicalizeName(wxT("7z"));\r
+       _fiInfo->szEngineName       = LIB_NAME;\r
        _fiInfo->szTPIName          = wxT("7zArc");\r
        _fiInfo->eSupportedCommand  = TPI_COMMAND_EXTRACT | TPI_COMMAND_TEST;\r
        _fiInfo->nTypeId            = nIndex;\r
@@ -729,7 +735,7 @@ int __stdcall LoadPlugin
        wxULongLong_t _nTypeId\r
 )\r
 {\r
-       g_hLib.Load(g_hLib.CanonicalizeName(wxT("7z")));\r
+       g_hLib.Load(LIB_NAME);\r
        if (! g_hLib.IsLoaded())\r
        {\r
                g_hLib.Unload();\r