diff --git a/jami-qt.pro b/jami-qt.pro index abc8736fd97d844c697f8d04ff130cfd72dfa782..9af515974788de50ba63b853f8442c01c830b949 100644 --- a/jami-qt.pro +++ b/jami-qt.pro @@ -6,13 +6,11 @@ win32-msvc { CONFIG += suppress_vcproj_warnings c++17 qtquickcompiler - QML2_IMPORT_PATH = C:/Qt/5.9.4/msvc2017_64/qml - QTQUICK_COMPILER_SKIPPED_RESOURCES += ressources.qrc # compiler options QMAKE_CXXFLAGS += /wd"4068" /wd"4099" /wd"4189" /wd"4267" /wd"4577" /wd"4467" /wd"4715" /wd"4828" - QMAKE_CXXFLAGS += /MP /GS /W3 /Gy /Zc:wchar_t /Zi /Gm- /O2 /Zc:inline /fp:precise /errorReport:prompt /WX- /Zc:forScope + QMAKE_CXXFLAGS += /MP /GS /W3 /Gy /Zc:wchar_t /Zi /Gm- /O2 /Zc:inline /fp:precise /errorReport:prompt QMAKE_CXXFLAGS += /Gd /Oi /MD /std:c++17 /FC /EHsc /nologo /sdl # linker options @@ -37,7 +35,7 @@ win32-msvc { # daemon INCLUDEPATH += ../daemon/contrib/msvc/include/ - LIBS += $${DRING}/MSVC/x64/ReleaseLib_win32/bin/dring.lib + LIBS += $${DRING}/build-local/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 8d4c56a842d49be188a5c9b64668b407ef841eeb..1ae2b969a7a7cdf37e96aa7192ad82567484e33a 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\MSVC\ring-daemon.vcxproj", "{1CA4822C-F599-3879-A78F-332D823E4871}" +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "ring-daemon", "..\daemon\build-local\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}