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) /markup.scm?id=f443f5b0cd77cbbfa70cd915b4082ce32340127e'>gnu: Add perl-text-markdown....* gnu/packages/markup.scm (perl-text-markdown): New variable. Change-Id: Ibeaa8d3959e4ddea15650c97f5ca598c3cc8c60a Janneke Nieuwenhuizen 2024-04-16gnu: Add latexml....* gnu/packages/markup.scm (latexml): New variable. Reviewed-by: Steve George <steve@futurile.net> Change-Id: If7199a8b74b990ad29718adcb905a5ed31882cf5 Signed-off-by: Christopher Baines <mail@cbaines.net> Nicolas Graves via Guix-patches via 2024-03-31gnu: python-mistletoe: Update to 1.3.0....* gnu/packages/markup.scm (python-mistletoe): Update to 1.3.0. [build-system]: Use pyproject-build-system. [arguments]: Do not override the check phase, skip one test in #:test-flags. [native-inputs]: Add python-parameterized, python-pytest. Change-Id: If25e3cbe19d8936d150c830f1b8f4ce8f8cb5692 Vinicius Monego 2024-03-09gnu: cmark: Update to 0.31.0....* gnu/packages/markup.scm (cmark): Update to 0.31.0. Change-Id: Ie9890dec34400e2c4b11f20e2dc67aa5dc111574 Signed-off-by: 宋文武 <iyzsong@member.fsf.org> Skylar Chan