diff --git a/Source/Core/InputCommon/CMakeLists.txt b/Source/Core/InputCommon/CMakeLists.txt index 92fce634e3..a305bb5b2a 100644 --- a/Source/Core/InputCommon/CMakeLists.txt +++ b/Source/Core/InputCommon/CMakeLists.txt @@ -15,11 +15,15 @@ if(WIN32) ControllerInterface/XInput/XInput.cpp ControllerInterface/ForceFeedback/ForceFeedbackDevice.cpp) elseif(${CMAKE_SYSTEM_NAME} MATCHES "Darwin") + FIND_LIBRARY(COREFOUNDATION_LIBRARY CoreFoundation) + FIND_LIBRARY(CARBON_LIBRARY Carbon) + FIND_LIBRARY(COCOA_LIBRARY Cocoa) set(SRCS ${SRCS} ControllerInterface/OSX/OSX.mm ControllerInterface/OSX/OSXKeyboard.mm ControllerInterface/OSX/OSXJoystick.mm ControllerInterface/ForceFeedback/ForceFeedbackDevice.cpp) + set(LIBS ${LIBS} ${COREFOUNDATION_LIBRARY} ${CARBON_LIBRARY} ${COCOA_LIBRARY}) elseif(X11_FOUND) set(SRCS ${SRCS} ControllerInterface/Xlib/Xlib.cpp) diff --git a/Source/Core/VideoBackends/OGL/CMakeLists.txt b/Source/Core/VideoBackends/OGL/CMakeLists.txt index 431feb9d54..61229651b6 100644 --- a/Source/Core/VideoBackends/OGL/CMakeLists.txt +++ b/Source/Core/VideoBackends/OGL/CMakeLists.txt @@ -24,10 +24,6 @@ if(USE_EGL) EGL) endif() -if(wxWidgets_FOUND) - set(LIBS ${LIBS} ${wxWidgets_LIBRARIES}) -endif(wxWidgets_FOUND) - if(${CMAKE_SYSTEM_NAME} MATCHES "FreeBSD" OR ${CMAKE_SYSTEM_NAME} MATCHES "NetBSD") set(LIBS ${LIBS} usbhid) diff --git a/Source/Core/VideoBackends/OGL/OGL.vcxproj b/Source/Core/VideoBackends/OGL/OGL.vcxproj index d770fbfa05..637ea43676 100644 --- a/Source/Core/VideoBackends/OGL/OGL.vcxproj +++ b/Source/Core/VideoBackends/OGL/OGL.vcxproj @@ -98,9 +98,6 @@ - - {1c8436c9-dbaf-42be-83bc-cf3ec9175abe} - {ff213b23-2c26-4214-9f88-85271e557e87} diff --git a/Source/Core/VideoBackends/Software/CMakeLists.txt b/Source/Core/VideoBackends/Software/CMakeLists.txt index b12ade865c..089261adcc 100644 --- a/Source/Core/VideoBackends/Software/CMakeLists.txt +++ b/Source/Core/VideoBackends/Software/CMakeLists.txt @@ -21,10 +21,9 @@ set(SRCS BPMemLoader.cpp SWVideoConfig.cpp XFMemLoader.cpp) -set(LIBS videocommon - SOIL - common - ${X11_LIBRARIES} - ${wxWidgets_LIBRARIES}) +set(LIBS videocommon + SOIL + common + ${X11_LIBRARIES}) add_dolphin_library(videosoftware "${SRCS}" "${LIBS}") diff --git a/Source/Core/VideoBackends/Software/Software.vcxproj b/Source/Core/VideoBackends/Software/Software.vcxproj index d0322a124d..4fa9e6971c 100644 --- a/Source/Core/VideoBackends/Software/Software.vcxproj +++ b/Source/Core/VideoBackends/Software/Software.vcxproj @@ -88,9 +88,6 @@ - - {1c8436c9-dbaf-42be-83bc-cf3ec9175abe} - {3de9ee35-3e91-4f27-a014-2866ad8c3fe3} diff --git a/Source/Core/VideoCommon/CMakeLists.txt b/Source/Core/VideoCommon/CMakeLists.txt index ff5ee72dcb..df783cac0e 100644 --- a/Source/Core/VideoCommon/CMakeLists.txt +++ b/Source/Core/VideoCommon/CMakeLists.txt @@ -50,10 +50,6 @@ if(NOT ${CL} STREQUAL CL-NOTFOUND) list(APPEND LIBS ${CL}) endif() -if(wxWidgets_FOUND AND WIN32) - set(SRCS ${SRCS} EmuWindow.cpp) -endif() - if(LIBAV_FOUND OR WIN32) set(SRCS ${SRCS} AVIDump.cpp) endif()