lilith/jami-client-qt
1
0
Fork 0
mirror of https://git.jami.net/savoirfairelinux/jami-client-qt.git synced 2025-08-11 02:05:40 +02:00
Code Activity

misc(win32): unify OpenSSL build

Browse source 
Change-Id: I6f21c28c1aa20121527046c90f95e327d6a79040
This commit is contained in:
Andreas Traczyk 2020-10-20 11:29:23 -04:00
parent dc1553c51c
commit fd82ae2cd4
3 changed files with 9 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
copy-runtime-files.ps1
View file

@ -48,10 +48,8 @@ $FilesToCopy = @(
"$daemonDir\contrib\build\ffmpeg\Build\win32\x64\bin\swresample-3.dll", "$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\swscale-5.dll",
"$daemonDir\contrib\build\ffmpeg\Build\win32\x64\bin\avfilter-7.dll", "$daemonDir\contrib\build\ffmpeg\Build\win32\x64\bin\avfilter-7.dll",
"$daemonDir\contrib\build\openssl\out32dll\libeay32.dll", "$daemonDir\contrib\build\openssl\libcrypto-1_1-x64.dll",
"$daemonDir\contrib\build\openssl\out32dll\ssleay32.dll", "$daemonDir\contrib\build\openssl\libssl-1_1-x64.dll",
"$QtDir\..\..\Tools\OpenSSL\Win_x64\bin\libcrypto-1_1-x64.dll",
"$QtDir\..\..\Tools\OpenSSL\Win_x64\bin\libssl-1_1-x64.dll",
"$clientDir\qt.conf", "$clientDir\qt.conf",
"$clientDir\images\jami.ico", "$clientDir\images\jami.ico",
"$clientDir\License.rtf" "$clientDir\License.rtf"

6
jami-qt.pro
View file

@ -30,12 +30,12 @@ win32-msvc {
# lrc # lrc
INCLUDEPATH += $${LRC}/src/ INCLUDEPATH += $${LRC}/src/
LIBS += $${LRC}/msvc/release/ringclient_static.lib LIBS += $${LRC}/build/release/ringclient_static.lib
LIBS += $${LRC}/msvc/src/qtwrapper/Release/qtwrapper.lib LIBS += $${LRC}/build/src/qtwrapper/Release/qtwrapper.lib
# daemon # daemon
INCLUDEPATH += ../daemon/contrib/msvc/include/ 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 LIBS += $${DRING}/contrib/msvc/lib/x64/libgnutls.lib
# windows system libs # windows system libs

8
jami-qt.sln
View file

@ -2,7 +2,7 @@ Microsoft Visual Studio Solution File, Format Version 12.00
# Visual Studio Version 16 # Visual Studio Version 16
VisualStudioVersion = 16.0.29613.14 VisualStudioVersion = 16.0.29613.14
MinimumVisualStudioVersion = 10.0.40219.1 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 ProjectSection(ProjectDependencies) = postProject
{2BB84911-C1B4-4747-B93D-36AA82CC5031} = {2BB84911-C1B4-4747-B93D-36AA82CC5031} {2BB84911-C1B4-4747-B93D-36AA82CC5031} = {2BB84911-C1B4-4747-B93D-36AA82CC5031}
{A5D9AA24-08ED-48B9-BD65-F0A25E96BFC4} = {A5D9AA24-08ED-48B9-BD65-F0A25E96BFC4} {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} {9CA0FDFB-2172-41FC-B7F1-5CE915EDCB37} = {9CA0FDFB-2172-41FC-B7F1-5CE915EDCB37}
EndProjectSection EndProjectSection
EndProject 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 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 ProjectSection(ProjectDependencies) = postProject
{1CA4822C-F599-3879-A78F-332D823E4871} = {1CA4822C-F599-3879-A78F-332D823E4871} {1CA4822C-F599-3879-A78F-332D823E4871} = {1CA4822C-F599-3879-A78F-332D823E4871}
EndProjectSection EndProjectSection
@ -56,7 +56,7 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "client", "client", "{1ECB5B
EndProject EndProject
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "contrib", "contrib", "{B4FD804C-ABD9-4F54-858B-911F0119580C}" Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "contrib", "contrib", "{B4FD804C-ABD9-4F54-858B-911F0119580C}"
EndProject 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 EndProject
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "jami-qt", "jami-qt.vcxproj", "{A1BDC12C-5DF6-3E77-9793-AB9AB5C82027}" Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "jami-qt", "jami-qt.vcxproj", "{A1BDC12C-5DF6-3E77-9793-AB9AB5C82027}"
ProjectSection(ProjectDependencies) = postProject ProjectSection(ProjectDependencies) = postProject