From fc6a16543815b92212cdd0ee6800355f10e827b0 Mon Sep 17 00:00:00 2001 From: Connor McLaughlin Date: Thu, 23 Apr 2020 13:04:33 +1000 Subject: [PATCH] CMake: Fix compiling with Visual Studio --- CMakeLists.txt | 4 +++- src/duckstation-qt/CMakeLists.txt | 2 +- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 22eb5b3ac..142f8bdd0 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -18,16 +18,18 @@ if(WIN32) if(CMAKE_SIZEOF_VOID_P EQUAL 8) set(SDL2_LIBRARIES "${CMAKE_CURRENT_SOURCE_DIR}/dep/msvc/sdl2/lib64/SDL2.lib") set(SDL2MAIN_LIBRARIES "${CMAKE_CURRENT_SOURCE_DIR}/dep/msvc/sdl2/lib64/SDL2main.lib") + set(Qt5_DIR "${CMAKE_CURRENT_SOURCE_DIR}/dep/msvc/qt/5.14.0/msvc2017_64/lib/cmake/Qt5") else() set(SDL2_LIBRARIES "${CMAKE_CURRENT_SOURCE_DIR}/dep/msvc/sdl2/lib32/SDL2.lib") set(SDL2MAIN_LIBRARIES "${CMAKE_CURRENT_SOURCE_DIR}/dep/msvc/sdl2/lib32/SDL2main.lib") + set(Qt5_DIR "${CMAKE_CURRENT_SOURCE_DIR}/dep/msvc/qt/5.14.0/msvc2017_32/lib/cmake/Qt5") endif() endif() # Required libraries. if(NOT ANDROID) - if(BUILD_SDL_FRONTEND OR USE_SDL2) + if(NOT WIN32 AND (BUILD_SDL_FRONTEND OR USE_SDL2)) find_package(SDL2 REQUIRED) endif() if(BUILD_QT_FRONTEND) diff --git a/src/duckstation-qt/CMakeLists.txt b/src/duckstation-qt/CMakeLists.txt index d66346237..c45298b6d 100644 --- a/src/duckstation-qt/CMakeLists.txt +++ b/src/duckstation-qt/CMakeLists.txt @@ -57,5 +57,5 @@ if(WIN32) d3d11hostdisplay.cpp d3d11hostdisplay.h ) - target_link_libraries(duckstation PRIVATE d3d11.lib dxgi.lib) + target_link_libraries(duckstation-qt PRIVATE d3d11.lib dxgi.lib) endif()