diff options
| author | George Hazan <george.hazan@gmail.com> | 2015-06-19 21:01:00 +0000 |
|---|---|---|
| committer | George Hazan <george.hazan@gmail.com> | 2015-06-19 21:01:00 +0000 |
| commit | 618dad69404afb131ec2e2207dd0f642f09a1e86 (patch) | |
| tree | dc081e98e89222b8ed492c8eb3c26a5b4faf4038 /src/miranda32 | |
| parent | c67f96aa215ed9144c445643780b2419285769a3 (diff) | |
Miranda libs to have the .mir extension, to prevent conflicts
git-svn-id: http://svn.miranda-ng.org/main/trunk@14272 1316c22d-e87f-b044-9b9b-93d7a3e3ba9c
Diffstat (limited to 'src/miranda32')
| -rw-r--r-- | src/miranda32/src/checker.cpp | 6 | ||||
| -rw-r--r-- | src/miranda32/src/miranda.cpp | 6 |
2 files changed, 8 insertions, 4 deletions
diff --git a/src/miranda32/src/checker.cpp b/src/miranda32/src/checker.cpp index 0ba46a5c7f..511e228109 100644 --- a/src/miranda32/src/checker.cpp +++ b/src/miranda32/src/checker.cpp @@ -196,7 +196,11 @@ bool TryDeleteFile(const TCHAR *ptszFileName) /////////////////////////////////////////////////////////////////////////////////////////
-static TCHAR *arDlls[] = { _T("mir_app.dll"), _T("mir_core.dll"), _T("pcre16.dll"), _T("zlib.dll"), _T("libtox.dll") };
+static TCHAR *arDlls[] =
+{
+ _T("mir_app.dll"), _T("mir_core.dll"), _T("pcre16.dll"), _T("zlib.dll"), _T("libtox.dll"),
+ _T("libs\\mir_app.dll"), _T("libs\\mir_core.dll"), _T("libs\\libjson.dll"), _T("libs\\pcre16.dll"), _T("libs\\zlib.dll")
+};
bool CheckDlls()
{
diff --git a/src/miranda32/src/miranda.cpp b/src/miranda32/src/miranda.cpp index c5751aca4f..d05dc557c4 100644 --- a/src/miranda32/src/miranda.cpp +++ b/src/miranda32/src/miranda.cpp @@ -51,16 +51,16 @@ int WINAPI _tWinMain(HINSTANCE hInstance, HINSTANCE, LPTSTR cmdLine, int) GetEnvironmentVariable(_T("PATH"), ptszVal + cbPath + 1, cbSize);
SetEnvironmentVariable(_T("PATH"), ptszVal);
- HINSTANCE hMirApp = LoadLibraryA("mir_app.dll");
+ HINSTANCE hMirApp = LoadLibraryA("mir_app.mir");
if (hMirApp == NULL) {
- MessageBox(NULL, _T("mir_app.dll cannot be loaded"), _T("Fatal error"), MB_ICONERROR | MB_OK);
+ MessageBox(NULL, _T("mir_app.mir cannot be loaded"), _T("Fatal error"), MB_ICONERROR | MB_OK);
return 1;
}
typedef int (WINAPI *pfnMain)(LPTSTR);
pfnMain fnMain = (pfnMain)GetProcAddress(hMirApp, "mir_main");
if (fnMain == NULL) {
- MessageBox(NULL, _T("invalid mir_app.dll present, program exiting"), _T("Fatal error"), MB_ICONERROR | MB_OK);
+ MessageBox(NULL, _T("invalid mir_app.mir present, program exiting"), _T("Fatal error"), MB_ICONERROR | MB_OK);
return 2;
}
|