Skip to content

ogc: use embedded-game-controller as input backend #131

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
mardy wants to merge 1 commit into
base: ogc-sdl-2.28
Choose a base branch
from
Open

ogc: use embedded-game-controller as input backend #131

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 7 additions & 1 deletion CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2949,8 +2949,11 @@ elseif(OGC)
list(APPEND EXTRA_LIBS "fat")
endif()
list(APPEND EXTRA_LDFLAGS "${OGC_ARCH_SETTINGS} ${OGC_LINKER_FLAGS}")
pkg_search_module(EGC embedded-game-controller REQUIRED IMPORTED_TARGET)
list(APPEND EXTRA_LIBS "${EGC_LIBRARIES}")
target_include_directories(sdl-build-options INTERFACE ${EGC_INCLUDE_DIRS})
if(NINTENDO_WII)
list(APPEND EXTRA_LIBS "wiiuse;bte;wiikeyboard")
list(APPEND EXTRA_LIBS "wiikeyboard")
endif()
list(APPEND EXTRA_LIBS "ogc;m")
endif()
Expand Down Expand Up @@ -3398,6 +3401,9 @@ if(NOT WINDOWS_STORE AND NOT SDL2_DISABLE_SDL2MAIN)
if (NOT ANDROID)
set_target_properties(SDL2main PROPERTIES DEBUG_POSTFIX "${SDL_CMAKE_DEBUG_POSTFIX}")
endif()
if(OGC)
target_include_directories(SDL2main PRIVATE ${EGC_INCLUDE_DIRS})
endif()
set_property(TARGET SDL2main APPEND PROPERTY COMPATIBLE_INTERFACE_STRING "SDL_VERSION")
set_property(TARGET SDL2main PROPERTY INTERFACE_SDL_VERSION "SDL2")
endif()
Expand Down
Loading
Loading