diff --git a/copy-runtime-files.ps1 b/copy-runtime-files.ps1 index ac9ba58c84a8e82031de7b26f15e01c9cda96ed2..79e7745ad10c637eb6058480b420f1ea72e032eb 100644 --- a/copy-runtime-files.ps1 +++ b/copy-runtime-files.ps1 @@ -48,10 +48,8 @@ $FilesToCopy = @( "$daemonDir\contrib\build\ffmpeg\Build\win32\x64\bin\swresample-3.dll", "$daemonDir\contrib\build\ffmpeg\Build\win32\x64\bin\swscale-5.dll", "$daemonDir\contrib\build\ffmpeg\Build\win32\x64\bin\avfilter-7.dll", - "$daemonDir\contrib\build\openssl\out32dll\libeay32.dll", - "$daemonDir\contrib\build\openssl\out32dll\ssleay32.dll", - "$QtDir\..\..\Tools\OpenSSL\Win_x64\bin\libcrypto-1_1-x64.dll", - "$QtDir\..\..\Tools\OpenSSL\Win_x64\bin\libssl-1_1-x64.dll", + "$daemonDir\contrib\build\openssl\libcrypto-1_1-x64.dll", + "$daemonDir\contrib\build\openssl\libssl-1_1-x64.dll", "$clientDir\qt.conf", "$clientDir\images\jami.ico", "$clientDir\License.rtf" diff --git a/jami-qt.pro b/jami-qt.pro index 762114c51274b5109797b0a3077cb91f95828ba3..947cd37e999c422c3cb2c7004adff98734007649 100644 --- a/jami-qt.pro +++ b/jami-qt.pro @@ -30,12 +30,12 @@ win32-msvc { # lrc INCLUDEPATH += $${LRC}/src/ - LIBS += $${LRC}/msvc/release/ringclient_static.lib - LIBS += $${LRC}/msvc/src/qtwrapper/Release/qtwrapper.lib + LIBS += $${LRC}/build/release/ringclient_static.lib + LIBS += $${LRC}/build/src/qtwrapper/Release/qtwrapper.lib # daemon INCLUDEPATH += ../daemon/contrib/msvc/include/ - LIBS += $${DRING}/build-local/x64/ReleaseLib_win32/bin/dring.lib + LIBS += $${DRING}/build/x64/ReleaseLib_win32/bin/dring.lib LIBS += $${DRING}/contrib/msvc/lib/x64/libgnutls.lib # windows system libs diff --git a/jami-qt.sln b/jami-qt.sln index 1ae2b969a7a7cdf37e96aa7192ad82567484e33a..82e2d69de7f7829c095e58575a227621af34bbc5 100644 --- a/jami-qt.sln +++ b/jami-qt.sln @@ -2,7 +2,7 @@ Microsoft Visual Studio Solution File, Format Version 12.00 # Visual Studio Version 16 VisualStudioVersion = 16.0.29613.14 MinimumVisualStudioVersion = 10.0.40219.1 -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "ring-daemon", "..\daemon\build-local\ring-daemon.vcxproj", "{1CA4822C-F599-3879-A78F-332D823E4871}" +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "ring-daemon", "..\daemon\build\ring-daemon.vcxproj", "{1CA4822C-F599-3879-A78F-332D823E4871}" ProjectSection(ProjectDependencies) = postProject {2BB84911-C1B4-4747-B93D-36AA82CC5031} = {2BB84911-C1B4-4747-B93D-36AA82CC5031} {A5D9AA24-08ED-48B9-BD65-F0A25E96BFC4} = {A5D9AA24-08ED-48B9-BD65-F0A25E96BFC4} @@ -17,9 +17,9 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "ring-daemon", "..\daemon\bu {9CA0FDFB-2172-41FC-B7F1-5CE915EDCB37} = {9CA0FDFB-2172-41FC-B7F1-5CE915EDCB37} EndProjectSection EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "ringclient_static", "..\lrc\msvc\ringclient_static.vcxproj", "{774F1C61-6659-36E6-9519-17A753890576}" +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "ringclient_static", "..\lrc\build\ringclient_static.vcxproj", "{774F1C61-6659-36E6-9519-17A753890576}" EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "qtwrapper", "..\lrc\msvc\src\qtwrapper\qtwrapper.vcxproj", "{2CFF20AA-9341-3564-A044-C38E70D5372A}" +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "qtwrapper", "..\lrc\build\src\qtwrapper\qtwrapper.vcxproj", "{2CFF20AA-9341-3564-A044-C38E70D5372A}" ProjectSection(ProjectDependencies) = postProject {1CA4822C-F599-3879-A78F-332D823E4871} = {1CA4822C-F599-3879-A78F-332D823E4871} EndProjectSection @@ -56,7 +56,7 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "client", "client", "{1ECB5B EndProject Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "contrib", "contrib", "{B4FD804C-ABD9-4F54-858B-911F0119580C}" EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "opendht", "..\daemon\contrib\build\opendht\MSVC\opendht.vcxproj", "{711397CE-E5D5-467D-9457-8716C047E50C}" +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "opendht", "..\daemon\contrib\build\opendht\build\opendht-static.vcxproj", "{711397CE-E5D5-467D-9457-8716C047E50C}" EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "jami-qt", "jami-qt.vcxproj", "{A1BDC12C-5DF6-3E77-9793-AB9AB5C82027}" ProjectSection(ProjectDependencies) = postProject