The-Homebrew-Cloud/dolphin
2
0
Fork 0
mirror of https://github.com/dolphin-emu/dolphin.git synced 2025-01-27 00:05:34 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #1455 from lioncash/dammit-wxwidgeeeeeets

Browse Source 
VideoCommon{Backends}: Remove unnecessary wxWidgets references.
This commit is contained in:
Lioncash 2014-11-01 22:29:18 -04:00
commit b6b7b823c3
6 changed files with 8 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
Source/Core/InputCommon/CMakeLists.txt
View File

@ -15,11 +15,15 @@ if(WIN32)
ControllerInterface/XInput/XInput.cpp ControllerInterface/XInput/XInput.cpp
ControllerInterface/ForceFeedback/ForceFeedbackDevice.cpp) ControllerInterface/ForceFeedback/ForceFeedbackDevice.cpp)
elseif(${CMAKE_SYSTEM_NAME} MATCHES "Darwin") elseif(${CMAKE_SYSTEM_NAME} MATCHES "Darwin")
FIND_LIBRARY(COREFOUNDATION_LIBRARY CoreFoundation)
FIND_LIBRARY(CARBON_LIBRARY Carbon)
FIND_LIBRARY(COCOA_LIBRARY Cocoa)
set(SRCS ${SRCS} set(SRCS ${SRCS}
ControllerInterface/OSX/OSX.mm ControllerInterface/OSX/OSX.mm
ControllerInterface/OSX/OSXKeyboard.mm ControllerInterface/OSX/OSXKeyboard.mm
ControllerInterface/OSX/OSXJoystick.mm ControllerInterface/OSX/OSXJoystick.mm
ControllerInterface/ForceFeedback/ForceFeedbackDevice.cpp) ControllerInterface/ForceFeedback/ForceFeedbackDevice.cpp)
set(LIBS ${LIBS} ${COREFOUNDATION_LIBRARY} ${CARBON_LIBRARY} ${COCOA_LIBRARY})
elseif(X11_FOUND) elseif(X11_FOUND)
set(SRCS ${SRCS} set(SRCS ${SRCS}
ControllerInterface/Xlib/Xlib.cpp) ControllerInterface/Xlib/Xlib.cpp)

4
Source/Core/VideoBackends/OGL/CMakeLists.txt
View File

@ -24,10 +24,6 @@ if(USE_EGL)
EGL) EGL)
endif() endif()
if(wxWidgets_FOUND)
set(LIBS ${LIBS} ${wxWidgets_LIBRARIES})
endif(wxWidgets_FOUND)
if(${CMAKE_SYSTEM_NAME} MATCHES "FreeBSD" OR if(${CMAKE_SYSTEM_NAME} MATCHES "FreeBSD" OR
${CMAKE_SYSTEM_NAME} MATCHES "NetBSD") ${CMAKE_SYSTEM_NAME} MATCHES "NetBSD")
set(LIBS ${LIBS} usbhid) set(LIBS ${LIBS} usbhid)

3
Source/Core/VideoBackends/OGL/OGL.vcxproj
View File

@ -98,9 +98,6 @@
<Text Include="CMakeLists.txt" /> <Text Include="CMakeLists.txt" />
</ItemGroup> </ItemGroup>
<ItemGroup> <ItemGroup>
<ProjectReference Include="$(ExternalsDir)wxWidgets3\build\msw\wx_base.vcxproj">
<Project>{1c8436c9-dbaf-42be-83bc-cf3ec9175abe}</Project>
</ProjectReference>
<ProjectReference Include="$(ExternalsDir)zlib\zlib.vcxproj"> <ProjectReference Include="$(ExternalsDir)zlib\zlib.vcxproj">
<Project>{ff213b23-2c26-4214-9f88-85271e557e87}</Project> <Project>{ff213b23-2c26-4214-9f88-85271e557e87}</Project>
</ProjectReference> </ProjectReference>

9
Source/Core/VideoBackends/Software/CMakeLists.txt
View File

@ -21,10 +21,9 @@ set(SRCS BPMemLoader.cpp
SWVideoConfig.cpp SWVideoConfig.cpp
XFMemLoader.cpp) XFMemLoader.cpp)
set(LIBS videocommon set(LIBS videocommon
SOIL SOIL
common common
${X11_LIBRARIES} ${X11_LIBRARIES})
${wxWidgets_LIBRARIES})
add_dolphin_library(videosoftware "${SRCS}" "${LIBS}") add_dolphin_library(videosoftware "${SRCS}" "${LIBS}")

3
Source/Core/VideoBackends/Software/Software.vcxproj
View File

@ -88,9 +88,6 @@
<Text Include="CMakeLists.txt" /> <Text Include="CMakeLists.txt" />
</ItemGroup> </ItemGroup>
<ItemGroup> <ItemGroup>
<ProjectReference Include="$(ExternalsDir)wxWidgets3\build\msw\wx_base.vcxproj">
<Project>{1c8436c9-dbaf-42be-83bc-cf3ec9175abe}</Project>
</ProjectReference>
<ProjectReference Include="$(CoreDir)VideoCommon\VideoCommon.vcxproj"> <ProjectReference Include="$(CoreDir)VideoCommon\VideoCommon.vcxproj">
<Project>{3de9ee35-3e91-4f27-a014-2866ad8c3fe3}</Project> <Project>{3de9ee35-3e91-4f27-a014-2866ad8c3fe3}</Project>
</ProjectReference> </ProjectReference>

4
Source/Core/VideoCommon/CMakeLists.txt
View File

@ -50,10 +50,6 @@ if(NOT ${CL} STREQUAL CL-NOTFOUND)
list(APPEND LIBS ${CL}) list(APPEND LIBS ${CL})
endif() endif()
if(wxWidgets_FOUND AND WIN32)
set(SRCS ${SRCS} EmuWindow.cpp)
endif()
if(LIBAV_FOUND OR WIN32) if(LIBAV_FOUND OR WIN32)
set(SRCS ${SRCS} AVIDump.cpp) set(SRCS ${SRCS} AVIDump.cpp)
endif() endif()