From 93948adca3d0f0663b902b859c180b163bf7193e Mon Sep 17 00:00:00 2001 From: Connor McLaughlin Date: Sat, 11 Jan 2020 15:31:16 +1000 Subject: [PATCH] dep: Use external Qt for compiling on Windows --- dep/msvc/vsprops/QtCompile.props | 52 +++++++++++++++++++++++++++++--- 1 file changed, 48 insertions(+), 4 deletions(-) diff --git a/dep/msvc/vsprops/QtCompile.props b/dep/msvc/vsprops/QtCompile.props index c2744d381..e0b581c7c 100644 --- a/dep/msvc/vsprops/QtCompile.props +++ b/dep/msvc/vsprops/QtCompile.props @@ -1,7 +1,8 @@ - $(SolutionDir)dep\msvc\qt5-x64\ + $(SolutionDir)bin\$(Platform)\ + $(SolutionDir)dep\msvc\qt\5.14.0\msvc2017_64\ $(QTDIRDefault) $(QTDIR)\ false @@ -13,12 +14,12 @@ $(SolutionDir)build\$(ProjectName)-$(Platform)-$(Configuration)\ $(QtToolOutDir)moc_ d - $(QtDebugSuffix) + $(QtDebugSuffix) QtPlugins - QT_NO_DEBUG;%(PreprocessorDefinitions) + QT_NO_DEBUG;%(PreprocessorDefinitions) $(ProjectDir);%(AdditionalIncludeDirectories) $(QtToolOutDir);%(AdditionalIncludeDirectories) $(QtIncludeDir);%(AdditionalIncludeDirectories) @@ -71,7 +72,7 @@ - -DQT_NO_DEBUG -DNDEBUG $(MocDefines) + -DQT_NO_DEBUG -DNDEBUG $(MocDefines) + + + + + + + + + + + $(BinaryOutputDir)qt.conf + + + + + + + + + +