From ed510012bac97f6ad1f3b776d1b13c37a987e83e Mon Sep 17 00:00:00 2001 From: Vadim Zeitlin Date: Sun, 23 Oct 2022 14:52:57 +0200 Subject: [PATCH] Also add Unix files to wxQt CMake build Similar to the last commit for configure-based build system. Co-Authored-By: Maarten Bent --- build/cmake/files.cmake | 11 +++++++++++ build/cmake/lib/core/CMakeLists.txt | 4 +++- 2 files changed, 14 insertions(+), 1 deletion(-) diff --git a/build/cmake/files.cmake b/build/cmake/files.cmake index cb396e3cf9..e8073d605f 100644 --- a/build/cmake/files.cmake +++ b/build/cmake/files.cmake @@ -167,6 +167,17 @@ set(BASE_OSX_NOTWXMAC_HDR ${BASE_COREFOUNDATION_HDR} ) +set(QT_UNIX_SRC + src/unix/dialup.cpp + src/unix/joystick.cpp + src/unix/sound.cpp +) + +set(QT_UNIX_HDR + wx/unix/joystick.h + wx/unix/sound.h +) + set(QT_WIN32_SRC src/msw/ole/automtn.cpp src/msw/ole/safearray.cpp diff --git a/build/cmake/lib/core/CMakeLists.txt b/build/cmake/lib/core/CMakeLists.txt index 8031cc3730..22f523a65e 100644 --- a/build/cmake/lib/core/CMakeLists.txt +++ b/build/cmake/lib/core/CMakeLists.txt @@ -50,7 +50,9 @@ elseif(WXOSX_IPHONE) wx_append_sources(CORE_SRC OSX_IPHONE) elseif(WXQT) wx_append_sources(CORE_SRC QT) - if(WIN32) + if(UNIX) + wx_append_sources(CORE_SRC QT_UNIX) + elseif(WIN32) wx_append_sources(CORE_SRC QT_WIN32) endif() endif()