From: Krzysztof Mrozowicz Date: Fri, 18 Jun 2021 22:08:59 +0000 (+0000) Subject: - added openttd-create-grf.patch X-Git-Tag: auto/th/openttd-1.11.2-1 X-Git-Url: http://git.pld-linux.org/gitweb.cgi?a=commitdiff_plain;h=cf831dadda6b946a91bdbdfbf1df0d3a68082a2f;p=packages%2Fopenttd.git - added openttd-create-grf.patch --- diff --git a/openttd-create-grf.patch b/openttd-create-grf.patch new file mode 100644 index 0000000..0a13c86 --- /dev/null +++ b/openttd-create-grf.patch @@ -0,0 +1,25 @@ +--- openttd-1.11.2/cmake/scripts/CreateGRF.cmake~ 2021-05-03 18:41:45.000000000 +0000 ++++ openttd-1.11.2/cmake/scripts/CreateGRF.cmake 2021-06-10 15:09:20.570503949 +0000 +@@ -39,20 +39,7 @@ + endif() + endforeach() + +-execute_process(COMMAND ${NFORENUM_EXECUTABLE} -s sprites/${GRF_SOURCE_FOLDER_NAME}.nfo RESULT_VARIABLE RESULT) +-if(RESULT) +- if(NOT RESULT MATCHES "^[0-9]*$") +- message(FATAL_ERROR "Failed to run NFORenum (${RESULT}), please check NFORENUM_EXECUTABLE variable") +- endif() +- message(FATAL_ERROR "NFORenum failed") +-endif() +- +-execute_process(COMMAND ${GRFCODEC_EXECUTABLE} -n -s -e -p1 ${GRF_SOURCE_FOLDER_NAME}.grf RESULT_VARIABLE RESULT) +-if(RESULT) +- if(NOT RESULT MATCHES "^[0-9]*$") +- message(FATAL_ERROR "Failed to run GRFCodec (${RESULT}), please check GRFCODEC_EXECUTABLE variable") +- endif() +- message(FATAL_ERROR "GRFCodec failed") +-endif() ++execute_process(COMMAND ${NFORENUM_EXECUTABLE} -s sprites/${GRF_SOURCE_FOLDER_NAME}.nfo) ++execute_process(COMMAND ${GRFCODEC_EXECUTABLE} -n -s -e -p1 ${GRF_SOURCE_FOLDER_NAME}.grf) + + execute_process(COMMAND ${CMAKE_COMMAND} -E copy ${GRF_SOURCE_FOLDER_NAME}.grf ${GRF_BINARY_FILE})