BRNSystems/irrlicht
1
0
Fork 0
forked from Mirrorlandia_minetest/irrlicht
Code Pull Requests Activity

Enable XInput2 by default (and improve CMake detection)

Browse Source 
closes #73
This commit is contained in:
sfan5 2022-07-18 21:34:47 +02:00
parent 538c9e5cde
commit 91edd214aa
3 changed files with 8 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
.github/workflows/build.yml vendored
View File

@ -14,7 +14,7 @@ jobs:
- name: Install deps - name: Install deps
run: | run: |
sudo apt-get update sudo apt-get update
sudo apt-get install g++ cmake libxxf86vm-dev libgl1-mesa-dev libpng-dev libjpeg-dev zlib1g-dev -qyy sudo apt-get install g++ cmake libxi-dev libgl1-mesa-dev libpng-dev libjpeg-dev zlib1g-dev -qyy
- name: Build - name: Build
run: | run: |
@ -38,7 +38,7 @@ jobs:
- name: Install deps - name: Install deps
run: | run: |
sudo apt-get update sudo apt-get update
sudo apt-get install g++ cmake libxxf86vm-dev libgles2-mesa-dev libpng-dev libjpeg-dev zlib1g-dev xvfb -qyy sudo apt-get install g++ cmake libxi-dev libgles2-mesa-dev libpng-dev libjpeg-dev zlib1g-dev xvfb -qyy
- name: Build - name: Build
run: | run: |

1
include/IrrCompileConfig.h
View File

@ -274,6 +274,7 @@ define out. */
#if defined(_IRR_LINUX_PLATFORM_) && defined(_IRR_COMPILE_WITH_X11_) #if defined(_IRR_LINUX_PLATFORM_) && defined(_IRR_COMPILE_WITH_X11_)
//! XInput2 (library called Xi) is currently only used to support touch-input. //! XInput2 (library called Xi) is currently only used to support touch-input.
#define _IRR_LINUX_X11_XINPUT2_
#ifdef NO_IRR_LINUX_X11_XINPUT2_ #ifdef NO_IRR_LINUX_X11_XINPUT2_
#undef _IRR_LINUX_X11_XINPUT2_ #undef _IRR_LINUX_X11_XINPUT2_
#endif #endif

10
source/Irrlicht/CMakeLists.txt
View File

@ -77,11 +77,8 @@ if(OGL_ENABLED)
set(OpenGL_GL_PREFERENCE "LEGACY") set(OpenGL_GL_PREFERENCE "LEGACY")
find_package(OpenGL REQUIRED) find_package(OpenGL REQUIRED)
endif() endif()
if(NOT ANDROID AND NOT APPLE) if(UNIX AND NOT ANDROID AND NOT APPLE)
check_symbol_exists(_IRR_LINUX_X11_XINPUT2_ "IrrCompileConfig.h" XINPUT2_ENABLED) check_symbol_exists(_IRR_LINUX_X11_XINPUT2_ "IrrCompileConfig.h" XINPUT2_ENABLED)
if(XINPUT2_ENABLED)
find_library(XINPUT_LIBRARY Xi REQUIRED)
endif()
endif() endif()
check_symbol_exists(_IRR_COMPILE_WITH_SDL_DEVICE_ "IrrCompileConfig.h" SDL_ENABLED) check_symbol_exists(_IRR_COMPILE_WITH_SDL_DEVICE_ "IrrCompileConfig.h" SDL_ENABLED)
if(SDL_ENABLED) if(SDL_ENABLED)
@ -102,6 +99,9 @@ elseif(APPLE)
else() else()
# Unix probably # Unix probably
find_package(X11 REQUIRED) find_package(X11 REQUIRED)
if(XINPUT2_ENABLED AND NOT X11_Xi_FOUND)
message(FATAL_ERROR "XInput not found")
endif()
endif() endif()
set(link_includes set(link_includes
@ -131,7 +131,6 @@ set(link_libs
${OPENGLES_LIBRARY} ${OPENGLES_LIBRARY}
${OPENGLES2_LIBRARIES} ${OPENGLES2_LIBRARIES}
${EGL_LIBRARY} ${EGL_LIBRARY}
${XINPUT_LIBRARY}
"$<$<PLATFORM_ID:Android>:native_app_glue -landroid -llog>" "$<$<PLATFORM_ID:Android>:native_app_glue -landroid -llog>"
${COCOA_LIB} ${COCOA_LIB}
@ -139,6 +138,7 @@ set(link_libs
"$<$<PLATFORM_ID:Windows>:gdi32>" "$<$<PLATFORM_ID:Windows>:gdi32>"
"$<$<PLATFORM_ID:Windows>:winmm>" "$<$<PLATFORM_ID:Windows>:winmm>"
${X11_X11_LIB} ${X11_X11_LIB}
${X11_Xi_LIB}
) )
# Source files # Source files