gnu/packages/patches/supertux-unbundle-squirrel.patch

   1 diff -ur a/CMakeLists.txt b/CMakeLists.txt
   2 --- a/CMakeLists.txt    2019-05-24 17:58:19.693090158 -0400
   3 +++ b/CMakeLists.txt    2019-05-24 17:57:43.349473252 -0400
   4 @@ -375,44 +375,15 @@
   5
   6  include(ConfigureChecks)
   7
   8 -
   9 -## Also build external/squirrel
  10 -
  11 -if(NOT EXISTS ${CMAKE_CURRENT_SOURCE_DIR}/external/squirrel/CMakeLists.txt)
  12 -  message(FATAL_ERROR "squirrel submodule is not checked out or ${CMAKE_CURRENT_SOURCE_DIR}/external/squirrel/CMakeLists.txt is missing")
  13 -endif()
  14 -
  15  set(SQUIRREL_PREFIX ${CMAKE_BINARY_DIR}/squirrel/ex)
  16 -ExternalProject_Add(squirrel
  17 -  SOURCE_DIR "${CMAKE_SOURCE_DIR}/external/squirrel/"
  18 -  CMAKE_ARGS
  19 -  -DCMAKE_BUILD_TYPE=${CMAKE_BUILD_TYPE}
  20 -  -DCMAKE_C_COMPILER=${CMAKE_C_COMPILER}
  21 -  -DCMAKE_C_FLAGS=${CMAKE_C_FLAGS}
  22 -  -DCMAKE_CXX_COMPILER=${CMAKE_CXX_COMPILER}
  23 -  -DCMAKE_CXX_FLAGS=${CMAKE_CXX_FLAGS}
  24 -  -DCMAKE_INSTALL_PREFIX=${SQUIRREL_PREFIX}
  25 -  -DINSTALL_INC_DIR=include)
  26 -
  27 -if(WIN32)
  28 -  add_library(squirrel_lib SHARED IMPORTED)
  29 -  set_target_properties(squirrel_lib PROPERTIES IMPORTED_LOCATION "${SQUIRREL_PREFIX}/bin/${CMAKE_SHARED_LIBRARY_PREFIX}squirrel${CMAKE_SHARED_LIBRARY_SUFFIX}")
  30 -  set_target_properties(squirrel_lib PROPERTIES IMPORTED_IMPLIB "${SQUIRREL_PREFIX}/lib/squirrel${CMAKE_LINK_LIBRARY_SUFFIX}")
  31 -  add_library(sqstdlib_lib SHARED IMPORTED)
  32 -  set_target_properties(sqstdlib_lib PROPERTIES IMPORTED_LOCATION "${SQUIRREL_PREFIX}/bin/${CMAKE_SHARED_LIBRARY_PREFIX}sqstdlib${CMAKE_SHARED_LIBRARY_SUFFIX}")
  33 -  set_target_properties(sqstdlib_lib PROPERTIES IMPORTED_IMPLIB "${SQUIRREL_PREFIX}/lib/sqstdlib${CMAKE_LINK_LIBRARY_SUFFIX}")
  34 -
  35 -  #For debug run purposes
  36 -  configure_file("${CMAKE_CURRENT_SOURCE_DIR}/mk/msvc/run_supertux.bat.in" "${PROJECT_BINARY_DIR}/run_supertux.bat")
  37 -else()
  38 -  add_library(squirrel_lib STATIC IMPORTED)
  39 -  set_target_properties(squirrel_lib PROPERTIES IMPORTED_LOCATION "${SQUIRREL_PREFIX}/lib/${CMAKE_STATIC_LIBRARY_PREFIX}squirrel_static${CMAKE_STATIC_LIBRARY_SUFFIX}")
  40 -  add_library(sqstdlib_lib STATIC IMPORTED)
  41 -  set_target_properties(sqstdlib_lib PROPERTIES IMPORTED_LOCATION "${SQUIRREL_PREFIX}/lib/${CMAKE_STATIC_LIBRARY_PREFIX}sqstdlib_static${CMAKE_STATIC_LIBRARY_SUFFIX}")
  42 -endif()
  43
  44  include_directories(SYSTEM ${SQUIRREL_PREFIX}/include)
  45
  46 +add_library(squirrel_lib SHARED IMPORTED)
  47 +set_target_properties(squirrel_lib PROPERTIES IMPORTED_LOCATION "${SQUIRREL_PREFIX}/lib/${CMAKE_SHARED_LIBRARY_PREFIX}squirrel${CMAKE_SHARED_LIBRARY_SUFFIX}")
  48 +add_library(sqstdlib_lib SHARED IMPORTED)
  49 +set_target_properties(sqstdlib_lib PROPERTIES IMPORTED_LOCATION "${SQUIRREL_PREFIX}/lib/${CMAKE_SHARED_LIBRARY_PREFIX}sqstdlib${CMAKE_SHARED_LIBRARY_SUFFIX}")
  50 +
  51  ## Also build external/tinygettext
  52
  53  if(NOT EXISTS ${CMAKE_CURRENT_SOURCE_DIR}/external/tinygettext/CMakeLists.txt)