vs2015 not to be used to build common .def & .lib files

git-svn-id: http://svn.miranda-ng.org/main/trunk@14756 1316c22d-e87f-b044-9b9b-93d7a3e3ba9c

13 files changed, 15 insertions, 24 deletions

diff --git a/bin10/lib/libjson.lib b/bin10/lib/libjson.lib
index ff44f6744b..132726edab 100644
--- a/bin10/lib/libjson.lib
+++ b/bin10/lib/libjson.lib
diff --git a/bin10/lib/libjson64.lib b/bin10/lib/libjson64.lib
index c448aaedee..4a3390b5c6 100644
--- a/bin10/lib/libjson64.lib
+++ b/bin10/lib/libjson64.lib
diff --git a/bin12/lib/libjson.lib b/bin12/lib/libjson.lib
index ff44f6744b..132726edab 100644
--- a/bin12/lib/libjson.lib
+++ b/bin12/lib/libjson.lib
diff --git a/bin12/lib/libjson64.lib b/bin12/lib/libjson64.lib
index c448aaedee..4a3390b5c6 100644
--- a/bin12/lib/libjson64.lib
+++ b/bin12/lib/libjson64.lib
diff --git a/bin14/lib/libjson.lib b/bin14/lib/libjson.lib
index ff44f6744b..132726edab 100644
--- a/bin14/lib/libjson.lib
+++ b/bin14/lib/libjson.lib
diff --git a/bin14/lib/libjson64.lib b/bin14/lib/libjson64.lib
index c448aaedee..4a3390b5c6 100644
--- a/bin14/lib/libjson64.lib
+++ b/bin14/lib/libjson64.lib
diff --git a/copylib.cmd b/copylib.cmd
index f52281f684..c2208a8c97 100644
--- a/copylib.cmd
+++ b/copylib.cmd
@@ -4,3 +4,6 @@ copy /Y .\Bin12\Debug64\Obj\mir_core\mir_core.lib .\Bin10\lib\mir_core64.lib
 

 copy /Y .\Bin12\Debug\Obj\mir_core\mir_core.lib .\Bin12\lib

 copy /Y .\Bin12\Debug64\Obj\mir_core\mir_core.lib .\Bin12\lib\mir_core64.lib

+

+copy /Y .\Bin12\Debug\Obj\mir_core\mir_core.lib .\Bin14\lib

+copy /Y .\Bin12\Debug64\Obj\mir_core\mir_core.lib .\Bin14\lib\mir_core64.lib

diff --git a/copylibapp.cmd b/copylibapp.cmd
index 4850514a77..f43642a573 100644
--- a/copylibapp.cmd
+++ b/copylibapp.cmd
@@ -4,3 +4,6 @@ copy /Y .\Bin12\Debug64\Obj\mir_app\mir_app.lib .\Bin10\lib\mir_app64.lib
 

 copy /Y .\Bin12\Debug\Obj\mir_app\mir_app.lib .\Bin12\lib\mir_app.lib

 copy /Y .\Bin12\Debug64\Obj\mir_app\mir_app.lib .\Bin12\lib\mir_app64.lib

+

+copy /Y .\Bin12\Debug\Obj\mir_app\mir_app.lib .\Bin14\lib\mir_app.lib

+copy /Y .\Bin12\Debug64\Obj\mir_app\mir_app.lib .\Bin14\lib\mir_app64.lib

diff --git a/copylibjson.cmd b/copylibjson.cmd
new file mode 100644
index 0000000000..52d2a7e81b
--- /dev/null
+++ b/copylibjson.cmd
@@ -0,0 +1,9 @@
+@echo off

+copy /Y .\Bin12\Debug\Obj\libjson\libjson.lib .\Bin10\lib\libjson.lib

+copy /Y .\Bin12\Debug64\Obj\libjson\libjson.lib .\Bin10\lib\libjson64.lib

+

+copy /Y .\Bin12\Debug\Obj\libjson\libjson.lib .\Bin12\lib\libjson.lib

+copy /Y .\Bin12\Debug64\Obj\libjson\libjson.lib .\Bin12\lib\libjson64.lib

+

+copy /Y .\Bin12\Debug\Obj\libjson\libjson.lib .\Bin14\lib\libjson.lib

+copy /Y .\Bin12\Debug64\Obj\libjson\libjson.lib .\Bin14\lib\libjson64.lib

diff --git a/copylibs_bin14.cmd b/copylibs_bin14.cmd
deleted file mode 100644
index 4091792673..0000000000
--- a/copylibs_bin14.cmd
+++ /dev/null
@@ -1,9 +0,0 @@
-@echo off

-copy /Y .\Bin14\Debug\Obj\mir_core\mir_core.lib .\Bin14\lib

-copy /Y .\Bin14\Debug64\Obj\mir_core\mir_core.lib .\Bin14\lib\mir_core64.lib

-

-copy /Y .\Bin14\Debug\Obj\mir_app\mir_app.lib .\Bin14\lib\mir_app.lib

-copy /Y .\Bin14\Debug64\Obj\mir_app\mir_app.lib .\Bin14\lib\mir_app64.lib

-

-copy /Y .\Bin14\Debug\Obj\libjson\libjson.lib .\Bin14\lib\libjson.lib

-copy /Y .\Bin14\Debug64\Obj\libjson\libjson.lib .\Bin14\lib\libjson64.lib

diff --git a/libs/libjson/src/libjson.def b/libs/libjson/src/libjson.def
index 0bbdcc81a9..204713341f 100644
--- a/libs/libjson/src/libjson.def
+++ b/libs/libjson/src/libjson.def
@@ -193,4 +193,3 @@ json_type @189
 json_write @190

 json_write_formatted @191

 ??6JSONNode@@QAEAAV0@ABV0@@Z @192 NONAME

-??4JSONWorker@@QAEAAV0@$$QAV0@@Z @193 NONAME

diff --git a/libs/libjson/src/libjson64.def b/libs/libjson/src/libjson64.def
index 29e021f1c6..fa9a40d79d 100644
--- a/libs/libjson/src/libjson64.def
+++ b/libs/libjson/src/libjson64.def
@@ -193,4 +193,3 @@ json_type @189
 json_write @190

 json_write_formatted @191

 ??6JSONNode@@QEAAAEAV0@AEBV0@@Z @192 NONAME

-??4JSONWorker@@QEAAAEAV0@$$QEAV0@@Z @193 NONAME

diff --git a/make_core_def_bin14.cmd b/make_core_def_bin14.cmd
deleted file mode 100644
index 95a99300b1..0000000000
--- a/make_core_def_bin14.cmd
+++ /dev/null
@@ -1,13 +0,0 @@
-@echo off

-echo.

-.\tools\makedef\makedef.exe /IMAGE:bin14\debug\libs\mir_core.mir /DEF:src\mir_core\src\mir_core.def

-echo.

-.\tools\makedef\makedef.exe /IMAGE:bin14\debug64\libs\mir_core.mir /DEF:src\mir_core\src\mir_core64.def

-echo.

-.\tools\makedef\makedef.exe /IMAGE:bin14\debug\libs\mir_app.mir /DEF:src\mir_app\src\mir_app.def

-echo.

-.\tools\makedef\makedef.exe /IMAGE:bin14\debug64\libs\mir_app.mir /DEF:src\mir_app\src\mir_app64.def

-echo.

-.\tools\makedef\makedef.exe /IMAGE:bin14\debug\libs\libjson.mir /DEF:libs\libjson\src\libjson.def

-echo.

-.\tools\makedef\makedef.exe /IMAGE:bin14\debug64\libs\libjson.mir /DEF:libs\libjson\src\libjson64.def