diff options
| author |  Fabio Bas | 2008-05-28 21:38:59 +0000 |
|---|---|---|
| committer | Fabio Bas | 2008-05-28 21:38:59 +0000 |
| commit | c0ce963fdcbb297b7235cbd3c687d2e5b4be1e29 (patch) | |
| tree | a6f780649f4b1751b9f5f623e22f7b3d249553e8 | |
| parent | updated doc (diff) | |
| download | KVIrc-c0ce963fdcbb297b7235cbd3c687d2e5b4be1e29.tar.gz KVIrc-c0ce963fdcbb297b7235cbd3c687d2e5b4be1e29.tar.bz2 KVIrc-c0ce963fdcbb297b7235cbd3c687d2e5b4be1e29.zip | |
mingw32: fixed module loading
git-svn-id: https://svn.kvirc.de/svn/trunk/kvirc@1868 17fca916-40b9-46aa-a4ea-0a15b648b75c
| -rw-r--r-- | src/kvirc/kernel/kvi_app_setup.cpp | 6 | ||||
| -rw-r--r-- | src/kvirc/module/kvi_modulemanager.cpp | 12 |
2 files changed, 12 insertions, 6 deletions
diff --git a/src/kvirc/kernel/kvi_app_setup.cpp b/src/kvirc/kernel/kvi_app_setup.cpp index 3b6612c80..94e29cbe5 100644 --- a/src/kvirc/kernel/kvi_app_setup.cpp +++ b/src/kvirc/kernel/kvi_app_setup.cpp @@ -731,8 +731,10 @@ void KviApp::setupBegin() QString szSetupLib; getGlobalKvircDirectory(szSetupLib,KviApp::Modules); KviQString::ensureLastCharIs(szSetupLib,KVI_PATH_SEPARATOR_CHAR); -#if defined(COMPILE_ON_WINDOWS) || defined(COMPILE_ON_MINGW) - szSetupLib.append("kvisetup.dll"); +#if defined(COMPILE_ON_WINDOWS)
+ szSetupLib.append("kvisetup.dll");
+#elif defined(COMPILE_ON_MINGW) + szSetupLib.append("libkvisetup.dll"); #else szSetupLib.append("libkvisetup.so"); #endif diff --git a/src/kvirc/module/kvi_modulemanager.cpp b/src/kvirc/module/kvi_modulemanager.cpp index 34f21c470..790ac9efa 100644 --- a/src/kvirc/module/kvi_modulemanager.cpp +++ b/src/kvirc/module/kvi_modulemanager.cpp @@ -92,8 +92,10 @@ void KviModuleManager::loadModulesByCaps(const QString &caps) void KviModuleManager::completeModuleNames(const QString &path,const QString &word,KviPointerList<QString> * matches) { QDir d(path); -#if defined(COMPILE_ON_WINDOWS) || defined(COMPILE_ON_MINGW) - d.setNameFilters(QStringList("kvi*.dll")); +#if defined(COMPILE_ON_WINDOWS)
+ d.setNameFilters(QStringList("kvi*.dll"));
+#elif defined(COMPILE_ON_MINGW) + d.setNameFilters(QStringList("libkvi*.dll")); #else d.setNameFilters(QStringList("libkvi*.so")); #endif @@ -167,8 +169,10 @@ bool KviModuleManager::loadModule(const QString &modName) } QString tmp; QString szName; -#if defined(COMPILE_ON_WINDOWS) || defined(COMPILE_ON_MINGW) - KviQString::appendFormatted(szName,"kvi%Q.dll",&modName); +#if defined(COMPILE_ON_WINDOWS)
+ KviQString::appendFormatted(szName,"kvi%Q.dll",&modName);
+#elif defined(COMPILE_ON_MINGW) + KviQString::appendFormatted(szName,"libkvi%Q.dll",&modName); #else KviQString::appendFormatted(szName,"libkvi%Q.so",&modName); #endif |