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

25 files changed, 25 insertions, 14 deletions

diff --git a/bin10/lib/libjson.lib b/bin10/lib/libjson.lib
index c157d388c2..cba45bb577 100644
--- a/bin10/lib/libjson.lib
+++ b/bin10/lib/libjson.lib
diff --git a/bin10/lib/libjson64.lib b/bin10/lib/libjson64.lib
index 3625a2ae21..d2385c7191 100644
--- a/bin10/lib/libjson64.lib
+++ b/bin10/lib/libjson64.lib
diff --git a/bin10/lib/mir_app.lib b/bin10/lib/mir_app.lib
index 3f8c5f8e97..d0dc6f57df 100644
--- a/bin10/lib/mir_app.lib
+++ b/bin10/lib/mir_app.lib
diff --git a/bin10/lib/mir_app64.lib b/bin10/lib/mir_app64.lib
index 7b6d97f5d2..e227eed9c2 100644
--- a/bin10/lib/mir_app64.lib
+++ b/bin10/lib/mir_app64.lib
diff --git a/bin10/lib/mir_core.lib b/bin10/lib/mir_core.lib
index ed84fedca4..b2fcebaf83 100644
--- a/bin10/lib/mir_core.lib
+++ b/bin10/lib/mir_core.lib
diff --git a/bin10/lib/mir_core64.lib b/bin10/lib/mir_core64.lib
index f7a21f3e17..8556ecc62e 100644
--- a/bin10/lib/mir_core64.lib
+++ b/bin10/lib/mir_core64.lib
diff --git a/bin12/lib/libjson.lib b/bin12/lib/libjson.lib
index c157d388c2..ce72206bd2 100644
--- a/bin12/lib/libjson.lib
+++ b/bin12/lib/libjson.lib
diff --git a/bin12/lib/libjson64.lib b/bin12/lib/libjson64.lib
index 3625a2ae21..987b8ec95b 100644
--- a/bin12/lib/libjson64.lib
+++ b/bin12/lib/libjson64.lib
diff --git a/bin12/lib/mir_app.lib b/bin12/lib/mir_app.lib
index 3f8c5f8e97..d0dc6f57df 100644
--- a/bin12/lib/mir_app.lib
+++ b/bin12/lib/mir_app.lib
diff --git a/bin12/lib/mir_app64.lib b/bin12/lib/mir_app64.lib
index 7b6d97f5d2..e227eed9c2 100644
--- a/bin12/lib/mir_app64.lib
+++ b/bin12/lib/mir_app64.lib
diff --git a/bin12/lib/mir_core.lib b/bin12/lib/mir_core.lib
index ed84fedca4..b2fcebaf83 100644
--- a/bin12/lib/mir_core.lib
+++ b/bin12/lib/mir_core.lib
diff --git a/bin12/lib/mir_core64.lib b/bin12/lib/mir_core64.lib
index f7a21f3e17..8556ecc62e 100644
--- a/bin12/lib/mir_core64.lib
+++ b/bin12/lib/mir_core64.lib
diff --git a/build/vc.common/lib.props b/build/vc.common/lib.props
index 463e44bc21..c6e2f782f5 100644
--- a/build/vc.common/lib.props
+++ b/build/vc.common/lib.props
@@ -28,4 +28,8 @@
     <OutDir Condition="'$(Platform)'=='x64'">$(SolutionDir)$(Configuration)64\Libs\</OutDir>

   </PropertyGroup>

   <Import Project="common.props"/>

+  <PropertyGroup>

+    <TargetExt>.mir</TargetExt>

+    <TargetPath>$(OutDir)$(TargetName)$(TargetExt)</TargetPath>

+  </PropertyGroup>

 </Project>

diff --git a/include/delphi/m_core.inc b/include/delphi/m_core.inc
index 7a3cb5d8e7..624d5cd317 100644
--- a/include/delphi/m_core.inc
+++ b/include/delphi/m_core.inc
@@ -25,8 +25,8 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 

 

 const

-  CoreDLL = 'mir_core.dll';

-  AppDLL = 'mir_app.dll';

+  CoreDLL = 'mir_core.mir';

+  AppDLL = 'mir_app.mir';

 

 ///////////////////////////////////////////////////////////////////////////////

 // command line support

diff --git a/include/delphi/m_json.inc b/include/delphi/m_json.inc
index 4c15fc168e..bb5b831527 100644
--- a/include/delphi/m_json.inc
+++ b/include/delphi/m_json.inc
@@ -24,7 +24,7 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 {$DEFINE MIM_LIBJSON}

 

 const

-  JsonDLL = 'libjson.dll';

+  JsonDLL = 'libjson.mir';

 

 type

   PJSONNODE = ^TJSONNODE;

diff --git a/include/delphi/m_zlib.inc b/include/delphi/m_zlib.inc
index fe17cc398f..05848515be 100644
--- a/include/delphi/m_zlib.inc
+++ b/include/delphi/m_zlib.inc
@@ -24,7 +24,7 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 {$DEFINE M_ZLIB}

 

 const

-  ZlibDLL = 'zlib.dll';

+  ZlibDLL = 'zlib.mir';

 

   Z_NO_FLUSH      = 0;
   Z_PARTIAL_FLUSH = 1;
diff --git a/libs/libjson/src/libjson.def b/libs/libjson/src/libjson.def
index 27f3b7eb4c..3d87cdb298 100644
--- a/libs/libjson/src/libjson.def
+++ b/libs/libjson/src/libjson.def
@@ -1,4 +1,4 @@
-LIBRARY libjson

+LIBRARY libjson.mir

 

 EXPORTS

 ??0JSONNode@@AAE@ABV?$basic_string@DU?$char_traits@D@std@@V?$allocator@D@2@@std@@@Z @1 NONAME

diff --git a/libs/libjson/src/libjson64.def b/libs/libjson/src/libjson64.def
index 15137e18e0..fb0f419917 100644
--- a/libs/libjson/src/libjson64.def
+++ b/libs/libjson/src/libjson64.def
@@ -1,4 +1,4 @@
-LIBRARY libjson

+LIBRARY libjson.mir

 

 EXPORTS

 ??0JSONNode@@AEAA@AEBV?$basic_string@DU?$char_traits@D@std@@V?$allocator@D@2@@std@@@Z @1 NONAME

diff --git a/libs/zlib/src/zlib.def b/libs/zlib/src/zlib.def
index fb016d28c3..a36b233799 100644
--- a/libs/zlib/src/zlib.def
+++ b/libs/zlib/src/zlib.def
@@ -1,4 +1,5 @@
 ; zlib data compression library
+LIBRARY zlib.mir
 EXPORTS
 ; basic functions
     zlibVersion
diff --git a/src/mir_app/src/mir_app.def b/src/mir_app/src/mir_app.def
index 14e239b8f6..29a0ddd771 100644
--- a/src/mir_app/src/mir_app.def
+++ b/src/mir_app/src/mir_app.def
@@ -1,5 +1,6 @@
-EXPORTS

+LIBRARY mir_app.mir

 

+EXPORTS

 CallContactService          @1

 CallProtoService            @2

 Skin_LoadProtoIcon          @4

diff --git a/src/mir_app/src/mir_app64.def b/src/mir_app/src/mir_app64.def
index 26677f922c..be37130c97 100644
--- a/src/mir_app/src/mir_app64.def
+++ b/src/mir_app/src/mir_app64.def
@@ -1,5 +1,6 @@
-EXPORTS

+LIBRARY mir_app.mir

 

+EXPORTS

 CallContactService          @1

 CallProtoService            @2

 Skin_LoadProtoIcon          @4

diff --git a/src/mir_core/src/mir_core.def b/src/mir_core/src/mir_core.def
index 70ee0c1c1d..de7e3dba81 100644
--- a/src/mir_core/src/mir_core.def
+++ b/src/mir_core/src/mir_core.def
@@ -1,4 +1,4 @@
-LIBRARY mir_core

+LIBRARY mir_core.mir

 

 EXPORTS

 Langpack_LookupUuid             @3

diff --git a/src/mir_core/src/mir_core64.def b/src/mir_core/src/mir_core64.def
index cc345a6ca8..d827389424 100644
--- a/src/mir_core/src/mir_core64.def
+++ b/src/mir_core/src/mir_core64.def
@@ -1,4 +1,4 @@
-LIBRARY mir_core

+LIBRARY mir_core.mir

 

 EXPORTS

 Langpack_LookupUuid             @3

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;

 	}