openttd-create-grf.patch

   1 --- openttd-1.11.2/cmake/scripts/CreateGRF.cmake~       2021-05-03 18:41:45.000000000 +0000
   2 +++ openttd-1.11.2/cmake/scripts/CreateGRF.cmake        2021-06-10 15:09:20.570503949 +0000
   3 @@ -39,20 +39,7 @@
   4      endif()
   5  endforeach()
   6
   7 -execute_process(COMMAND ${NFORENUM_EXECUTABLE} -s sprites/${GRF_SOURCE_FOLDER_NAME}.nfo RESULT_VARIABLE RESULT)
   8 -if(RESULT)
   9 -    if(NOT RESULT MATCHES "^[0-9]*$")
  10 -        message(FATAL_ERROR "Failed to run NFORenum (${RESULT}), please check NFORENUM_EXECUTABLE variable")
  11 -    endif()
  12 -    message(FATAL_ERROR "NFORenum failed")
  13 -endif()
  14 -
  15 -execute_process(COMMAND ${GRFCODEC_EXECUTABLE} -n -s -e -p1 ${GRF_SOURCE_FOLDER_NAME}.grf RESULT_VARIABLE RESULT)
  16 -if(RESULT)
  17 -    if(NOT RESULT MATCHES "^[0-9]*$")
  18 -        message(FATAL_ERROR "Failed to run GRFCodec (${RESULT}), please check GRFCODEC_EXECUTABLE variable")
  19 -    endif()
  20 -    message(FATAL_ERROR "GRFCodec failed")
  21 -endif()
  22 +execute_process(COMMAND ${NFORENUM_EXECUTABLE} -s sprites/${GRF_SOURCE_FOLDER_NAME}.nfo)
  23 +execute_process(COMMAND ${GRFCODEC_EXECUTABLE} -n -s -e -p1 ${GRF_SOURCE_FOLDER_NAME}.grf)
  24
  25  execute_process(COMMAND ${CMAKE_COMMAND} -E copy ${GRF_SOURCE_FOLDER_NAME}.grf ${GRF_BINARY_FILE})