From 4269a726e3ca96a1676d35600f32c29ae5e120a6 Mon Sep 17 00:00:00 2001 From: George Hazan Date: Thu, 16 Feb 2017 20:51:24 +0300 Subject: duplicated lib folders no needed anymore --- bin10/lib/libjson.lib | Bin 63298 -> 0 bytes bin10/lib/libjson64.lib | Bin 63814 -> 0 bytes bin10/lib/mir_app.lib | Bin 103574 -> 0 bytes bin10/lib/mir_app64.lib | Bin 98950 -> 0 bytes bin10/lib/mir_core.lib | Bin 318516 -> 0 bytes bin10/lib/mir_core64.lib | Bin 319706 -> 0 bytes bin12/lib/libjson.lib | Bin 63298 -> 0 bytes bin12/lib/libjson64.lib | Bin 63814 -> 0 bytes bin12/lib/mir_app.lib | Bin 103574 -> 0 bytes bin12/lib/mir_app64.lib | Bin 98950 -> 0 bytes bin12/lib/mir_core.lib | Bin 318516 -> 0 bytes bin12/lib/mir_core64.lib | Bin 319706 -> 0 bytes bin14/lib/libjson.lib | Bin 63298 -> 0 bytes bin14/lib/libjson64.lib | Bin 63814 -> 0 bytes bin14/lib/mir_app.lib | Bin 103574 -> 0 bytes bin14/lib/mir_app64.lib | Bin 98950 -> 0 bytes bin14/lib/mir_core.lib | Bin 318516 -> 0 bytes bin14/lib/mir_core64.lib | Bin 319706 -> 0 bytes build/vc.common/common.props | 4 ---- build/vc.common/core.props | 21 ++++++++++++--------- copylib.cmd | 10 ++-------- copylibapp.cmd | 10 ++-------- copylibjson.cmd | 10 ++-------- include/m_core.h | 12 ++---------- include/m_json.h | 6 +----- libs/win32/libjson.lib | Bin 0 -> 63298 bytes libs/win32/mir_app.lib | Bin 0 -> 103574 bytes libs/win32/mir_core.lib | Bin 0 -> 318516 bytes libs/win64/libjson.lib | Bin 0 -> 63814 bytes libs/win64/mir_app.lib | Bin 0 -> 98950 bytes libs/win64/mir_core.lib | Bin 0 -> 319706 bytes plugins/AdvaImg/AdvaImg_10.vcxproj | 8 ++++---- plugins/AdvaImg/AdvaImg_12.vcxproj | 8 ++++---- plugins/AdvaImg/AdvaImg_14.vcxproj | 8 ++++---- plugins/Clist_ng/clist_ng_10.vcxproj | 4 ++-- plugins/CryptoPP/cryptopp_10.vcxproj | 8 ++++---- plugins/CryptoPP/cryptopp_12.vcxproj | 8 ++++---- plugins/CryptoPP/cryptopp_14.vcxproj | 8 ++++---- plugins/Dbx_kv/Dbx_kv_10.vcxproj | 8 ++++---- plugins/Dbx_kv/Dbx_kv_12.vcxproj | 8 ++++---- plugins/Dbx_kv/Dbx_kv_14.vcxproj | 8 ++++---- plugins/Dbx_kyoto/Dbx_kyoto_10.vcxproj | 8 ++++---- plugins/Dbx_kyoto/Dbx_kyoto_12.vcxproj | 8 ++++---- plugins/Dbx_kyoto/Dbx_kyoto_14.vcxproj | 8 ++++---- plugins/FileAsMessage/fileecho_10.vcxproj | 8 ++++---- plugins/FileAsMessage/fileecho_12.vcxproj | 8 ++++---- plugins/FileAsMessage/fileecho_14.vcxproj | 8 ++++---- plugins/HTTPServer/HTTPServer_10.vcxproj | 8 ++++---- plugins/HTTPServer/HTTPServer_12.vcxproj | 8 ++++---- plugins/HTTPServer/HTTPServer_14.vcxproj | 8 ++++---- plugins/MirFox/MirFoxNG_10.vcxproj | 12 ++++++------ plugins/MirFox/MirFoxNG_12.vcxproj | 12 ++++++------ plugins/MirFox/MirFoxNG_14.vcxproj | 12 ++++++------ plugins/MirLua/Modules/module.props | 4 +--- plugins/MirOTR/MirOTR_10.vcxproj | 8 ++++---- plugins/MirOTR/MirOTR_12.vcxproj | 8 ++++---- plugins/MirOTR/MirOTR_14.vcxproj | 8 ++++---- .../NotesAndReminders/NotesReminders_10.vcxproj | 8 ++++---- .../NotesAndReminders/NotesReminders_12.vcxproj | 8 ++++---- .../NotesAndReminders/NotesReminders_14.vcxproj | 8 ++++---- plugins/SecureIM/secureim_10.vcxproj | 8 ++++---- plugins/SecureIM/secureim_12.vcxproj | 8 ++++---- plugins/SecureIM/secureim_14.vcxproj | 8 ++++---- plugins/WinterSpeak/WinterSpeak.vcxproj | 2 +- plugins/testplugin/testplug_10.vcxproj | 8 ++++---- plugins/testplugin/testplug_12.vcxproj | 8 ++++---- plugins/testplugin/testplug_14.vcxproj | 8 ++++---- protocols/EmLanProto/amdproto_10.vcxproj | 8 ++++---- protocols/EmLanProto/amdproto_12.vcxproj | 8 ++++---- protocols/EmLanProto/amdproto_14.vcxproj | 8 ++++---- protocols/Gadu-Gadu/Gadu-Gadu_10.vcxproj | 8 ++++---- protocols/Gadu-Gadu/Gadu-Gadu_12.vcxproj | 8 ++++---- protocols/Gadu-Gadu/Gadu-Gadu_14.vcxproj | 8 ++++---- protocols/ICQCorp/ICQCorp_10.vcxproj | 8 ++++---- protocols/ICQCorp/ICQCorp_12.vcxproj | 8 ++++---- protocols/ICQCorp/ICQCorp_14.vcxproj | 8 ++++---- protocols/Sametime/sametime_10.vcxproj | 8 ++++---- protocols/Sametime/sametime_12.vcxproj | 8 ++++---- protocols/Sametime/sametime_14.vcxproj | 8 ++++---- tools/checksum/checksum_10.vcxproj | 8 ++++---- tools/checksum/checksum_12.vcxproj | 8 ++++---- tools/checksum/checksum_14.vcxproj | 8 ++++---- 82 files changed, 223 insertions(+), 256 deletions(-) delete mode 100644 bin10/lib/libjson.lib delete mode 100644 bin10/lib/libjson64.lib delete mode 100644 bin10/lib/mir_app.lib delete mode 100644 bin10/lib/mir_app64.lib delete mode 100644 bin10/lib/mir_core.lib delete mode 100644 bin10/lib/mir_core64.lib delete mode 100644 bin12/lib/libjson.lib delete mode 100644 bin12/lib/libjson64.lib delete mode 100644 bin12/lib/mir_app.lib delete mode 100644 bin12/lib/mir_app64.lib delete mode 100644 bin12/lib/mir_core.lib delete mode 100644 bin12/lib/mir_core64.lib delete mode 100644 bin14/lib/libjson.lib delete mode 100644 bin14/lib/libjson64.lib delete mode 100644 bin14/lib/mir_app.lib delete mode 100644 bin14/lib/mir_app64.lib delete mode 100644 bin14/lib/mir_core.lib delete mode 100644 bin14/lib/mir_core64.lib create mode 100644 libs/win32/libjson.lib create mode 100644 libs/win32/mir_app.lib create mode 100644 libs/win32/mir_core.lib create mode 100644 libs/win64/libjson.lib create mode 100644 libs/win64/mir_app.lib create mode 100644 libs/win64/mir_core.lib diff --git a/bin10/lib/libjson.lib b/bin10/lib/libjson.lib deleted file mode 100644 index bdfad54af0..0000000000 Binary files a/bin10/lib/libjson.lib and /dev/null differ diff --git a/bin10/lib/libjson64.lib b/bin10/lib/libjson64.lib deleted file mode 100644 index 97397211e1..0000000000 Binary files a/bin10/lib/libjson64.lib and /dev/null differ diff --git a/bin10/lib/mir_app.lib b/bin10/lib/mir_app.lib deleted file mode 100644 index 170a52afca..0000000000 Binary files a/bin10/lib/mir_app.lib and /dev/null differ diff --git a/bin10/lib/mir_app64.lib b/bin10/lib/mir_app64.lib deleted file mode 100644 index 4725b97a31..0000000000 Binary files a/bin10/lib/mir_app64.lib and /dev/null differ diff --git a/bin10/lib/mir_core.lib b/bin10/lib/mir_core.lib deleted file mode 100644 index da05af9a8b..0000000000 Binary files a/bin10/lib/mir_core.lib and /dev/null differ diff --git a/bin10/lib/mir_core64.lib b/bin10/lib/mir_core64.lib deleted file mode 100644 index 9a05ec3a28..0000000000 Binary files a/bin10/lib/mir_core64.lib and /dev/null differ diff --git a/bin12/lib/libjson.lib b/bin12/lib/libjson.lib deleted file mode 100644 index bdfad54af0..0000000000 Binary files a/bin12/lib/libjson.lib and /dev/null differ diff --git a/bin12/lib/libjson64.lib b/bin12/lib/libjson64.lib deleted file mode 100644 index 97397211e1..0000000000 Binary files a/bin12/lib/libjson64.lib and /dev/null differ diff --git a/bin12/lib/mir_app.lib b/bin12/lib/mir_app.lib deleted file mode 100644 index 170a52afca..0000000000 Binary files a/bin12/lib/mir_app.lib and /dev/null differ diff --git a/bin12/lib/mir_app64.lib b/bin12/lib/mir_app64.lib deleted file mode 100644 index 4725b97a31..0000000000 Binary files a/bin12/lib/mir_app64.lib and /dev/null differ diff --git a/bin12/lib/mir_core.lib b/bin12/lib/mir_core.lib deleted file mode 100644 index da05af9a8b..0000000000 Binary files a/bin12/lib/mir_core.lib and /dev/null differ diff --git a/bin12/lib/mir_core64.lib b/bin12/lib/mir_core64.lib deleted file mode 100644 index 9a05ec3a28..0000000000 Binary files a/bin12/lib/mir_core64.lib and /dev/null differ diff --git a/bin14/lib/libjson.lib b/bin14/lib/libjson.lib deleted file mode 100644 index bdfad54af0..0000000000 Binary files a/bin14/lib/libjson.lib and /dev/null differ diff --git a/bin14/lib/libjson64.lib b/bin14/lib/libjson64.lib deleted file mode 100644 index 97397211e1..0000000000 Binary files a/bin14/lib/libjson64.lib and /dev/null differ diff --git a/bin14/lib/mir_app.lib b/bin14/lib/mir_app.lib deleted file mode 100644 index 170a52afca..0000000000 Binary files a/bin14/lib/mir_app.lib and /dev/null differ diff --git a/bin14/lib/mir_app64.lib b/bin14/lib/mir_app64.lib deleted file mode 100644 index 4725b97a31..0000000000 Binary files a/bin14/lib/mir_app64.lib and /dev/null differ diff --git a/bin14/lib/mir_core.lib b/bin14/lib/mir_core.lib deleted file mode 100644 index da05af9a8b..0000000000 Binary files a/bin14/lib/mir_core.lib and /dev/null differ diff --git a/bin14/lib/mir_core64.lib b/bin14/lib/mir_core64.lib deleted file mode 100644 index 9a05ec3a28..0000000000 Binary files a/bin14/lib/mir_core64.lib and /dev/null differ diff --git a/build/vc.common/common.props b/build/vc.common/common.props index 7c127cd3a8..c67c03187e 100644 --- a/build/vc.common/common.props +++ b/build/vc.common/common.props @@ -2,9 +2,6 @@ 10.0 - $(ProjectDir)..\..\bin10\lib - $(ProjectDir)..\..\bin12\lib - $(ProjectDir)..\..\bin14\lib $(ProjectName) @@ -35,7 +32,6 @@ winmm.lib;Wtsapi32.lib;netapi32.lib;pdh.lib;shlwapi.lib;Strmiids.lib;gdiplus.lib;dbghelp.lib;Setupapi.lib;msimg32.lib;comctl32.lib;ws2_32.lib;UxTheme.lib;Iphlpapi.lib;%(AdditionalDependencies) - $(CommonLibDir) true false Windows diff --git a/build/vc.common/core.props b/build/vc.common/core.props index 210495854c..0a0836ea2a 100644 --- a/build/vc.common/core.props +++ b/build/vc.common/core.props @@ -27,22 +27,25 @@ $(SolutionDir)$(Configuration)\Core\ $(SolutionDir)$(Configuration)64\Core\ - - 10.0 - $(ProjectDir)..\..\..\bin10\lib - $(ProjectDir)..\..\..\bin12\lib - $(ProjectDir)..\..\..\bin14\lib - ..\..\..\include;..\..\..\plugins\ExternalAPI;..\..\..\..\boost;%(AdditionalIncludeDirectories) - - $(CommonCoreLibDir) - ..\..\..\include;..\..\..\include\msapi + + + + $(ProjectDir)..\..\..\libs\win32;$(ProjectDir)..\..\..\..\boost\stage\lib + + + + + $(ProjectDir)..\..\..\libs\win64;$(ProjectDir)..\..\..\..\boost\stage64\lib + + + diff --git a/copylib.cmd b/copylib.cmd index c2208a8c97..9f367a96fe 100644 --- a/copylib.cmd +++ b/copylib.cmd @@ -1,9 +1,3 @@ @echo off -copy /Y .\Bin12\Debug\Obj\mir_core\mir_core.lib .\Bin10\lib -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 +copy /Y .\Bin12\Debug\Obj\mir_core\mir_core.lib .\libs\win32 +copy /Y .\Bin12\Debug64\Obj\mir_core\mir_core.lib .\libs\win64 diff --git a/copylibapp.cmd b/copylibapp.cmd index f43642a573..c9eaf2243e 100644 --- a/copylibapp.cmd +++ b/copylibapp.cmd @@ -1,9 +1,3 @@ @echo off -copy /Y .\Bin12\Debug\Obj\mir_app\mir_app.lib .\Bin10\lib\mir_app.lib -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 +copy /Y .\Bin12\Debug\Obj\mir_app\mir_app.lib .\libs\win32 +copy /Y .\Bin12\Debug64\Obj\mir_app\mir_app.lib .\libs\win64 diff --git a/copylibjson.cmd b/copylibjson.cmd index 52d2a7e81b..a9c53a292a 100644 --- a/copylibjson.cmd +++ b/copylibjson.cmd @@ -1,9 +1,3 @@ @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 +copy /Y .\Bin12\Debug\Obj\libjson\libjson.lib .\libs\win32 +copy /Y .\Bin12\Debug64\Obj\libjson\libjson.lib .\libs\win64 diff --git a/include/m_core.h b/include/m_core.h index 8b834dbb62..272947f9be 100644 --- a/include/m_core.h +++ b/include/m_core.h @@ -589,19 +589,11 @@ inline int mir_vsnwprintf(wchar_t(&buffer)[_Size], const wchar_t* fmt, va_list v #endif #ifndef MIR_CORE_EXPORTS - #if !defined(_WIN64) - #pragma comment(lib, "mir_core.lib") - #else - #pragma comment(lib, "mir_core64.lib") - #endif + #pragma comment(lib, "mir_core.lib") #endif #ifndef MIR_APP_EXPORTS - #if !defined(_WIN64) - #pragma comment(lib, "mir_app.lib") - #else - #pragma comment(lib, "mir_app64.lib") - #endif + #pragma comment(lib, "mir_app.lib") #endif #endif // M_CORE_H diff --git a/include/m_json.h b/include/m_json.h index b2361aa49e..1b2664483c 100644 --- a/include/m_json.h +++ b/include/m_json.h @@ -147,11 +147,7 @@ public: #endif // __cplusplus #ifndef LIBJSON_EXPORTS - #if !defined(_WIN64) - #pragma comment(lib, "libjson.lib") - #else - #pragma comment(lib, "libjson64.lib") - #endif + #pragma comment(lib, "libjson.lib") #endif #endif // MIM_LIBJSON_H diff --git a/libs/win32/libjson.lib b/libs/win32/libjson.lib new file mode 100644 index 0000000000..abc90f1f74 Binary files /dev/null and b/libs/win32/libjson.lib differ diff --git a/libs/win32/mir_app.lib b/libs/win32/mir_app.lib new file mode 100644 index 0000000000..cb3b4ca566 Binary files /dev/null and b/libs/win32/mir_app.lib differ diff --git a/libs/win32/mir_core.lib b/libs/win32/mir_core.lib new file mode 100644 index 0000000000..da05af9a8b Binary files /dev/null and b/libs/win32/mir_core.lib differ diff --git a/libs/win64/libjson.lib b/libs/win64/libjson.lib new file mode 100644 index 0000000000..0d14c56ca5 Binary files /dev/null and b/libs/win64/libjson.lib differ diff --git a/libs/win64/mir_app.lib b/libs/win64/mir_app.lib new file mode 100644 index 0000000000..a7e9e79a95 Binary files /dev/null and b/libs/win64/mir_app.lib differ diff --git a/libs/win64/mir_core.lib b/libs/win64/mir_core.lib new file mode 100644 index 0000000000..9a05ec3a28 Binary files /dev/null and b/libs/win64/mir_core.lib differ diff --git a/plugins/AdvaImg/AdvaImg_10.vcxproj b/plugins/AdvaImg/AdvaImg_10.vcxproj index 3618a15036..6c59c86bf9 100644 --- a/plugins/AdvaImg/AdvaImg_10.vcxproj +++ b/plugins/AdvaImg/AdvaImg_10.vcxproj @@ -93,7 +93,7 @@ false $(IntDir)$(TargetName).lib Windows - $(ProfileDir)..\..\bin10\lib + $(ProfileDir)..\..\libs\win$(PlatformArchitecture) /PDBALTPATH:%_PDB% @@ -121,7 +121,7 @@ false $(IntDir)$(TargetName).lib Windows - $(ProfileDir)..\..\bin10\lib + $(ProfileDir)..\..\libs\win$(PlatformArchitecture) /PDBALTPATH:%_PDB% @@ -148,7 +148,7 @@ $(IntDir)$(TargetName).lib Windows 0x5130000 - $(ProfileDir)..\..\bin10\lib + $(ProfileDir)..\..\libs\win$(PlatformArchitecture) @@ -175,7 +175,7 @@ $(IntDir)$(TargetName).lib 0x5130000 Windows - $(ProfileDir)..\..\bin10\lib + $(ProfileDir)..\..\libs\win$(PlatformArchitecture) diff --git a/plugins/AdvaImg/AdvaImg_12.vcxproj b/plugins/AdvaImg/AdvaImg_12.vcxproj index ae7ea09c2c..76195db133 100644 --- a/plugins/AdvaImg/AdvaImg_12.vcxproj +++ b/plugins/AdvaImg/AdvaImg_12.vcxproj @@ -97,7 +97,7 @@ false $(IntDir)$(TargetName).lib Windows - $(ProfileDir)..\..\bin12\lib + $(ProfileDir)..\..\libs\win$(PlatformArchitecture) @@ -124,7 +124,7 @@ false $(IntDir)$(TargetName).lib Windows - $(ProfileDir)..\..\bin12\lib + $(ProfileDir)..\..\libs\win$(PlatformArchitecture) @@ -150,7 +150,7 @@ $(IntDir)$(TargetName).lib Windows 0x5130000 - $(ProfileDir)..\..\bin12\lib + $(ProfileDir)..\..\libs\win$(PlatformArchitecture) false @@ -178,7 +178,7 @@ $(IntDir)$(TargetName).lib 0x5130000 Windows - $(ProfileDir)..\..\bin12\lib + $(ProfileDir)..\..\libs\win$(PlatformArchitecture) diff --git a/plugins/AdvaImg/AdvaImg_14.vcxproj b/plugins/AdvaImg/AdvaImg_14.vcxproj index 1c2c115738..6350db3edb 100644 --- a/plugins/AdvaImg/AdvaImg_14.vcxproj +++ b/plugins/AdvaImg/AdvaImg_14.vcxproj @@ -97,7 +97,7 @@ false $(IntDir)$(TargetName).lib Windows - $(ProfileDir)..\..\bin14\lib + $(ProfileDir)..\..\libs\win$(PlatformArchitecture) @@ -124,7 +124,7 @@ false $(IntDir)$(TargetName).lib Windows - $(ProfileDir)..\..\bin14\lib + $(ProfileDir)..\..\libs\win$(PlatformArchitecture) @@ -150,7 +150,7 @@ $(IntDir)$(TargetName).lib Windows 0x5130000 - $(ProfileDir)..\..\bin14\lib + $(ProfileDir)..\..\libs\win$(PlatformArchitecture) false @@ -178,7 +178,7 @@ $(IntDir)$(TargetName).lib 0x5130000 Windows - $(ProfileDir)..\..\bin14\lib + $(ProfileDir)..\..\libs\win$(PlatformArchitecture) diff --git a/plugins/Clist_ng/clist_ng_10.vcxproj b/plugins/Clist_ng/clist_ng_10.vcxproj index b9274695be..b05e5a6828 100644 --- a/plugins/Clist_ng/clist_ng_10.vcxproj +++ b/plugins/Clist_ng/clist_ng_10.vcxproj @@ -224,7 +224,7 @@ comctl32.lib;shlwapi.lib;gdiplus.lib;d2d1.lib;delayimp.lib;%(AdditionalDependencies) gdiplus.dll;%(DelayLoadDLLs) - $(ProfileDir)..\..\bin10\lib + $(ProfileDir)..\..\libs\win$(PlatformArchitecture) true @@ -258,7 +258,7 @@ comctl32.lib;shlwapi.lib;gdiplus.lib;d2d1.lib;d2d1.lib;delayimp.lib;%(AdditionalDependencies) %(DelayLoadDLLs) - $(ProfileDir)..\..\bin10\lib + $(ProfileDir)..\..\libs\win$(PlatformArchitecture) true diff --git a/plugins/CryptoPP/cryptopp_10.vcxproj b/plugins/CryptoPP/cryptopp_10.vcxproj index ad1afc0700..00d8cf72a8 100644 --- a/plugins/CryptoPP/cryptopp_10.vcxproj +++ b/plugins/CryptoPP/cryptopp_10.vcxproj @@ -91,7 +91,7 @@ true 0x46000000 false - $(ProfileDir)..\..\bin10\lib;.\src\PGPw\sdk8\lib + $(ProfileDir)..\..\libs\win$(PlatformArchitecture);.\src\PGPw\sdk8\lib ws2_32.lib;$(SolutionDir)$(Configuration)\Obj\cryptlib\cryptlib.lib;%(AdditionalDependencies) $(IntDir)$(TargetName).lib Windows @@ -118,7 +118,7 @@ true 0x46000000 false - $(ProfileDir)..\..\bin10\lib;.\src\PGPw\sdk8\lib + $(ProfileDir)..\..\libs\win$(PlatformArchitecture);.\src\PGPw\sdk8\lib ws2_32.lib;$(SolutionDir)$(Configuration)64\Obj\cryptlib\cryptlib.lib;%(AdditionalDependencies) $(IntDir)$(TargetName).lib Windows @@ -145,7 +145,7 @@ 0x46000000 false - $(ProfileDir)..\..\bin10\lib;.\src\PGPw\sdk8\lib + $(ProfileDir)..\..\libs\win$(PlatformArchitecture);.\src\PGPw\sdk8\lib ws2_32.lib;$(SolutionDir)$(Configuration)\Obj\cryptlib\cryptlib.lib;%(AdditionalDependencies) true true @@ -175,7 +175,7 @@ 0x46000000 false - $(ProfileDir)..\..\bin10\lib;.\src\PGPw\sdk8\lib + $(ProfileDir)..\..\libs\win$(PlatformArchitecture);.\src\PGPw\sdk8\lib ws2_32.lib;$(SolutionDir)$(Configuration)64\Obj\cryptlib\cryptlib.lib;%(AdditionalDependencies) true true diff --git a/plugins/CryptoPP/cryptopp_12.vcxproj b/plugins/CryptoPP/cryptopp_12.vcxproj index 257c79c973..7591ca0fd1 100644 --- a/plugins/CryptoPP/cryptopp_12.vcxproj +++ b/plugins/CryptoPP/cryptopp_12.vcxproj @@ -93,7 +93,7 @@ true 0x46000000 false - $(ProfileDir)..\..\bin12\lib;.\src\PGPw\sdk8\lib + $(ProfileDir)..\..\libs\win$(PlatformArchitecture);.\src\PGPw\sdk8\lib ws2_32.lib;$(SolutionDir)$(Configuration)\Obj\cryptlib\cryptlib.lib;%(AdditionalDependencies) $(IntDir)$(TargetName).lib Windows @@ -118,7 +118,7 @@ true 0x46000000 false - $(ProfileDir)..\..\bin12\lib;.\src\PGPw\sdk8\lib + $(ProfileDir)..\..\libs\win$(PlatformArchitecture);.\src\PGPw\sdk8\lib ws2_32.lib;$(SolutionDir)$(Configuration)64\Obj\cryptlib\cryptlib.lib;%(AdditionalDependencies) $(IntDir)$(TargetName).lib Windows @@ -143,7 +143,7 @@ 0x46000000 false - $(ProfileDir)..\..\bin12\lib;.\src\PGPw\sdk8\lib + $(ProfileDir)..\..\libs\win$(PlatformArchitecture);.\src\PGPw\sdk8\lib ws2_32.lib;$(SolutionDir)$(Configuration)\Obj\cryptlib\cryptlib.lib;%(AdditionalDependencies) true true @@ -171,7 +171,7 @@ 0x46000000 false - $(ProfileDir)..\..\bin12\lib;.\src\PGPw\sdk8\lib + $(ProfileDir)..\..\libs\win$(PlatformArchitecture);.\src\PGPw\sdk8\lib ws2_32.lib;$(SolutionDir)$(Configuration)64\Obj\cryptlib\cryptlib.lib;%(AdditionalDependencies) true true diff --git a/plugins/CryptoPP/cryptopp_14.vcxproj b/plugins/CryptoPP/cryptopp_14.vcxproj index 20cf0206fa..6fd61e64b6 100644 --- a/plugins/CryptoPP/cryptopp_14.vcxproj +++ b/plugins/CryptoPP/cryptopp_14.vcxproj @@ -93,7 +93,7 @@ true 0x46000000 false - $(ProfileDir)..\..\bin14\lib;.\src\PGPw\sdk8\lib + $(ProfileDir)..\..\libs\win$(PlatformArchitecture);.\src\PGPw\sdk8\lib ws2_32.lib;$(SolutionDir)$(Configuration)\Obj\cryptlib\cryptlib.lib;%(AdditionalDependencies) $(IntDir)$(TargetName).lib Windows @@ -118,7 +118,7 @@ true 0x46000000 false - $(ProfileDir)..\..\bin14\lib;.\src\PGPw\sdk8\lib + $(ProfileDir)..\..\libs\win$(PlatformArchitecture);.\src\PGPw\sdk8\lib ws2_32.lib;$(SolutionDir)$(Configuration)64\Obj\cryptlib\cryptlib.lib;%(AdditionalDependencies) $(IntDir)$(TargetName).lib Windows @@ -143,7 +143,7 @@ 0x46000000 false - $(ProfileDir)..\..\bin14\lib;.\src\PGPw\sdk8\lib + $(ProfileDir)..\..\libs\win$(PlatformArchitecture);.\src\PGPw\sdk8\lib ws2_32.lib;$(SolutionDir)$(Configuration)\Obj\cryptlib\cryptlib.lib;%(AdditionalDependencies) true true @@ -171,7 +171,7 @@ 0x46000000 false - $(ProfileDir)..\..\bin14\lib;.\src\PGPw\sdk8\lib + $(ProfileDir)..\..\libs\win$(PlatformArchitecture);.\src\PGPw\sdk8\lib ws2_32.lib;$(SolutionDir)$(Configuration)64\Obj\cryptlib\cryptlib.lib;%(AdditionalDependencies) true true diff --git a/plugins/Dbx_kv/Dbx_kv_10.vcxproj b/plugins/Dbx_kv/Dbx_kv_10.vcxproj index 9d9d282f85..d74f593b59 100644 --- a/plugins/Dbx_kv/Dbx_kv_10.vcxproj +++ b/plugins/Dbx_kv/Dbx_kv_10.vcxproj @@ -92,7 +92,7 @@ true $(IntDir)$(TargetName).lib - $(ProfileDir)..\..\bin12\lib;..\..\..\boost\stage\lib + $(ProfileDir)..\..\libs\win$(PlatformArchitecture);..\..\..\boost\stage\lib false Ws2_32.lib;kernel32.lib;user32.lib;gdi32.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies) Windows @@ -120,7 +120,7 @@ true $(IntDir)$(TargetName).lib - $(ProfileDir)..\..\bin12\lib;..\..\..\boost\stage64\lib + $(ProfileDir)..\..\libs\win$(PlatformArchitecture);..\..\..\boost\stage64\lib Ws2_32.lib;kernel32.lib;user32.lib;gdi32.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies) Windows @@ -150,7 +150,7 @@ true true $(IntDir)$(TargetName).lib - $(ProfileDir)..\..\bin12\lib;..\..\..\boost\stage\lib + $(ProfileDir)..\..\libs\win$(PlatformArchitecture);..\..\..\boost\stage\lib Ws2_32.lib;kernel32.lib;user32.lib;gdi32.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies) Windows @@ -180,7 +180,7 @@ true true $(IntDir)$(TargetName).lib - $(ProfileDir)..\..\bin12\lib;..\..\..\boost\stage64\lib + $(ProfileDir)..\..\libs\win$(PlatformArchitecture);..\..\..\boost\stage64\lib Ws2_32.lib;kernel32.lib;user32.lib;gdi32.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies) Windows diff --git a/plugins/Dbx_kv/Dbx_kv_12.vcxproj b/plugins/Dbx_kv/Dbx_kv_12.vcxproj index 613ee01e9a..0661bd7c9c 100644 --- a/plugins/Dbx_kv/Dbx_kv_12.vcxproj +++ b/plugins/Dbx_kv/Dbx_kv_12.vcxproj @@ -96,7 +96,7 @@ true $(IntDir)$(TargetName).lib - $(ProfileDir)..\..\bin12\lib;..\..\..\boost\stage\lib + $(ProfileDir)..\..\libs\win$(PlatformArchitecture);..\..\..\boost\stage\lib false Ws2_32.lib;kernel32.lib;user32.lib;gdi32.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies) Windows @@ -125,7 +125,7 @@ true $(IntDir)$(TargetName).lib - $(ProfileDir)..\..\bin12\lib;..\..\..\boost\stage64\lib + $(ProfileDir)..\..\libs\win$(PlatformArchitecture);..\..\..\boost\stage64\lib Ws2_32.lib;kernel32.lib;user32.lib;gdi32.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies) Windows @@ -156,7 +156,7 @@ true true $(IntDir)$(TargetName).lib - $(ProfileDir)..\..\bin12\lib;..\..\..\boost\stage\lib + $(ProfileDir)..\..\libs\win$(PlatformArchitecture);..\..\..\boost\stage\lib Ws2_32.lib;kernel32.lib;user32.lib;gdi32.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies) Windows @@ -187,7 +187,7 @@ true true $(IntDir)$(TargetName).lib - $(ProfileDir)..\..\bin12\lib;..\..\..\boost\stage64\lib + $(ProfileDir)..\..\libs\win$(PlatformArchitecture);..\..\..\boost\stage64\lib Ws2_32.lib;kernel32.lib;user32.lib;gdi32.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies) Windows diff --git a/plugins/Dbx_kv/Dbx_kv_14.vcxproj b/plugins/Dbx_kv/Dbx_kv_14.vcxproj index 1184d51066..1732e40215 100644 --- a/plugins/Dbx_kv/Dbx_kv_14.vcxproj +++ b/plugins/Dbx_kv/Dbx_kv_14.vcxproj @@ -96,7 +96,7 @@ true $(IntDir)$(TargetName).lib - $(ProfileDir)..\..\bin14\lib;..\..\..\boost\stage\lib + $(ProfileDir)..\..\libs\win$(PlatformArchitecture);..\..\..\boost\stage\lib false Ws2_32.lib;kernel32.lib;user32.lib;gdi32.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies) Windows @@ -125,7 +125,7 @@ true $(IntDir)$(TargetName).lib - $(ProfileDir)..\..\bin14\lib;..\..\..\boost\stage64\lib + $(ProfileDir)..\..\libs\win$(PlatformArchitecture);..\..\..\boost\stage64\lib Ws2_32.lib;kernel32.lib;user32.lib;gdi32.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies) Windows @@ -156,7 +156,7 @@ true true $(IntDir)$(TargetName).lib - $(ProfileDir)..\..\bin14\lib;..\..\..\boost\stage\lib + $(ProfileDir)..\..\libs\win$(PlatformArchitecture);..\..\..\boost\stage\lib Ws2_32.lib;kernel32.lib;user32.lib;gdi32.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies) Windows @@ -187,7 +187,7 @@ true true $(IntDir)$(TargetName).lib - $(ProfileDir)..\..\bin14\lib;..\..\..\boost\stage64\lib + $(ProfileDir)..\..\libs\win$(PlatformArchitecture);..\..\..\boost\stage64\lib Ws2_32.lib;kernel32.lib;user32.lib;gdi32.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies) Windows diff --git a/plugins/Dbx_kyoto/Dbx_kyoto_10.vcxproj b/plugins/Dbx_kyoto/Dbx_kyoto_10.vcxproj index aa610d6fad..52e15e6072 100644 --- a/plugins/Dbx_kyoto/Dbx_kyoto_10.vcxproj +++ b/plugins/Dbx_kyoto/Dbx_kyoto_10.vcxproj @@ -92,7 +92,7 @@ true $(IntDir)$(TargetName).lib - $(ProfileDir)..\..\bin12\lib + $(ProfileDir)..\..\libs\win$(PlatformArchitecture) false Ws2_32.lib;kernel32.lib;user32.lib;gdi32.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies) Windows @@ -120,7 +120,7 @@ true $(IntDir)$(TargetName).lib - $(ProfileDir)..\..\bin12\lib + $(ProfileDir)..\..\libs\win$(PlatformArchitecture) Ws2_32.lib;kernel32.lib;user32.lib;gdi32.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies) Windows @@ -150,7 +150,7 @@ true true $(IntDir)$(TargetName).lib - $(ProfileDir)..\..\bin12\lib + $(ProfileDir)..\..\libs\win$(PlatformArchitecture) Ws2_32.lib;kernel32.lib;user32.lib;gdi32.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies) Windows @@ -180,7 +180,7 @@ true true $(IntDir)$(TargetName).lib - $(ProfileDir)..\..\bin12\lib + $(ProfileDir)..\..\libs\win$(PlatformArchitecture) Ws2_32.lib;kernel32.lib;user32.lib;gdi32.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies) Windows diff --git a/plugins/Dbx_kyoto/Dbx_kyoto_12.vcxproj b/plugins/Dbx_kyoto/Dbx_kyoto_12.vcxproj index 1b6fa6870e..66117525e1 100644 --- a/plugins/Dbx_kyoto/Dbx_kyoto_12.vcxproj +++ b/plugins/Dbx_kyoto/Dbx_kyoto_12.vcxproj @@ -96,7 +96,7 @@ true $(IntDir)$(TargetName).lib - $(ProfileDir)..\..\bin12\lib;..\..\..\boost\stage\lib + $(ProfileDir)..\..\libs\win$(PlatformArchitecture);..\..\..\boost\stage\lib false Ws2_32.lib;kernel32.lib;user32.lib;gdi32.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies) Windows @@ -125,7 +125,7 @@ true $(IntDir)$(TargetName).lib - $(ProfileDir)..\..\bin12\lib;..\..\..\boost\stage64\lib + $(ProfileDir)..\..\libs\win$(PlatformArchitecture);..\..\..\boost\stage64\lib Ws2_32.lib;kernel32.lib;user32.lib;gdi32.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies) Windows @@ -156,7 +156,7 @@ true true $(IntDir)$(TargetName).lib - $(ProfileDir)..\..\bin12\lib;..\..\..\boost\stage\lib + $(ProfileDir)..\..\libs\win$(PlatformArchitecture);..\..\..\boost\stage\lib Ws2_32.lib;kernel32.lib;user32.lib;gdi32.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies) Windows @@ -187,7 +187,7 @@ true true $(IntDir)$(TargetName).lib - $(ProfileDir)..\..\bin12\lib;..\..\..\boost\stage64\lib + $(ProfileDir)..\..\libs\win$(PlatformArchitecture);..\..\..\boost\stage64\lib Ws2_32.lib;kernel32.lib;user32.lib;gdi32.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies) Windows diff --git a/plugins/Dbx_kyoto/Dbx_kyoto_14.vcxproj b/plugins/Dbx_kyoto/Dbx_kyoto_14.vcxproj index 9b301c2643..d4529335ef 100644 --- a/plugins/Dbx_kyoto/Dbx_kyoto_14.vcxproj +++ b/plugins/Dbx_kyoto/Dbx_kyoto_14.vcxproj @@ -96,7 +96,7 @@ true $(IntDir)$(TargetName).lib - $(ProfileDir)..\..\bin14\lib;..\..\..\boost\stage\lib + $(ProfileDir)..\..\libs\win$(PlatformArchitecture);..\..\..\boost\stage\lib false Ws2_32.lib;kernel32.lib;user32.lib;gdi32.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies) Windows @@ -125,7 +125,7 @@ true $(IntDir)$(TargetName).lib - $(ProfileDir)..\..\bin14\lib;..\..\..\boost\stage64\lib + $(ProfileDir)..\..\libs\win$(PlatformArchitecture);..\..\..\boost\stage64\lib Ws2_32.lib;kernel32.lib;user32.lib;gdi32.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies) Windows @@ -156,7 +156,7 @@ true true $(IntDir)$(TargetName).lib - $(ProfileDir)..\..\bin14\lib;..\..\..\boost\stage\lib + $(ProfileDir)..\..\libs\win$(PlatformArchitecture);..\..\..\boost\stage\lib Ws2_32.lib;kernel32.lib;user32.lib;gdi32.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies) Windows @@ -187,7 +187,7 @@ true true $(IntDir)$(TargetName).lib - $(ProfileDir)..\..\bin14\lib;..\..\..\boost\stage64\lib + $(ProfileDir)..\..\libs\win$(PlatformArchitecture);..\..\..\boost\stage64\lib Ws2_32.lib;kernel32.lib;user32.lib;gdi32.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies) Windows diff --git a/plugins/FileAsMessage/fileecho_10.vcxproj b/plugins/FileAsMessage/fileecho_10.vcxproj index b11ebef3e6..b225f6cfc3 100644 --- a/plugins/FileAsMessage/fileecho_10.vcxproj +++ b/plugins/FileAsMessage/fileecho_10.vcxproj @@ -91,7 +91,7 @@ true Windows false - $(ProfileDir)..\..\bin10\lib + $(ProfileDir)..\..\libs\win$(PlatformArchitecture) /PDBALTPATH:%_PDB% @@ -121,7 +121,7 @@ true Windows false - $(ProfileDir)..\..\bin10\lib + $(ProfileDir)..\..\libs\win$(PlatformArchitecture) /PDBALTPATH:%_PDB% @@ -148,7 +148,7 @@ $(IntDir)$(TargetName).lib Windows false - $(ProfileDir)..\..\bin10\lib + $(ProfileDir)..\..\libs\win$(PlatformArchitecture) _DEBUG;%(PreprocessorDefinitions) @@ -173,7 +173,7 @@ $(IntDir)$(TargetName).lib Windows false - $(ProfileDir)..\..\bin10\lib + $(ProfileDir)..\..\libs\win$(PlatformArchitecture) _DEBUG;%(PreprocessorDefinitions) diff --git a/plugins/FileAsMessage/fileecho_12.vcxproj b/plugins/FileAsMessage/fileecho_12.vcxproj index c078c6ec5c..a1202ca819 100644 --- a/plugins/FileAsMessage/fileecho_12.vcxproj +++ b/plugins/FileAsMessage/fileecho_12.vcxproj @@ -95,7 +95,7 @@ true Windows false - $(ProfileDir)..\..\bin12\lib + $(ProfileDir)..\..\libs\win$(PlatformArchitecture) NDEBUG;%(PreprocessorDefinitions) @@ -124,7 +124,7 @@ true Windows false - $(ProfileDir)..\..\bin12\lib + $(ProfileDir)..\..\libs\win$(PlatformArchitecture) NDEBUG;%(PreprocessorDefinitions) @@ -150,7 +150,7 @@ $(IntDir)$(TargetName).lib Windows false - $(ProfileDir)..\..\bin12\lib + $(ProfileDir)..\..\libs\win$(PlatformArchitecture) false @@ -176,7 +176,7 @@ $(IntDir)$(TargetName).lib Windows false - $(ProfileDir)..\..\bin12\lib + $(ProfileDir)..\..\libs\win$(PlatformArchitecture) _DEBUG;%(PreprocessorDefinitions) diff --git a/plugins/FileAsMessage/fileecho_14.vcxproj b/plugins/FileAsMessage/fileecho_14.vcxproj index fe0e87cac7..e997ccd4b9 100644 --- a/plugins/FileAsMessage/fileecho_14.vcxproj +++ b/plugins/FileAsMessage/fileecho_14.vcxproj @@ -95,7 +95,7 @@ true Windows false - $(ProfileDir)..\..\bin14\lib + $(ProfileDir)..\..\libs\win$(PlatformArchitecture) NDEBUG;%(PreprocessorDefinitions) @@ -124,7 +124,7 @@ true Windows false - $(ProfileDir)..\..\bin14\lib + $(ProfileDir)..\..\libs\win$(PlatformArchitecture) NDEBUG;%(PreprocessorDefinitions) @@ -150,7 +150,7 @@ $(IntDir)$(TargetName).lib Windows false - $(ProfileDir)..\..\bin14\lib + $(ProfileDir)..\..\libs\win$(PlatformArchitecture) false @@ -176,7 +176,7 @@ $(IntDir)$(TargetName).lib Windows false - $(ProfileDir)..\..\bin14\lib + $(ProfileDir)..\..\libs\win$(PlatformArchitecture) _DEBUG;%(PreprocessorDefinitions) diff --git a/plugins/HTTPServer/HTTPServer_10.vcxproj b/plugins/HTTPServer/HTTPServer_10.vcxproj index 222a04b0a1..3d6ee3134f 100644 --- a/plugins/HTTPServer/HTTPServer_10.vcxproj +++ b/plugins/HTTPServer/HTTPServer_10.vcxproj @@ -89,7 +89,7 @@ ..\..\include\msapi - $(ProfileDir)..\..\bin10\lib + $(ProfileDir)..\..\libs\win$(PlatformArchitecture) true 0x22500000 $(IntDir)$(TargetName).lib @@ -113,7 +113,7 @@ ..\..\include\msapi - $(ProfileDir)..\..\bin10\lib + $(ProfileDir)..\..\libs\win$(PlatformArchitecture) true 0x22500000 $(IntDir)$(TargetName).lib @@ -144,7 +144,7 @@ comctl32.lib;Ws2_32.lib;%(AdditionalDependencies) Windows $(IntDir)$(TargetName).lib - $(ProfileDir)..\..\bin10\lib + $(ProfileDir)..\..\libs\win$(PlatformArchitecture) true true true @@ -174,7 +174,7 @@ comctl32.lib;Ws2_32.lib;%(AdditionalDependencies) Windows $(IntDir)$(TargetName).lib - $(ProfileDir)..\..\bin10\lib + $(ProfileDir)..\..\libs\win$(PlatformArchitecture) true true true diff --git a/plugins/HTTPServer/HTTPServer_12.vcxproj b/plugins/HTTPServer/HTTPServer_12.vcxproj index 6b65dc8653..04d9762ea2 100644 --- a/plugins/HTTPServer/HTTPServer_12.vcxproj +++ b/plugins/HTTPServer/HTTPServer_12.vcxproj @@ -93,7 +93,7 @@ ..\..\include\msapi - $(ProfileDir)..\..\bin12\lib + $(ProfileDir)..\..\libs\win$(PlatformArchitecture) true 0x22500000 $(IntDir)$(TargetName).lib @@ -118,7 +118,7 @@ ..\..\include\msapi - $(ProfileDir)..\..\bin12\lib + $(ProfileDir)..\..\libs\win$(PlatformArchitecture) true 0x22500000 $(IntDir)$(TargetName).lib @@ -149,7 +149,7 @@ comctl32.lib;Ws2_32.lib;%(AdditionalDependencies) Windows $(IntDir)$(TargetName).lib - $(ProfileDir)..\..\bin12\lib + $(ProfileDir)..\..\libs\win$(PlatformArchitecture) true true true @@ -179,7 +179,7 @@ comctl32.lib;Ws2_32.lib;%(AdditionalDependencies) Windows $(IntDir)$(TargetName).lib - $(ProfileDir)..\..\bin12\lib + $(ProfileDir)..\..\libs\win$(PlatformArchitecture) true true true diff --git a/plugins/HTTPServer/HTTPServer_14.vcxproj b/plugins/HTTPServer/HTTPServer_14.vcxproj index 02e2bc0db0..a211fe4461 100644 --- a/plugins/HTTPServer/HTTPServer_14.vcxproj +++ b/plugins/HTTPServer/HTTPServer_14.vcxproj @@ -93,7 +93,7 @@ ..\..\include\msapi - $(ProfileDir)..\..\bin14\lib + $(ProfileDir)..\..\libs\win$(PlatformArchitecture) true 0x22500000 $(IntDir)$(TargetName).lib @@ -118,7 +118,7 @@ ..\..\include\msapi - $(ProfileDir)..\..\bin14\lib + $(ProfileDir)..\..\libs\win$(PlatformArchitecture) true 0x22500000 $(IntDir)$(TargetName).lib @@ -149,7 +149,7 @@ comctl32.lib;Ws2_32.lib;%(AdditionalDependencies) Windows $(IntDir)$(TargetName).lib - $(ProfileDir)..\..\bin14\lib + $(ProfileDir)..\..\libs\win$(PlatformArchitecture) true true true @@ -179,7 +179,7 @@ comctl32.lib;Ws2_32.lib;%(AdditionalDependencies) Windows $(IntDir)$(TargetName).lib - $(ProfileDir)..\..\bin14\lib + $(ProfileDir)..\..\libs\win$(PlatformArchitecture) true true true diff --git a/plugins/MirFox/MirFoxNG_10.vcxproj b/plugins/MirFox/MirFoxNG_10.vcxproj index ebc2422cf5..90d2699efd 100644 --- a/plugins/MirFox/MirFoxNG_10.vcxproj +++ b/plugins/MirFox/MirFoxNG_10.vcxproj @@ -94,7 +94,7 @@ true - $(ProfileDir)..\..\bin10\lib + $(ProfileDir)..\..\libs\win$(PlatformArchitecture) %(AdditionalDependencies) Windows $(IntDir)$(TargetName).lib @@ -116,8 +116,8 @@ true - $(ProfileDir)..\..\bin10\lib - mir_core64.lib;%(AdditionalDependencies) + $(ProfileDir)..\..\libs\win$(PlatformArchitecture) + mir_core.lib;%(AdditionalDependencies) Windows $(IntDir)$(TargetName).lib @@ -144,7 +144,7 @@ true true true - $(ProfileDir)..\..\bin10\lib + $(ProfileDir)..\..\libs\win$(PlatformArchitecture) %(AdditionalDependencies) Windows $(IntDir)$(TargetName).lib @@ -173,10 +173,10 @@ true true true - mir_core64.lib;%(AdditionalDependencies) + mir_core.lib;%(AdditionalDependencies) Windows $(IntDir)$(TargetName).lib - $(ProfileDir)..\..\bin10\lib + $(ProfileDir)..\..\libs\win$(PlatformArchitecture) /PDBALTPATH:%_PDB% %(AdditionalOptions) diff --git a/plugins/MirFox/MirFoxNG_12.vcxproj b/plugins/MirFox/MirFoxNG_12.vcxproj index 97f9ccf0f7..cc64322792 100644 --- a/plugins/MirFox/MirFoxNG_12.vcxproj +++ b/plugins/MirFox/MirFoxNG_12.vcxproj @@ -98,7 +98,7 @@ true - $(ProfileDir)..\..\bin12\lib + $(ProfileDir)..\..\libs\win$(PlatformArchitecture) %(AdditionalDependencies) Windows $(IntDir)$(TargetName).lib @@ -121,8 +121,8 @@ true - $(ProfileDir)..\..\bin12\lib - mir_core64.lib;%(AdditionalDependencies) + $(ProfileDir)..\..\libs\win$(PlatformArchitecture) + mir_core.lib;%(AdditionalDependencies) Windows $(IntDir)$(TargetName).lib @@ -149,7 +149,7 @@ true true true - $(ProfileDir)..\..\bin12\lib + $(ProfileDir)..\..\libs\win$(PlatformArchitecture) %(AdditionalDependencies) Windows $(IntDir)$(TargetName).lib @@ -177,10 +177,10 @@ true true true - mir_core64.lib;%(AdditionalDependencies) + mir_core.lib;%(AdditionalDependencies) Windows $(IntDir)$(TargetName).lib - $(ProfileDir)..\..\bin12\lib + $(ProfileDir)..\..\libs\win$(PlatformArchitecture) ..\..\include\msapi diff --git a/plugins/MirFox/MirFoxNG_14.vcxproj b/plugins/MirFox/MirFoxNG_14.vcxproj index 56e492c422..c20d76b97a 100644 --- a/plugins/MirFox/MirFoxNG_14.vcxproj +++ b/plugins/MirFox/MirFoxNG_14.vcxproj @@ -98,7 +98,7 @@ true - $(ProfileDir)..\..\bin14\lib + $(ProfileDir)..\..\libs\win$(PlatformArchitecture) %(AdditionalDependencies) Windows $(IntDir)$(TargetName).lib @@ -121,8 +121,8 @@ true - $(ProfileDir)..\..\bin14\lib - mir_core64.lib;%(AdditionalDependencies) + $(ProfileDir)..\..\libs\win$(PlatformArchitecture) + mir_core.lib;%(AdditionalDependencies) Windows $(IntDir)$(TargetName).lib @@ -149,7 +149,7 @@ true true true - $(ProfileDir)..\..\bin14\lib + $(ProfileDir)..\..\libs\win$(PlatformArchitecture) %(AdditionalDependencies) Windows $(IntDir)$(TargetName).lib @@ -177,10 +177,10 @@ true true true - mir_core64.lib;%(AdditionalDependencies) + mir_core.lib;%(AdditionalDependencies) Windows $(IntDir)$(TargetName).lib - $(ProfileDir)..\..\bin14\lib + $(ProfileDir)..\..\libs\win$(PlatformArchitecture) ..\..\include\msapi diff --git a/plugins/MirLua/Modules/module.props b/plugins/MirLua/Modules/module.props index ed148c0039..9bf103edbf 100644 --- a/plugins/MirLua/Modules/module.props +++ b/plugins/MirLua/Modules/module.props @@ -13,9 +13,7 @@ - $(ProjectDir)..\..\..\..\bin10\lib;%(AdditionalLibraryDirectories) - $(ProjectDir)..\..\..\..\bin12\lib;%(AdditionalLibraryDirectories) - $(ProjectDir)..\..\..\..\bin14\lib;%(AdditionalLibraryDirectories) + $(ProfileDir)..\..\..\..\libs\win$(PlatformArchitecture) LUA_BUILD_AS_DLL;LUA_LIB;%(PreprocessorDefinitions) diff --git a/plugins/MirOTR/MirOTR_10.vcxproj b/plugins/MirOTR/MirOTR_10.vcxproj index 7be65c4731..1bf1708d16 100644 --- a/plugins/MirOTR/MirOTR_10.vcxproj +++ b/plugins/MirOTR/MirOTR_10.vcxproj @@ -87,7 +87,7 @@ Windows false $(IntDir)$(TargetName).lib - $(ProfileDir)..\..\bin10\lib + $(ProfileDir)..\..\libs\win$(PlatformArchitecture) _DEBUG;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) @@ -111,7 +111,7 @@ Windows $(IntDir)$(TargetName).lib false - $(ProfileDir)..\..\bin10\lib + $(ProfileDir)..\..\libs\win$(PlatformArchitecture) _DEBUG;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) @@ -140,7 +140,7 @@ true false $(IntDir)$(TargetName).lib - $(ProfileDir)..\..\bin10\lib + $(ProfileDir)..\..\libs\win$(PlatformArchitecture) /PDBALTPATH:%_PDB% @@ -170,7 +170,7 @@ true $(IntDir)$(TargetName).lib false - $(ProfileDir)..\..\bin10\lib + $(ProfileDir)..\..\libs\win$(PlatformArchitecture) /PDBALTPATH:%_PDB% diff --git a/plugins/MirOTR/MirOTR_12.vcxproj b/plugins/MirOTR/MirOTR_12.vcxproj index e54b7ba5d5..ff0526fbba 100644 --- a/plugins/MirOTR/MirOTR_12.vcxproj +++ b/plugins/MirOTR/MirOTR_12.vcxproj @@ -91,7 +91,7 @@ Windows false $(IntDir)$(TargetName).lib - $(ProfileDir)..\..\bin12\lib + $(ProfileDir)..\..\libs\win$(PlatformArchitecture) false @@ -116,7 +116,7 @@ Windows $(IntDir)$(TargetName).lib false - $(ProfileDir)..\..\bin12\lib + $(ProfileDir)..\..\libs\win$(PlatformArchitecture) _DEBUG;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) @@ -145,7 +145,7 @@ true false $(IntDir)$(TargetName).lib - $(ProfileDir)..\..\bin12\lib + $(ProfileDir)..\..\libs\win$(PlatformArchitecture) NDEBUG;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) @@ -174,7 +174,7 @@ true $(IntDir)$(TargetName).lib false - $(ProfileDir)..\..\bin12\lib + $(ProfileDir)..\..\libs\win$(PlatformArchitecture) NDEBUG;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) diff --git a/plugins/MirOTR/MirOTR_14.vcxproj b/plugins/MirOTR/MirOTR_14.vcxproj index 5c8840c385..75934fbd47 100644 --- a/plugins/MirOTR/MirOTR_14.vcxproj +++ b/plugins/MirOTR/MirOTR_14.vcxproj @@ -91,7 +91,7 @@ Windows false $(IntDir)$(TargetName).lib - $(ProfileDir)..\..\bin14\lib + $(ProfileDir)..\..\libs\win$(PlatformArchitecture) false @@ -116,7 +116,7 @@ Windows $(IntDir)$(TargetName).lib false - $(ProfileDir)..\..\bin14\lib + $(ProfileDir)..\..\libs\win$(PlatformArchitecture) _DEBUG;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) @@ -145,7 +145,7 @@ true false $(IntDir)$(TargetName).lib - $(ProfileDir)..\..\bin14\lib + $(ProfileDir)..\..\libs\win$(PlatformArchitecture) NDEBUG;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) @@ -174,7 +174,7 @@ true $(IntDir)$(TargetName).lib false - $(ProfileDir)..\..\bin14\lib + $(ProfileDir)..\..\libs\win$(PlatformArchitecture) NDEBUG;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) diff --git a/plugins/NotesAndReminders/NotesReminders_10.vcxproj b/plugins/NotesAndReminders/NotesReminders_10.vcxproj index 3dc010d8a0..a11188ea0b 100644 --- a/plugins/NotesAndReminders/NotesReminders_10.vcxproj +++ b/plugins/NotesAndReminders/NotesReminders_10.vcxproj @@ -97,7 +97,7 @@ false $(IntDir)$(TargetName).lib Windows - $(ProfileDir)..\..\bin10\lib + $(ProfileDir)..\..\libs\win$(PlatformArchitecture) @@ -124,7 +124,7 @@ false $(IntDir)$(TargetName).lib Windows - $(ProfileDir)..\..\bin10\lib + $(ProfileDir)..\..\libs\win$(PlatformArchitecture) @@ -153,7 +153,7 @@ $(IntDir)$(TargetName).lib true Windows - $(ProfileDir)..\..\bin10\lib + $(ProfileDir)..\..\libs\win$(PlatformArchitecture) true /PDBALTPATH:%_PDB% %(AdditionalOptions) @@ -184,7 +184,7 @@ $(IntDir)$(TargetName).lib true Windows - $(ProfileDir)..\..\bin10\lib + $(ProfileDir)..\..\libs\win$(PlatformArchitecture) true /PDBALTPATH:%_PDB% %(AdditionalOptions) diff --git a/plugins/NotesAndReminders/NotesReminders_12.vcxproj b/plugins/NotesAndReminders/NotesReminders_12.vcxproj index 6b0d26a20a..8a1a0d4849 100644 --- a/plugins/NotesAndReminders/NotesReminders_12.vcxproj +++ b/plugins/NotesAndReminders/NotesReminders_12.vcxproj @@ -101,7 +101,7 @@ false $(IntDir)$(TargetName).lib Windows - $(ProfileDir)..\..\bin12\lib + $(ProfileDir)..\..\libs\win$(PlatformArchitecture) false @@ -129,7 +129,7 @@ false $(IntDir)$(TargetName).lib Windows - $(ProfileDir)..\..\bin12\lib + $(ProfileDir)..\..\libs\win$(PlatformArchitecture) @@ -158,7 +158,7 @@ $(IntDir)$(TargetName).lib true Windows - $(ProfileDir)..\..\bin12\lib + $(ProfileDir)..\..\libs\win$(PlatformArchitecture) true /PDBALTPATH:%_PDB% %(AdditionalOptions) @@ -189,7 +189,7 @@ $(IntDir)$(TargetName).lib true Windows - $(ProfileDir)..\..\bin12\lib + $(ProfileDir)..\..\libs\win$(PlatformArchitecture) true /PDBALTPATH:%_PDB% %(AdditionalOptions) diff --git a/plugins/NotesAndReminders/NotesReminders_14.vcxproj b/plugins/NotesAndReminders/NotesReminders_14.vcxproj index 53e2671707..c31f01ef66 100644 --- a/plugins/NotesAndReminders/NotesReminders_14.vcxproj +++ b/plugins/NotesAndReminders/NotesReminders_14.vcxproj @@ -101,7 +101,7 @@ false $(IntDir)$(TargetName).lib Windows - $(ProfileDir)..\..\bin14\lib + $(ProfileDir)..\..\libs\win$(PlatformArchitecture) false @@ -129,7 +129,7 @@ false $(IntDir)$(TargetName).lib Windows - $(ProfileDir)..\..\bin14\lib + $(ProfileDir)..\..\libs\win$(PlatformArchitecture) @@ -158,7 +158,7 @@ $(IntDir)$(TargetName).lib true Windows - $(ProfileDir)..\..\bin14\lib + $(ProfileDir)..\..\libs\win$(PlatformArchitecture) true /PDBALTPATH:%_PDB% %(AdditionalOptions) @@ -189,7 +189,7 @@ $(IntDir)$(TargetName).lib true Windows - $(ProfileDir)..\..\bin14\lib + $(ProfileDir)..\..\libs\win$(PlatformArchitecture) true /PDBALTPATH:%_PDB% %(AdditionalOptions) diff --git a/plugins/SecureIM/secureim_10.vcxproj b/plugins/SecureIM/secureim_10.vcxproj index 12bf242797..3c9c08adc3 100644 --- a/plugins/SecureIM/secureim_10.vcxproj +++ b/plugins/SecureIM/secureim_10.vcxproj @@ -92,7 +92,7 @@ 0x45000000 false $(IntDir)$(TargetName).lib - $(ProfileDir)..\..\bin10\lib + $(ProfileDir)..\..\libs\win$(PlatformArchitecture) @@ -117,7 +117,7 @@ 0x45000000 false $(IntDir)$(TargetName).lib - $(ProfileDir)..\..\bin10\lib + $(ProfileDir)..\..\libs\win$(PlatformArchitecture) @@ -147,7 +147,7 @@ true true true - $(ProfileDir)..\..\bin10\lib + $(ProfileDir)..\..\libs\win$(PlatformArchitecture) /PDBALTPATH:%_PDB% @@ -178,7 +178,7 @@ true true true - $(ProfileDir)..\..\bin10\lib + $(ProfileDir)..\..\libs\win$(PlatformArchitecture) /PDBALTPATH:%_PDB% diff --git a/plugins/SecureIM/secureim_12.vcxproj b/plugins/SecureIM/secureim_12.vcxproj index f1a8922d1f..65fdea78b6 100644 --- a/plugins/SecureIM/secureim_12.vcxproj +++ b/plugins/SecureIM/secureim_12.vcxproj @@ -96,7 +96,7 @@ 0x45000000 false $(IntDir)$(TargetName).lib - $(ProfileDir)..\..\bin12\lib + $(ProfileDir)..\..\libs\win$(PlatformArchitecture) false @@ -122,7 +122,7 @@ 0x45000000 false $(IntDir)$(TargetName).lib - $(ProfileDir)..\..\bin12\lib + $(ProfileDir)..\..\libs\win$(PlatformArchitecture) @@ -152,7 +152,7 @@ true true true - $(ProfileDir)..\..\bin12\lib + $(ProfileDir)..\..\libs\win$(PlatformArchitecture) @@ -182,7 +182,7 @@ true true true - $(ProfileDir)..\..\bin12\lib + $(ProfileDir)..\..\libs\win$(PlatformArchitecture) diff --git a/plugins/SecureIM/secureim_14.vcxproj b/plugins/SecureIM/secureim_14.vcxproj index 357769213c..a1bc356fb1 100644 --- a/plugins/SecureIM/secureim_14.vcxproj +++ b/plugins/SecureIM/secureim_14.vcxproj @@ -96,7 +96,7 @@ 0x45000000 false $(IntDir)$(TargetName).lib - $(ProfileDir)..\..\bin14\lib + $(ProfileDir)..\..\libs\win$(PlatformArchitecture) false @@ -122,7 +122,7 @@ 0x45000000 false $(IntDir)$(TargetName).lib - $(ProfileDir)..\..\bin14\lib + $(ProfileDir)..\..\libs\win$(PlatformArchitecture) @@ -152,7 +152,7 @@ true true true - $(ProfileDir)..\..\bin14\lib + $(ProfileDir)..\..\libs\win$(PlatformArchitecture) @@ -182,7 +182,7 @@ true true true - $(ProfileDir)..\..\bin14\lib + $(ProfileDir)..\..\libs\win$(PlatformArchitecture) diff --git a/plugins/WinterSpeak/WinterSpeak.vcxproj b/plugins/WinterSpeak/WinterSpeak.vcxproj index 2a074c346b..1ae26eb201 100644 --- a/plugins/WinterSpeak/WinterSpeak.vcxproj +++ b/plugins/WinterSpeak/WinterSpeak.vcxproj @@ -31,7 +31,7 @@ spchwrap.lib;%(AdditionalDependencies) - src\SAPI 4.0\Lib;$(CommonLibDir) + src\SAPI 4.0\Lib;%(AdditionalLibraryDirectories) \ No newline at end of file diff --git a/plugins/testplugin/testplug_10.vcxproj b/plugins/testplugin/testplug_10.vcxproj index 0e01726319..f682ebcfe6 100644 --- a/plugins/testplugin/testplug_10.vcxproj +++ b/plugins/testplugin/testplug_10.vcxproj @@ -96,7 +96,7 @@ true Windows $(IntDir)$(TargetName).lib - $(ProfileDir)..\..\bin10\lib + $(ProfileDir)..\..\libs\win$(PlatformArchitecture) true true true @@ -120,7 +120,7 @@ true Windows $(IntDir)$(TargetName).lib - $(ProfileDir)..\..\bin10\lib + $(ProfileDir)..\..\libs\win$(PlatformArchitecture) true true true @@ -147,7 +147,7 @@ true Windows $(IntDir)$(TargetName).lib - $(ProfileDir)..\..\bin10\lib + $(ProfileDir)..\..\libs\win$(PlatformArchitecture) false @@ -169,7 +169,7 @@ true Windows $(IntDir)$(TargetName).lib - $(ProfileDir)..\..\bin10\lib + $(ProfileDir)..\..\libs\win$(PlatformArchitecture) false diff --git a/plugins/testplugin/testplug_12.vcxproj b/plugins/testplugin/testplug_12.vcxproj index e4a280f09a..fe4a381394 100644 --- a/plugins/testplugin/testplug_12.vcxproj +++ b/plugins/testplugin/testplug_12.vcxproj @@ -98,7 +98,7 @@ true Windows $(IntDir)$(TargetName).lib - $(ProfileDir)..\..\bin12\lib + $(ProfileDir)..\..\libs\win$(PlatformArchitecture) true true true @@ -122,7 +122,7 @@ true Windows $(IntDir)$(TargetName).lib - $(ProfileDir)..\..\bin12\lib + $(ProfileDir)..\..\libs\win$(PlatformArchitecture) true true true @@ -149,7 +149,7 @@ true Windows $(IntDir)$(TargetName).lib - $(ProfileDir)..\..\bin12\lib + $(ProfileDir)..\..\libs\win$(PlatformArchitecture) false @@ -171,7 +171,7 @@ true Windows $(IntDir)$(TargetName).lib - $(ProfileDir)..\..\bin12\lib + $(ProfileDir)..\..\libs\win$(PlatformArchitecture) false diff --git a/plugins/testplugin/testplug_14.vcxproj b/plugins/testplugin/testplug_14.vcxproj index 7b4cd003e4..347fbb1ac4 100644 --- a/plugins/testplugin/testplug_14.vcxproj +++ b/plugins/testplugin/testplug_14.vcxproj @@ -96,7 +96,7 @@ true Windows $(IntDir)$(TargetName).lib - $(ProfileDir)..\..\bin14\lib + $(ProfileDir)..\..\libs\win$(PlatformArchitecture) true true true @@ -120,7 +120,7 @@ true Windows $(IntDir)$(TargetName).lib - $(ProfileDir)..\..\bin14\lib + $(ProfileDir)..\..\libs\win$(PlatformArchitecture) true true true @@ -147,7 +147,7 @@ true Windows $(IntDir)$(TargetName).lib - $(ProfileDir)..\..\bin14\lib + $(ProfileDir)..\..\libs\win$(PlatformArchitecture) false @@ -169,7 +169,7 @@ true Windows $(IntDir)$(TargetName).lib - $(ProfileDir)..\..\bin14\lib + $(ProfileDir)..\..\libs\win$(PlatformArchitecture) false diff --git a/protocols/EmLanProto/amdproto_10.vcxproj b/protocols/EmLanProto/amdproto_10.vcxproj index cf2ecbe3ca..4d256e9074 100644 --- a/protocols/EmLanProto/amdproto_10.vcxproj +++ b/protocols/EmLanProto/amdproto_10.vcxproj @@ -88,7 +88,7 @@ Windows 0x22000000 $(IntDir)$(TargetName).lib - $(ProfileDir)..\..\bin10\lib + $(ProfileDir)..\..\libs\win$(PlatformArchitecture) false @@ -113,7 +113,7 @@ Windows 0x22000000 $(IntDir)$(TargetName).lib - $(ProfileDir)..\..\bin10\lib + $(ProfileDir)..\..\libs\win$(PlatformArchitecture) false @@ -140,7 +140,7 @@ true 0x22000000 $(IntDir)$(TargetName).lib - $(ProfileDir)..\..\bin10\lib + $(ProfileDir)..\..\libs\win$(PlatformArchitecture) true /PDBALTPATH:%_PDB% %(AdditionalOptions) false @@ -170,7 +170,7 @@ true 0x22000000 $(IntDir)$(TargetName).lib - $(ProfileDir)..\..\bin10\lib + $(ProfileDir)..\..\libs\win$(PlatformArchitecture) /PDBALTPATH:%_PDB% %(AdditionalOptions) false diff --git a/protocols/EmLanProto/amdproto_12.vcxproj b/protocols/EmLanProto/amdproto_12.vcxproj index df6676c1d8..12636b71b4 100644 --- a/protocols/EmLanProto/amdproto_12.vcxproj +++ b/protocols/EmLanProto/amdproto_12.vcxproj @@ -92,7 +92,7 @@ Windows 0x22000000 $(IntDir)$(TargetName).lib - $(ProfileDir)..\..\bin12\lib + $(ProfileDir)..\..\libs\win$(PlatformArchitecture) false false @@ -118,7 +118,7 @@ Windows 0x22000000 $(IntDir)$(TargetName).lib - $(ProfileDir)..\..\bin12\lib + $(ProfileDir)..\..\libs\win$(PlatformArchitecture) false @@ -145,7 +145,7 @@ true 0x22000000 $(IntDir)$(TargetName).lib - $(ProfileDir)..\..\bin12\lib + $(ProfileDir)..\..\libs\win$(PlatformArchitecture) true /PDBALTPATH:%_PDB% %(AdditionalOptions) false @@ -175,7 +175,7 @@ true 0x22000000 $(IntDir)$(TargetName).lib - $(ProfileDir)..\..\bin12\lib + $(ProfileDir)..\..\libs\win$(PlatformArchitecture) /PDBALTPATH:%_PDB% %(AdditionalOptions) false diff --git a/protocols/EmLanProto/amdproto_14.vcxproj b/protocols/EmLanProto/amdproto_14.vcxproj index 2aef349835..a9e2dfb5f5 100644 --- a/protocols/EmLanProto/amdproto_14.vcxproj +++ b/protocols/EmLanProto/amdproto_14.vcxproj @@ -92,7 +92,7 @@ Windows 0x22000000 $(IntDir)$(TargetName).lib - $(ProfileDir)..\..\bin14\lib + $(ProfileDir)..\..\libs\win$(PlatformArchitecture) false false @@ -118,7 +118,7 @@ Windows 0x22000000 $(IntDir)$(TargetName).lib - $(ProfileDir)..\..\bin14\lib + $(ProfileDir)..\..\libs\win$(PlatformArchitecture) false @@ -145,7 +145,7 @@ true 0x22000000 $(IntDir)$(TargetName).lib - $(ProfileDir)..\..\bin14\lib + $(ProfileDir)..\..\libs\win$(PlatformArchitecture) true /PDBALTPATH:%_PDB% %(AdditionalOptions) false @@ -175,7 +175,7 @@ true 0x22000000 $(IntDir)$(TargetName).lib - $(ProfileDir)..\..\bin14\lib + $(ProfileDir)..\..\libs\win$(PlatformArchitecture) /PDBALTPATH:%_PDB% %(AdditionalOptions) false diff --git a/protocols/Gadu-Gadu/Gadu-Gadu_10.vcxproj b/protocols/Gadu-Gadu/Gadu-Gadu_10.vcxproj index 25a5fd62fe..59ac6cc60f 100644 --- a/protocols/Gadu-Gadu/Gadu-Gadu_10.vcxproj +++ b/protocols/Gadu-Gadu/Gadu-Gadu_10.vcxproj @@ -95,7 +95,7 @@ false $(IntDir)$(TargetName).lib Windows - $(ProfileDir)..\..\bin10\lib + $(ProfileDir)..\..\libs\win$(PlatformArchitecture) @@ -123,7 +123,7 @@ false $(IntDir)$(TargetName).lib Windows - $(ProfileDir)..\..\bin10\lib + $(ProfileDir)..\..\libs\win$(PlatformArchitecture) @@ -156,7 +156,7 @@ false $(IntDir)$(TargetName).lib Windows - $(ProfileDir)..\..\bin10\lib + $(ProfileDir)..\..\libs\win$(PlatformArchitecture) @@ -189,7 +189,7 @@ false $(IntDir)$(TargetName).lib Windows - $(ProfileDir)..\..\bin10\lib + $(ProfileDir)..\..\libs\win$(PlatformArchitecture) diff --git a/protocols/Gadu-Gadu/Gadu-Gadu_12.vcxproj b/protocols/Gadu-Gadu/Gadu-Gadu_12.vcxproj index e2c3e076ee..13da6095a9 100644 --- a/protocols/Gadu-Gadu/Gadu-Gadu_12.vcxproj +++ b/protocols/Gadu-Gadu/Gadu-Gadu_12.vcxproj @@ -99,7 +99,7 @@ false $(IntDir)$(TargetName).lib Windows - $(ProfileDir)..\..\bin12\lib + $(ProfileDir)..\..\libs\win$(PlatformArchitecture) false @@ -128,7 +128,7 @@ false $(IntDir)$(TargetName).lib Windows - $(ProfileDir)..\..\bin12\lib + $(ProfileDir)..\..\libs\win$(PlatformArchitecture) @@ -160,7 +160,7 @@ false $(IntDir)$(TargetName).lib Windows - $(ProfileDir)..\..\bin12\lib + $(ProfileDir)..\..\libs\win$(PlatformArchitecture) @@ -192,7 +192,7 @@ false $(IntDir)$(TargetName).lib Windows - $(ProfileDir)..\..\bin12\lib + $(ProfileDir)..\..\libs\win$(PlatformArchitecture) diff --git a/protocols/Gadu-Gadu/Gadu-Gadu_14.vcxproj b/protocols/Gadu-Gadu/Gadu-Gadu_14.vcxproj index a88ab51085..656872233a 100644 --- a/protocols/Gadu-Gadu/Gadu-Gadu_14.vcxproj +++ b/protocols/Gadu-Gadu/Gadu-Gadu_14.vcxproj @@ -99,7 +99,7 @@ false $(IntDir)$(TargetName).lib Windows - $(ProfileDir)..\..\bin14\lib + $(ProfileDir)..\..\libs\win$(PlatformArchitecture) false @@ -128,7 +128,7 @@ false $(IntDir)$(TargetName).lib Windows - $(ProfileDir)..\..\bin14\lib + $(ProfileDir)..\..\libs\win$(PlatformArchitecture) @@ -160,7 +160,7 @@ false $(IntDir)$(TargetName).lib Windows - $(ProfileDir)..\..\bin14\lib + $(ProfileDir)..\..\libs\win$(PlatformArchitecture) @@ -192,7 +192,7 @@ false $(IntDir)$(TargetName).lib Windows - $(ProfileDir)..\..\bin14\lib + $(ProfileDir)..\..\libs\win$(PlatformArchitecture) diff --git a/protocols/ICQCorp/ICQCorp_10.vcxproj b/protocols/ICQCorp/ICQCorp_10.vcxproj index 1562d7f48d..c7e7741a98 100644 --- a/protocols/ICQCorp/ICQCorp_10.vcxproj +++ b/protocols/ICQCorp/ICQCorp_10.vcxproj @@ -85,7 +85,7 @@ ws2_32.lib;%(AdditionalDependencies) true Windows - $(ProfileDir)..\..\bin12\lib + $(ProfileDir)..\..\libs\win$(PlatformArchitecture) false $(IntDir)$(TargetName).lib @@ -110,7 +110,7 @@ ws2_32.lib;%(AdditionalDependencies) true Windows - $(ProfileDir)..\..\bin12\lib + $(ProfileDir)..\..\libs\win$(PlatformArchitecture) false $(IntDir)$(TargetName).lib @@ -135,7 +135,7 @@ ws2_32.lib;%(AdditionalDependencies) Windows - $(ProfileDir)..\..\bin12\lib + $(ProfileDir)..\..\libs\win$(PlatformArchitecture) true true true @@ -164,7 +164,7 @@ ws2_32.lib;%(AdditionalDependencies) Windows - $(ProfileDir)..\..\bin12\lib + $(ProfileDir)..\..\libs\win$(PlatformArchitecture) true true true diff --git a/protocols/ICQCorp/ICQCorp_12.vcxproj b/protocols/ICQCorp/ICQCorp_12.vcxproj index 31c1df30df..f3ffb7b88e 100644 --- a/protocols/ICQCorp/ICQCorp_12.vcxproj +++ b/protocols/ICQCorp/ICQCorp_12.vcxproj @@ -89,7 +89,7 @@ ws2_32.lib;%(AdditionalDependencies) true Windows - $(ProfileDir)..\..\bin12\lib + $(ProfileDir)..\..\libs\win$(PlatformArchitecture) false $(IntDir)$(TargetName).lib @@ -114,7 +114,7 @@ ws2_32.lib;%(AdditionalDependencies) true Windows - $(ProfileDir)..\..\bin12\lib + $(ProfileDir)..\..\libs\win$(PlatformArchitecture) false $(IntDir)$(TargetName).lib @@ -139,7 +139,7 @@ ws2_32.lib;%(AdditionalDependencies) Windows - $(ProfileDir)..\..\bin12\lib + $(ProfileDir)..\..\libs\win$(PlatformArchitecture) true true true @@ -167,7 +167,7 @@ ws2_32.lib;%(AdditionalDependencies) Windows - $(ProfileDir)..\..\bin12\lib + $(ProfileDir)..\..\libs\win$(PlatformArchitecture) true true true diff --git a/protocols/ICQCorp/ICQCorp_14.vcxproj b/protocols/ICQCorp/ICQCorp_14.vcxproj index 67b4bbe2b8..1bb09fc559 100644 --- a/protocols/ICQCorp/ICQCorp_14.vcxproj +++ b/protocols/ICQCorp/ICQCorp_14.vcxproj @@ -89,7 +89,7 @@ ws2_32.lib;%(AdditionalDependencies) true Windows - $(ProfileDir)..\..\bin14\lib + $(ProfileDir)..\..\libs\win$(PlatformArchitecture) false $(IntDir)$(TargetName).lib @@ -114,7 +114,7 @@ ws2_32.lib;%(AdditionalDependencies) true Windows - $(ProfileDir)..\..\bin14\lib + $(ProfileDir)..\..\libs\win$(PlatformArchitecture) false $(IntDir)$(TargetName).lib @@ -139,7 +139,7 @@ ws2_32.lib;%(AdditionalDependencies) Windows - $(ProfileDir)..\..\bin14\lib + $(ProfileDir)..\..\libs\win$(PlatformArchitecture) true true true @@ -167,7 +167,7 @@ ws2_32.lib;%(AdditionalDependencies) Windows - $(ProfileDir)..\..\bin14\lib + $(ProfileDir)..\..\libs\win$(PlatformArchitecture) true true true diff --git a/protocols/Sametime/sametime_10.vcxproj b/protocols/Sametime/sametime_10.vcxproj index 40d4a6e77f..0e42a6a0b8 100644 --- a/protocols/Sametime/sametime_10.vcxproj +++ b/protocols/Sametime/sametime_10.vcxproj @@ -101,7 +101,7 @@ true false $(IntDir)$(TargetName).lib - $(ProfileDir)..\..\bin10\lib + $(ProfileDir)..\..\libs\win$(PlatformArchitecture) Windows @@ -136,7 +136,7 @@ true false $(IntDir)$(TargetName).lib - $(ProfileDir)..\..\bin10\lib + $(ProfileDir)..\..\libs\win$(PlatformArchitecture) Windows @@ -170,7 +170,7 @@ true false $(IntDir)$(TargetName).lib - $(ProfileDir)..\..\bin10\lib + $(ProfileDir)..\..\libs\win$(PlatformArchitecture) Windows true true @@ -206,7 +206,7 @@ true false $(IntDir)$(TargetName).lib - $(ProfileDir)..\..\bin10\lib + $(ProfileDir)..\..\libs\win$(PlatformArchitecture) Windows true true diff --git a/protocols/Sametime/sametime_12.vcxproj b/protocols/Sametime/sametime_12.vcxproj index 5683154436..948f6b1985 100644 --- a/protocols/Sametime/sametime_12.vcxproj +++ b/protocols/Sametime/sametime_12.vcxproj @@ -105,7 +105,7 @@ true false $(IntDir)$(TargetName).lib - $(ProfileDir)..\..\bin12\lib + $(ProfileDir)..\..\libs\win$(PlatformArchitecture) Windows false @@ -141,7 +141,7 @@ true false $(IntDir)$(TargetName).lib - $(ProfileDir)..\..\bin12\lib + $(ProfileDir)..\..\libs\win$(PlatformArchitecture) Windows @@ -175,7 +175,7 @@ true false $(IntDir)$(TargetName).lib - $(ProfileDir)..\..\bin12\lib + $(ProfileDir)..\..\libs\win$(PlatformArchitecture) Windows true true @@ -211,7 +211,7 @@ true false $(IntDir)$(TargetName).lib - $(ProfileDir)..\..\bin12\lib + $(ProfileDir)..\..\libs\win$(PlatformArchitecture) Windows true true diff --git a/protocols/Sametime/sametime_14.vcxproj b/protocols/Sametime/sametime_14.vcxproj index 4c0b3a7282..6c2b5420f2 100644 --- a/protocols/Sametime/sametime_14.vcxproj +++ b/protocols/Sametime/sametime_14.vcxproj @@ -105,7 +105,7 @@ true false $(IntDir)$(TargetName).lib - $(ProfileDir)..\..\bin14\lib + $(ProfileDir)..\..\libs\win$(PlatformArchitecture) Windows false @@ -141,7 +141,7 @@ true false $(IntDir)$(TargetName).lib - $(ProfileDir)..\..\bin14\lib + $(ProfileDir)..\..\libs\win$(PlatformArchitecture) Windows @@ -175,7 +175,7 @@ true false $(IntDir)$(TargetName).lib - $(ProfileDir)..\..\bin14\lib + $(ProfileDir)..\..\libs\win$(PlatformArchitecture) Windows true true @@ -211,7 +211,7 @@ true false $(IntDir)$(TargetName).lib - $(ProfileDir)..\..\bin14\lib + $(ProfileDir)..\..\libs\win$(PlatformArchitecture) Windows true true diff --git a/tools/checksum/checksum_10.vcxproj b/tools/checksum/checksum_10.vcxproj index 49cb8149c0..19ce0b4332 100644 --- a/tools/checksum/checksum_10.vcxproj +++ b/tools/checksum/checksum_10.vcxproj @@ -94,7 +94,7 @@ false $(IntDir)$(TargetName).lib type=%27Win32%27 name=%27Microsoft.Windows.Common-Controls%27 version=%276.0.0.0%27 processorArchitecture=%27*%27 publicKeyToken=%276595b64144ccf1df%27 language=%27*%27;%(AdditionalManifestDependencies) - $(ProfileDir)..\..\bin10\lib + $(ProfileDir)..\..\libs\win$(PlatformArchitecture) @@ -118,7 +118,7 @@ Console false $(IntDir)$(TargetName).lib - $(ProfileDir)..\..\bin10\lib + $(ProfileDir)..\..\libs\win$(PlatformArchitecture) @@ -149,7 +149,7 @@ false $(IntDir)$(TargetName).lib Console - $(ProfileDir)..\..\bin10\lib + $(ProfileDir)..\..\libs\win$(PlatformArchitecture) /PDBALTPATH:%_PDB% @@ -181,7 +181,7 @@ false $(IntDir)$(TargetName).lib Console - $(ProfileDir)..\..\bin10\lib + $(ProfileDir)..\..\libs\win$(PlatformArchitecture) /PDBALTPATH:%_PDB% diff --git a/tools/checksum/checksum_12.vcxproj b/tools/checksum/checksum_12.vcxproj index 82e656d330..6ab599bf2f 100644 --- a/tools/checksum/checksum_12.vcxproj +++ b/tools/checksum/checksum_12.vcxproj @@ -98,7 +98,7 @@ false $(IntDir)$(TargetName).lib type=%27Win32%27 name=%27Microsoft.Windows.Common-Controls%27 version=%276.0.0.0%27 processorArchitecture=%27*%27 publicKeyToken=%276595b64144ccf1df%27 language=%27*%27;%(AdditionalManifestDependencies) - $(ProfileDir)..\..\bin12\lib + $(ProfileDir)..\..\libs\win$(PlatformArchitecture) @@ -122,7 +122,7 @@ Console false $(IntDir)$(TargetName).lib - $(ProfileDir)..\..\bin12\lib + $(ProfileDir)..\..\libs\win$(PlatformArchitecture) @@ -153,7 +153,7 @@ false $(IntDir)$(TargetName).lib Console - $(ProfileDir)..\..\bin12\lib + $(ProfileDir)..\..\libs\win$(PlatformArchitecture) @@ -184,7 +184,7 @@ false $(IntDir)$(TargetName).lib Console - $(ProfileDir)..\..\bin12\lib + $(ProfileDir)..\..\libs\win$(PlatformArchitecture) diff --git a/tools/checksum/checksum_14.vcxproj b/tools/checksum/checksum_14.vcxproj index 9baf2dc6fd..acd66a23bd 100644 --- a/tools/checksum/checksum_14.vcxproj +++ b/tools/checksum/checksum_14.vcxproj @@ -98,7 +98,7 @@ false $(IntDir)$(TargetName).lib type=%27Win32%27 name=%27Microsoft.Windows.Common-Controls%27 version=%276.0.0.0%27 processorArchitecture=%27*%27 publicKeyToken=%276595b64144ccf1df%27 language=%27*%27;%(AdditionalManifestDependencies) - $(ProfileDir)..\..\bin14\lib + $(ProfileDir)..\..\libs\win$(PlatformArchitecture) @@ -122,7 +122,7 @@ Console false $(IntDir)$(TargetName).lib - $(ProfileDir)..\..\bin14\lib + $(ProfileDir)..\..\libs\win$(PlatformArchitecture) @@ -153,7 +153,7 @@ false $(IntDir)$(TargetName).lib Console - $(ProfileDir)..\..\bin14\lib + $(ProfileDir)..\..\libs\win$(PlatformArchitecture) @@ -184,7 +184,7 @@ false $(IntDir)$(TargetName).lib Console - $(ProfileDir)..\..\bin14\lib + $(ProfileDir)..\..\libs\win$(PlatformArchitecture) -- cgit v1.2.3