diff options
| author | Kei Kebreau <kkebreau@posteo.net> | 2019-05-24 20:50:31 -0400 |
|---|---|---|
| committer | Kei Kebreau <kkebreau@posteo.net> | 2019-05-24 21:00:15 -0400 |
| commit | 8698d986db21d6399fb57f1af1e38d6223bf9b92 (patch) | |
| tree | 815c3736f860bfb6402ebc0f03aafd0d455f0a4c /gnu/packages/patches/supertux-unbundle-squirrel.patch | |
| parent | 608d148c50962bc217b6481f60507873801464cf (diff) | |
| download | guix-patches-8698d986db21d6399fb57f1af1e38d6223bf9b92.tar guix-patches-8698d986db21d6399fb57f1af1e38d6223bf9b92.tar.gz | |
gnu: supertux: Update to 0.6.0.
* gnu/packages/games.scm (supertux): Update to 0.6.0.
[source]: Add patches.
[arguments]: Add -DUSE_SYSTEM_PHYSFS=ON. Add 'patch-squirrel-path' phase.
[inputs]: Add freetype and squirrel.
* gnu/packages/patches/supertux-fix-build-with-gcc5.patch,
gnu/packages/patches/supertux-unbundle-squirrel.patch: New files.
* gnu/local.mk (dist_patch_DATA): Add them.
Diffstat (limited to 'gnu/packages/patches/supertux-unbundle-squirrel.patch')
| -rw-r--r-- | gnu/packages/patches/supertux-unbundle-squirrel.patch | 53 |
1 files changed, 53 insertions, 0 deletions
diff --git a/gnu/packages/patches/supertux-unbundle-squirrel.patch b/gnu/packages/patches/supertux-unbundle-squirrel.patch new file mode 100644 index 0000000000..054183b75f --- /dev/null +++ b/gnu/packages/patches/supertux-unbundle-squirrel.patch @@ -0,0 +1,53 @@ +diff -ur a/CMakeLists.txt b/CMakeLists.txt +--- a/CMakeLists.txt 2019-05-24 17:58:19.693090158 -0400 ++++ b/CMakeLists.txt 2019-05-24 17:57:43.349473252 -0400 +@@ -375,44 +375,15 @@ + + include(ConfigureChecks) + +- +-## Also build external/squirrel +- +-if(NOT EXISTS ${CMAKE_CURRENT_SOURCE_DIR}/external/squirrel/CMakeLists.txt) +- message(FATAL_ERROR "squirrel submodule is not checked out or ${CMAKE_CURRENT_SOURCE_DIR}/external/squirrel/CMakeLists.txt is missing") +-endif() +- + set(SQUIRREL_PREFIX ${CMAKE_BINARY_DIR}/squirrel/ex) +-ExternalProject_Add(squirrel +- SOURCE_DIR "${CMAKE_SOURCE_DIR}/external/squirrel/" +- CMAKE_ARGS +- -DCMAKE_BUILD_TYPE=${CMAKE_BUILD_TYPE} +- -DCMAKE_C_COMPILER=${CMAKE_C_COMPILER} +- -DCMAKE_C_FLAGS=${CMAKE_C_FLAGS} +- -DCMAKE_CXX_COMPILER=${CMAKE_CXX_COMPILER} +- -DCMAKE_CXX_FLAGS=${CMAKE_CXX_FLAGS} +- -DCMAKE_INSTALL_PREFIX=${SQUIRREL_PREFIX} +- -DINSTALL_INC_DIR=include) +- +-if(WIN32) +- add_library(squirrel_lib SHARED IMPORTED) +- set_target_properties(squirrel_lib PROPERTIES IMPORTED_LOCATION "${SQUIRREL_PREFIX}/bin/${CMAKE_SHARED_LIBRARY_PREFIX}squirrel${CMAKE_SHARED_LIBRARY_SUFFIX}") +- set_target_properties(squirrel_lib PROPERTIES IMPORTED_IMPLIB "${SQUIRREL_PREFIX}/lib/squirrel${CMAKE_LINK_LIBRARY_SUFFIX}") +- add_library(sqstdlib_lib SHARED IMPORTED) +- set_target_properties(sqstdlib_lib PROPERTIES IMPORTED_LOCATION "${SQUIRREL_PREFIX}/bin/${CMAKE_SHARED_LIBRARY_PREFIX}sqstdlib${CMAKE_SHARED_LIBRARY_SUFFIX}") +- set_target_properties(sqstdlib_lib PROPERTIES IMPORTED_IMPLIB "${SQUIRREL_PREFIX}/lib/sqstdlib${CMAKE_LINK_LIBRARY_SUFFIX}") +- +- #For debug run purposes +- configure_file("${CMAKE_CURRENT_SOURCE_DIR}/mk/msvc/run_supertux.bat.in" "${PROJECT_BINARY_DIR}/run_supertux.bat") +-else() +- add_library(squirrel_lib STATIC IMPORTED) +- set_target_properties(squirrel_lib PROPERTIES IMPORTED_LOCATION "${SQUIRREL_PREFIX}/lib/${CMAKE_STATIC_LIBRARY_PREFIX}squirrel_static${CMAKE_STATIC_LIBRARY_SUFFIX}") +- add_library(sqstdlib_lib STATIC IMPORTED) +- set_target_properties(sqstdlib_lib PROPERTIES IMPORTED_LOCATION "${SQUIRREL_PREFIX}/lib/${CMAKE_STATIC_LIBRARY_PREFIX}sqstdlib_static${CMAKE_STATIC_LIBRARY_SUFFIX}") +-endif() + + include_directories(SYSTEM ${SQUIRREL_PREFIX}/include) + ++add_library(squirrel_lib SHARED IMPORTED) ++set_target_properties(squirrel_lib PROPERTIES IMPORTED_LOCATION "${SQUIRREL_PREFIX}/lib/${CMAKE_SHARED_LIBRARY_PREFIX}squirrel${CMAKE_SHARED_LIBRARY_SUFFIX}") ++add_library(sqstdlib_lib SHARED IMPORTED) ++set_target_properties(sqstdlib_lib PROPERTIES IMPORTED_LOCATION "${SQUIRREL_PREFIX}/lib/${CMAKE_SHARED_LIBRARY_PREFIX}sqstdlib${CMAKE_SHARED_LIBRARY_SUFFIX}") ++ + ## Also build external/tinygettext + + if(NOT EXISTS ${CMAKE_CURRENT_SOURCE_DIR}/external/tinygettext/CMakeLists.txt) |