piwalker/dolphin
1
0
Fork 0
mirror of https://github.com/dolphin-emu/dolphin.git synced 2025-06-28 01:49:33 -06:00
Code Issues Packages Projects Releases Wiki Activity

GCAdapter: Merge GCAdapter.cpp and GCAdapter_Android.cpp

Browse Source 
This is mostly a brainless merge, #ifdef-ing anything that doesn't match between the two while preserving common logic.  I didn't rename any variables (although similar ones do exist), but I did change one log that was ERROR on android and NOTICE elsewhere to just always be NOTICE.  Further merging will follow.
This commit is contained in:
Pokechu22
2022-04-19 14:41:13 -07:00
parent f7f47d3cd0
commit dd6592698e
3 changed files with 292 additions and 440 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1,6 +1,8 @@
add_library(inputcommon
DynamicInputTextureManager.cpp
DynamicInputTextureManager.h
GCAdapter.cpp
GCAdapter.h
ImageOperations.cpp
ImageOperations.h
InputConfig.cpp
@ -143,13 +145,7 @@ elseif(ANDROID)
)
endif()
if(ANDROID)
target_sources(inputcommon PRIVATE GCAdapter_Android.cpp)
else()
target_sources(inputcommon PRIVATE
GCAdapter.cpp
GCAdapter.h
)
if(NOT ANDROID)
target_link_libraries(inputcommon PUBLIC ${LIBUSB_LIBRARIES})
endif()