Skip to content

Commit

Permalink
cmake: stop linking against QGL
Browse files Browse the repository at this point in the history
Co-Authored-By: Jan Beich <jbeich@users.noreply.github.com>
  • Loading branch information
FearlessTobi and jbeich committed Jul 11, 2020
1 parent 96fa75f commit 88edf9d
Show file tree
Hide file tree
Showing 3 changed files with 2 additions and 3 deletions.
2 changes: 1 addition & 1 deletion CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -186,7 +186,7 @@ if (ENABLE_QT)
set(QT_PREFIX_HINT)
endif()

find_package(Qt5 REQUIRED COMPONENTS Widgets OpenGL Multimedia ${QT_PREFIX_HINT})
find_package(Qt5 REQUIRED COMPONENTS Widgets Multimedia ${QT_PREFIX_HINT})

if (ENABLE_QT_TRANSLATION)
find_package(Qt5 REQUIRED COMPONENTS LinguistTools ${QT_PREFIX_HINT})
Expand Down
1 change: 0 additions & 1 deletion CMakeModules/CopyCitraQt5Deps.cmake
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,6 @@ function(copy_citra_Qt5_deps target_dir)
icuuc*.dll
Qt5Core$<$<CONFIG:Debug>:d>.*
Qt5Gui$<$<CONFIG:Debug>:d>.*
Qt5OpenGL$<$<CONFIG:Debug>:d>.*
Qt5Widgets$<$<CONFIG:Debug>:d>.*
Qt5Multimedia$<$<CONFIG:Debug>:d>.*
Qt5Network$<$<CONFIG:Debug>:d>.*
Expand Down
2 changes: 1 addition & 1 deletion src/citra_qt/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -246,7 +246,7 @@ endif()
create_target_directory_groups(citra-qt)

target_link_libraries(citra-qt PRIVATE audio_core common core input_common network video_core)
target_link_libraries(citra-qt PRIVATE Boost::boost glad nihstro-headers Qt5::OpenGL Qt5::Widgets Qt5::Multimedia)
target_link_libraries(citra-qt PRIVATE Boost::boost glad nihstro-headers Qt5::Widgets Qt5::Multimedia)
target_link_libraries(citra-qt PRIVATE ${PLATFORM_LIBRARIES} Threads::Threads)

target_compile_definitions(citra-qt PRIVATE
Expand Down

0 comments on commit 88edf9d

Please sign in to comment.