Macintosh-Tools
/
Retro68
mirror of https://github.com/autc04/Retro68.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

make SIZE resource overriding work again

This commit is contained in:
Wolfgang Thaller 2018-01-09 00:29:02 +01:00
parent 5639d39ae7
commit 7f8a62f686
1 changed files with 8 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
cmake/add_application.cmake
View File

@ -55,8 +55,14 @@ function(add_application name)
set_target_properties(${name} PROPERTIES LINKER_LANGUAGE CXX)
endif()
foreach(f ${rsrc_files})
list(APPEND ARGS_MAKEAPPL_ARGS "--copy" "${f}")
foreach(f ${rsrc_files})
# DO NOT add --copy here.
# The files in rsrc_files are guaranteed to be .rsrc or .rsrc.bin, so they
# will be recognized by Rez.
# Currently, the --copy flag has the side effect that Rez processes all --copy inputs
# before other inputs, so this messes up the overriding mechanics, leading to the wrong SIZE resource
# being included. (duplicate resources shouldn't be replaced silently, and overriding should be explicit...)
list(APPEND ARGS_MAKEAPPL_ARGS "${f}")
endforeach()
if(NOT ARGS_TYPE)