Archive/portal64-still-alive
1
0
Fork 0
mirror of https://github.com/mwpenny/portal64-still-alive.git synced 2024-10-19 22:27:36 -04:00
Code Issues Actions Packages Projects Releases Wiki Activity

Fix incorrect variable name for Python executable in CMake build

Browse source
This commit is contained in:
Matt Penny 2024-10-05 02:04:39 -04:00
parent e1e6a53aa6
commit 9643719a31
1 changed files with 3 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
assets/materials/CMakeLists.txt
View file

@ -244,7 +244,7 @@ function(_add_texture_transform_command TEXTURE_SCRIPT OUTPUT_LIST)
COMMAND COMMAND
${CMAKE_COMMAND} -E make_directory ${OUTPUT_DIR} ${CMAKE_COMMAND} -E make_directory ${OUTPUT_DIR}
COMMAND COMMAND
${Python3_EXECUTABLE} ${CONVERT_ASSET} ${PYTHON3} ${CONVERT_ASSET}
${IMAGEMAGICK_CONVERT} ${INPUT_FILE} ${TEXTURE_SCRIPT} ${OUTPUT_FILE} ${IMAGEMAGICK_CONVERT} ${INPUT_FILE} ${TEXTURE_SCRIPT} ${OUTPUT_FILE}
WORKING_DIRECTORY WORKING_DIRECTORY
# TODO: Change this to PAK_MODIFIED_MATERIALS_DIR and update .ims files with relative path # TODO: Change this to PAK_MODIFIED_MATERIALS_DIR and update .ims files with relative path
@ -419,7 +419,8 @@ function(_add_material_generate_command INPUT_FILE OUTPUT_LIST)
${SKELETOOL64} ${SKELETOOL64}
--name ${MATERIAL_NAME} --name ${MATERIAL_NAME}
-m ${INPUT_FILE} -m ${INPUT_FILE}
--material-output -o ${OUTPUT_FILE_H} --material-output
--output ${OUTPUT_FILE_H}
COMMENT COMMENT
"Generating materials for $<PATH:RELATIVE_PATH,${INPUT_FILE},${PROJECT_SOURCE_DIR}>" "Generating materials for $<PATH:RELATIVE_PATH,${INPUT_FILE},${PROJECT_SOURCE_DIR}>"
VERBATIM VERBATIM