From 9cd2e9ec8fc0127393dfce9c0359d500c8c238be Mon Sep 17 00:00:00 2001
From: Edward Rudd <urkle@outoforder.cc>
Date: Tue, 09 Apr 2019 02:22:50 +0000
Subject: [PATCH] updae source to 2.0.9 source
---
source/cmake/sdlchecks.cmake | 58 +++++++++++++++++++---------------------------------------
1 files changed, 19 insertions(+), 39 deletions(-)
diff --git a/source/cmake/sdlchecks.cmake b/source/cmake/sdlchecks.cmake
index b822c7a..4a2c3ed 100644
--- a/source/cmake/sdlchecks.cmake
+++ b/source/cmake/sdlchecks.cmake
@@ -381,9 +381,21 @@
FindLibraryAndSONAME("${_LIB}")
endforeach()
- find_path(X_INCLUDEDIR X11/Xlib.h)
+ find_path(X_INCLUDEDIR X11/Xlib.h
+ /usr/pkg/xorg/include
+ /usr/X11R6/include
+ /usr/X11R7/include
+ /usr/local/include/X11
+ /usr/include/X11
+ /usr/openwin/include
+ /usr/openwin/share/include
+ /opt/graphics/OpenGL/include
+ /opt/X11/include
+ )
+
if(X_INCLUDEDIR)
- set(X_CFLAGS "-I${X_INCLUDEDIR}")
+ list(APPEND EXTRA_CFLAGS "-I${X_INCLUDEDIR}")
+ list(APPEND CMAKE_REQUIRED_INCLUDES "${X_INCLUDEDIR}")
endif()
check_include_file(X11/Xcursor/Xcursor.h HAVE_XCURSOR_H)
@@ -420,7 +432,7 @@
endif()
if(NOT HAVE_SHMAT)
add_definitions(-DNO_SHARED_MEMORY)
- set(X_CFLAGS "${X_CFLAGS} -DNO_SHARED_MEMORY")
+ list(APPEND EXTRA_CFLAGS "-DNO_SHARED_MEMORY")
endif()
endif()
@@ -438,8 +450,6 @@
list(APPEND EXTRA_LIBS ${X11_LIB} ${XEXT_LIB})
endif()
endif()
-
- set(SDL_CFLAGS "${SDL_CFLAGS} ${X_CFLAGS}")
set(CMAKE_REQUIRED_LIBRARIES ${X11_LIB} ${X11_LIB})
check_c_source_compiles("
@@ -625,35 +635,6 @@
if(VIDEO_WAYLAND)
pkg_check_modules(WAYLAND wayland-client wayland-scanner wayland-protocols wayland-egl wayland-cursor egl xkbcommon)
- # We have to generate some protocol interface code for some various Wayland features.
- if(WAYLAND_FOUND)
- execute_process(
- COMMAND ${PKG_CONFIG_EXECUTABLE} --variable=pkgdatadir wayland-client
- WORKING_DIRECTORY "${CMAKE_CURRENT_BINARY_DIR}"
- RESULT_VARIABLE WAYLAND_CORE_PROTOCOL_DIR_RC
- OUTPUT_VARIABLE WAYLAND_CORE_PROTOCOL_DIR
- ERROR_QUIET
- OUTPUT_STRIP_TRAILING_WHITESPACE
- )
- if(NOT WAYLAND_CORE_PROTOCOL_DIR_RC EQUAL 0)
- set(WAYLAND_FOUND FALSE)
- endif()
- endif()
-
- if(WAYLAND_FOUND)
- execute_process(
- COMMAND ${PKG_CONFIG_EXECUTABLE} --variable=pkgdatadir wayland-protocols
- WORKING_DIRECTORY "${CMAKE_CURRENT_BINARY_DIR}"
- RESULT_VARIABLE WAYLAND_PROTOCOLS_DIR_RC
- OUTPUT_VARIABLE WAYLAND_PROTOCOLS_DIR
- ERROR_QUIET
- OUTPUT_STRIP_TRAILING_WHITESPACE
- )
- if(NOT WAYLAND_PROTOCOLS_DIR_RC EQUAL 0)
- set(WAYLAND_FOUND FALSE)
- endif()
- endif()
-
if(WAYLAND_FOUND)
execute_process(
COMMAND ${PKG_CONFIG_EXECUTABLE} --variable=wayland_scanner wayland-scanner
@@ -685,11 +666,10 @@
file(MAKE_DIRECTORY "${CMAKE_CURRENT_BINARY_DIR}/wayland-generated-protocols")
include_directories("${CMAKE_CURRENT_BINARY_DIR}/wayland-generated-protocols")
- WaylandProtocolGen("${WAYLAND_SCANNER}" "${WAYLAND_CORE_PROTOCOL_DIR}/wayland.xml" "wayland")
-
- foreach(_PROTL relative-pointer-unstable-v1 pointer-constraints-unstable-v1 xdg-shell-unstable-v6)
- string(REGEX REPLACE "\\-unstable\\-.*$" "" PROTSUBDIR ${_PROTL})
- WaylandProtocolGen("${WAYLAND_SCANNER}" "${WAYLAND_PROTOCOLS_DIR}/unstable/${PROTSUBDIR}/${_PROTL}.xml" "${_PROTL}")
+ file(GLOB WAYLAND_PROTOCOLS_XML RELATIVE "${SDL2_SOURCE_DIR}/wayland-protocols/" "${SDL2_SOURCE_DIR}/wayland-protocols/*.xml")
+ foreach(_XML ${WAYLAND_PROTOCOLS_XML})
+ string(REGEX REPLACE "\\.xml$" "" _PROTL "${_XML}")
+ WaylandProtocolGen("${WAYLAND_SCANNER}" "${SDL2_SOURCE_DIR}/wayland-protocols/${_XML}" "${_PROTL}")
endforeach()
if(VIDEO_WAYLAND_QT_TOUCH)
--
Gitblit v1.9.3