Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
jami-client-qt
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Iterations
Wiki
Requirements
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Snippets
Locked files
Build
Pipelines
Jobs
Pipeline schedules
Test cases
Artifacts
Deploy
Releases
Package Registry
Model registry
Operate
Environments
Terraform modules
Monitor
Incidents
Analyze
Value stream analytics
Contributor analytics
CI/CD analytics
Repository analytics
Code review analytics
Issue analytics
Insights
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
savoirfairelinux
jami-client-qt
Commits
fd82ae2c
Commit
fd82ae2c
authored
4 years ago
by
Andreas Traczyk
Browse files
Options
Downloads
Patches
Plain Diff
misc(win32): unify OpenSSL build
Change-Id: I6f21c28c1aa20121527046c90f95e327d6a79040
parent
dc1553c5
No related branches found
Branches containing commit
No related tags found
Tags containing commit
No related merge requests found
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
copy-runtime-files.ps1
+2
-4
2 additions, 4 deletions
copy-runtime-files.ps1
jami-qt.pro
+3
-3
3 additions, 3 deletions
jami-qt.pro
jami-qt.sln
+4
-4
4 additions, 4 deletions
jami-qt.sln
with
9 additions
and
11 deletions
copy-runtime-files.ps1
+
2
−
4
View file @
fd82ae2c
...
...
@@ -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"
...
...
This diff is collapsed.
Click to expand it.
jami-qt.pro
+
3
−
3
View file @
fd82ae2c
...
...
@@ -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
...
...
This diff is collapsed.
Click to expand it.
jami-qt.sln
+
4
−
4
View file @
fd82ae2c
...
...
@@ -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
...
...
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment