Merge branch 'qt' of github.com:jgilje/86Box into qt
This commit is contained in:
@@ -4,7 +4,6 @@ set(CMAKE_AUTOMOC ON)
|
|||||||
set(CMAKE_AUTOUIC ON)
|
set(CMAKE_AUTOUIC ON)
|
||||||
set(CMAKE_AUTORCC ON)
|
set(CMAKE_AUTORCC ON)
|
||||||
|
|
||||||
find_package(PkgConfig)
|
|
||||||
find_package(Threads REQUIRED)
|
find_package(Threads REQUIRED)
|
||||||
|
|
||||||
add_library(plat STATIC qt.c qt_main.cpp qt_platform.cpp cpp11_thread.cpp)
|
add_library(plat STATIC qt.c qt_main.cpp qt_platform.cpp cpp11_thread.cpp)
|
||||||
@@ -107,20 +106,6 @@ target_link_libraries(
|
|||||||
Threads::Threads
|
Threads::Threads
|
||||||
)
|
)
|
||||||
|
|
||||||
if (PkgConfig_FOUND)
|
|
||||||
pkg_check_modules(RTMIDI rtmidi)
|
|
||||||
if (RTMIDI_FOUND)
|
|
||||||
target_include_directories(plat PRIVATE ${RTMIDI_INCLUDE_DIRS})
|
|
||||||
target_link_directories(plat INTERFACE ${RTMIDI_LIBRARY_DIRS})
|
|
||||||
target_link_libraries(plat PRIVATE ${RTMIDI_LIBRARIES})
|
|
||||||
target_sources(plat PRIVATE rtmidi_midi.cpp)
|
|
||||||
else()
|
|
||||||
target_sources(plat PRIVATE qt_midi.cpp)
|
|
||||||
endif()
|
|
||||||
else()
|
|
||||||
target_sources(plat PRIVATE qt_midi.cpp)
|
|
||||||
endif()
|
|
||||||
|
|
||||||
if (UNIX AND NOT APPLE)
|
if (UNIX AND NOT APPLE)
|
||||||
find_package(X11 REQUIRED)
|
find_package(X11 REQUIRED)
|
||||||
target_link_libraries(ui PRIVATE X11::X11)
|
target_link_libraries(ui PRIVATE X11::X11)
|
||||||
|
@@ -99,7 +99,7 @@ void RendererStack::wheelEvent(QWheelEvent *event)
|
|||||||
{
|
{
|
||||||
if (mouse_capture)
|
if (mouse_capture)
|
||||||
{
|
{
|
||||||
mousedata.deltay += event->pixelDelta().y();
|
mousedata.deltaz += event->pixelDelta().y();
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
Reference in New Issue
Block a user