From b93727507342f0dadd7bc4deab44d5488861c3e5 Mon Sep 17 00:00:00 2001 From: Connor McLaughlin <stenzek@gmail.com> Date: Fri, 24 Jan 2020 14:51:24 +1000 Subject: [PATCH] Qt: Link with and copy Qt5Network library --- CMakeLists.txt | 2 +- dep/msvc/vsprops/QtCompile.props | 4 ++-- src/duckstation-qt/CMakeLists.txt | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 3cc7b09ec..d1ba52847 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -39,7 +39,7 @@ if(NOT ANDROID) find_package(SDL2 REQUIRED) endif() if(BUILD_QT_FRONTEND) - find_package(Qt5 COMPONENTS Core Gui Widgets REQUIRED) + find_package(Qt5 COMPONENTS Core Gui Widgets Network REQUIRED) endif() endif() diff --git a/dep/msvc/vsprops/QtCompile.props b/dep/msvc/vsprops/QtCompile.props index e0b581c7c..9f27aaeeb 100644 --- a/dep/msvc/vsprops/QtCompile.props +++ b/dep/msvc/vsprops/QtCompile.props @@ -26,7 +26,7 @@ </ClCompile> <Link> <AdditionalLibraryDirectories>$(QtLibDir);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories> - <AdditionalDependencies>qtmain$(QtLibSuffix).lib;Qt5Core$(QtLibSuffix).lib;Qt5Gui$(QtLibSuffix).lib;Qt5Widgets$(QtLibSuffix).lib;%(AdditionalDependencies)</AdditionalDependencies> + <AdditionalDependencies>qtmain$(QtLibSuffix).lib;Qt5Core$(QtLibSuffix).lib;Qt5Gui$(QtLibSuffix).lib;Qt5Widgets$(QtLibSuffix).lib;Qt5Network$(QtLibSuffix).lib;%(AdditionalDependencies)</AdditionalDependencies> </Link> </ItemDefinitionGroup> @@ -117,7 +117,7 @@ <!--Copy the needed dlls--> <ItemGroup> - <QtLibNames Include="Qt5Core$(QtLibSuffix);Qt5Gui$(QtLibSuffix);Qt5Widgets$(QtLibSuffix)" /> + <QtLibNames Include="Qt5Core$(QtLibSuffix);Qt5Gui$(QtLibSuffix);Qt5Widgets$(QtLibSuffix);Qt5Network$(QtLibSuffix)" /> <QtDlls Include="@(QtLibNames -> '$(QtBinDir)%(Identity).dll')" /> <!--Filter plugins to copy based on the observation that all debug versions end in "d"--> <QtAllPlugins Include="$(QtPluginsDir)**\*$(QtLibSuffix).dll" /> diff --git a/src/duckstation-qt/CMakeLists.txt b/src/duckstation-qt/CMakeLists.txt index bf97a4c46..3afa97f12 100644 --- a/src/duckstation-qt/CMakeLists.txt +++ b/src/duckstation-qt/CMakeLists.txt @@ -43,7 +43,7 @@ add_executable(duckstation-qt settingsdialog.ui ) -target_link_libraries(duckstation-qt PRIVATE core common imgui glad Qt5::Core Qt5::Gui Qt5::Widgets) +target_link_libraries(duckstation-qt PRIVATE core common imgui glad minizip Qt5::Core Qt5::Gui Qt5::Widgets Qt5::Network) if(WIN32) target_sources(duckstation-qt PRIVATE