256e096683
Won't build on openSUSE 13.1 unless new glew is linked to the games prj. - Require qlew >= 1.10 as per upstream readme - Unbundle wiiuse too: * supertuxkart-no-undefined.patch * supertuxkart-unbundle-wiiuse.patch - Update to use %cmake macro and obey no-undefined/etc rules we have in SUSE - Apply patches to unbundle various broken things: * supertuxkart-irrlicht.patch * supertuxkart-no-undefined.patch * supertuxkart-system-enet-glew.patch OBS-URL: https://build.opensuse.org/request/show/307346 OBS-URL: https://build.opensuse.org/package/show/games/supertuxkart?expand=0&rev=62
129 lines
3.5 KiB
Diff
129 lines
3.5 KiB
Diff
diff -uNr supertuxkart-0.9.orig/cmake/FindWiiUse.cmake supertuxkart-0.9/cmake/FindWiiUse.cmake
|
|
--- supertuxkart-0.9.orig/cmake/FindWiiUse.cmake 1970-01-01 03:00:00.000000000 +0300
|
|
+++ supertuxkart-0.9/cmake/FindWiiUse.cmake 2015-04-23 12:53:36.498155119 +0300
|
|
@@ -0,0 +1,99 @@
|
|
+# - try to find WiiUse library
|
|
+#
|
|
+# Cache Variables: (probably not for direct use in your scripts)
|
|
+# WIIUSE_INCLUDE_DIR
|
|
+# WIIUSE_LIBRARY
|
|
+#
|
|
+# Non-cache variables you might use in your CMakeLists.txt:
|
|
+# WIIUSE_FOUND
|
|
+# WIIUSE_INCLUDE_DIRS
|
|
+# WIIUSE_LIBRARIES
|
|
+# WIIUSE_RUNTIME_LIBRARIES - aka the dll for installing
|
|
+# WIIUSE_RUNTIME_LIBRARY_DIRS
|
|
+#
|
|
+# Requires these CMake modules:
|
|
+# FindPackageHandleStandardArgs (known included with CMake >=2.6.2)
|
|
+#
|
|
+# Original Author:
|
|
+# 2009-2010 Ryan Pavlik <rpavlik@iastate.edu> <abiryan@ryand.net>
|
|
+# http://academic.cleardefinition.com
|
|
+# Iowa State University HCI Graduate Program/VRAC
|
|
+#
|
|
+# Copyright Iowa State University 2009-2010.
|
|
+# Distributed under the Boost Software License, Version 1.0.
|
|
+# (See accompanying file LICENSE_1_0.txt or copy at
|
|
+# http://www.boost.org/LICENSE_1_0.txt)
|
|
+
|
|
+set(WIIUSE_ROOT_DIR
|
|
+ "${WIIUSE_ROOT_DIR}"
|
|
+ CACHE
|
|
+ PATH
|
|
+ "Directory to search for WiiUse")
|
|
+
|
|
+if(CMAKE_SIZEOF_VOID_P MATCHES "8")
|
|
+ set(_LIBSUFFIXES /lib64 /lib)
|
|
+else()
|
|
+ set(_LIBSUFFIXES /lib)
|
|
+endif()
|
|
+
|
|
+find_library(WIIUSE_LIBRARY
|
|
+ NAMES
|
|
+ wiiuse
|
|
+ PATHS
|
|
+ "${WIIUSE_ROOT_DIR}"
|
|
+ PATH_SUFFIXES
|
|
+ "${_LIBSUFFIXES}")
|
|
+
|
|
+get_filename_component(_libdir "${WIIUSE_LIBRARY}" PATH)
|
|
+
|
|
+find_path(WIIUSE_INCLUDE_DIR
|
|
+ NAMES
|
|
+ wiiuse.h
|
|
+ HINTS
|
|
+ "${_libdir}"
|
|
+ "${_libdir}/.."
|
|
+ PATHS
|
|
+ "${WIIUSE_ROOT_DIR}"
|
|
+ PATH_SUFFIXES
|
|
+ include/)
|
|
+
|
|
+set(_deps_check)
|
|
+if(WIN32)
|
|
+ find_file(WIIUSE_RUNTIME_LIBRARY
|
|
+ NAMES
|
|
+ wiiuse.dll
|
|
+ HINTS
|
|
+ "${_libdir}"
|
|
+ "${_libdir}/.."
|
|
+ PATH_SUFFIXES
|
|
+ bin)
|
|
+
|
|
+ set(WIIUSE_RUNTIME_LIBRARIES "${WIIUSE_RUNTIME_LIBRARY}")
|
|
+ get_filename_component(WIIUSE_RUNTIME_LIBRARY_DIRS
|
|
+ "${WIIUSE_RUNTIME_LIBRARY}"
|
|
+ PATH)
|
|
+ list(APPEND _deps_check WIIUSE_RUNTIME_LIBRARY)
|
|
+else()
|
|
+ set(WIIUSE_RUNTIME_LIBRARY "${WIIUSE_LIBRARY}")
|
|
+ set(WIIUSE_RUNTIME_LIBRARIES "${WIIUSE_RUNTIME_LIBRARY}")
|
|
+ get_filename_component(WIIUSE_RUNTIME_LIBRARY_DIRS
|
|
+ "${WIIUSE_LIBRARY}"
|
|
+ PATH)
|
|
+endif()
|
|
+
|
|
+include(FindPackageHandleStandardArgs)
|
|
+find_package_handle_standard_args(WiiUse
|
|
+ DEFAULT_MSG
|
|
+ WIIUSE_LIBRARY
|
|
+ WIIUSE_INCLUDE_DIR
|
|
+ ${_deps_check})
|
|
+
|
|
+if(WIIUSE_FOUND)
|
|
+ set(WIIUSE_LIBRARIES "${WIIUSE_LIBRARY}")
|
|
+ set(WIIUSE_INCLUDE_DIRS "${WIIUSE_INCLUDE_DIR}")
|
|
+ mark_as_advanced(WIIUSE_ROOT_DIR)
|
|
+endif()
|
|
+
|
|
+mark_as_advanced(WIIUSE_INCLUDE_DIR
|
|
+ WIIUSE_LIBRARY
|
|
+ WIIUSE_RUNTIME_LIBRARY)
|
|
diff -uNr supertuxkart-0.9.orig/CMakeLists.txt supertuxkart-0.9/CMakeLists.txt
|
|
--- supertuxkart-0.9.orig/CMakeLists.txt 2015-04-21 14:32:11.300162506 +0300
|
|
+++ supertuxkart-0.9/CMakeLists.txt 2015-04-23 12:53:36.497155090 +0300
|
|
@@ -104,10 +104,9 @@
|
|
# (at least on VS) irrlicht will find wiiuse io.h file because
|
|
# of the added include directory.
|
|
if(USE_WIIUSE)
|
|
- if(WIIUSE_BUILD)
|
|
- add_subdirectory("${PROJECT_SOURCE_DIR}/lib/wiiuse")
|
|
- endif()
|
|
include_directories("${PROJECT_SOURCE_DIR}/lib/wiiuse")
|
|
+ find_package(WiiUse REQUIRED)
|
|
+ include_directories(${WIIUSE_INCLUDE_DIR})
|
|
endif()
|
|
|
|
# Set include paths
|
|
@@ -358,7 +357,7 @@
|
|
target_link_libraries(supertuxkart ${PROJECT_SOURCE_DIR}/dependencies/lib/wiiuse.lib)
|
|
endif()
|
|
else()
|
|
- target_link_libraries(supertuxkart wiiuse bluetooth)
|
|
+ target_link_libraries(supertuxkart ${WIIUSE_LIBRARIES})
|
|
endif()
|
|
add_definitions(-DENABLE_WIIUSE)
|
|
|