Macintosh-Tools/Retro68
1
0
Fork 0
mirror of https://github.com/autc04/Retro68.git synced 2024-11-28 05:51:04 +00:00
Code Issues Projects Releases Wiki Activity

fixes to add_application: rsrc files can now come from binary directory as well

Browse Source
This commit is contained in:
Wolfgang Thaller 2018-01-06 03:04:51 +01:00
parent 2aed6b69f9
commit 3d791de14e
1 changed files with 12 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
cmake/add_application.cmake
View File

@ -28,15 +28,18 @@ function(add_application name)
add_custom_command( add_custom_command(
OUTPUT ${f}.rsrc.bin OUTPUT ${f}.rsrc.bin
COMMAND ${REZ} ${REZ_FLAGS} ${CMAKE_CURRENT_SOURCE_DIR}/${f} -I ${REZ_INCLUDE_PATH} -o ${f}.rsrc.bin COMMAND ${REZ} ${REZ_FLAGS} ${CMAKE_CURRENT_SOURCE_DIR}/${f} -I ${REZ_INCLUDE_PATH} -o ${f}.rsrc.bin
DEPENDS ${CMAKE_CURRENT_SOURCE_DIR}/${f}) DEPENDS ${CMAKE_CURRENT_SOURCE_DIR}/${f})
list(APPEND rsrc_files "${CMAKE_CURRENT_BINARY_DIR}/${f}.rsrc.bin") list(APPEND rsrc_files "${CMAKE_CURRENT_BINARY_DIR}/${f}.rsrc.bin")
list(APPEND rez_files "${f}") list(APPEND rez_files "${f}")
elseif(${f} MATCHES "\\.rsrc$") elseif(${f} MATCHES "\\.rsrc$")
list(APPEND rsrc_files "${CMAKE_CURRENT_SOURCE_DIR}/${f}") get_filename_component(abspath "${f}" ABSOLUTE)
list(APPEND rsrc_files "${abspath}")
elseif(${f} MATCHES "\\.rsrc.bin$") elseif(${f} MATCHES "\\.rsrc.bin$")
list(APPEND rsrc_files "${CMAKE_CURRENT_SOURCE_DIR}/${f}") get_filename_component(abspath "${f}" ABSOLUTE)
else() list(APPEND rsrc_files "${abspath}")
list(APPEND files "${CMAKE_CURRENT_SOURCE_DIR}/${f}") else()
get_filename_component(abspath "${f}" ABSOLUTE)
list(APPEND files "${abspath}")
endif() endif()
endforeach() endforeach()
@ -53,7 +56,7 @@ function(add_application name)
endif() endif()
foreach(f ${rsrc_files}) foreach(f ${rsrc_files})
list(APPEND ARGS_MAKEAPPL_ARGS "${f}") list(APPEND ARGS_MAKEAPPL_ARGS "--copy" "${f}")
endforeach() endforeach()
if(NOT ARGS_TYPE) if(NOT ARGS_TYPE)
@ -80,7 +83,7 @@ function(add_application name)
--copy "${name}.code.bin" --copy "${name}.code.bin"
-o "${name}.bin" -o "${name}.bin"
--cc "${name}.dsk" --cc "${name}.APPL" --cc "%${name}.ad" --cc "${name}.dsk" --cc "${name}.APPL" --cc "%${name}.ad"
-t ${ARGS_TYPE} -c ${ARGS_CREATOR} -t '${ARGS_TYPE}' -c '${ARGS_CREATOR}'
${ARGS_MAKEAPPL_ARGS} ${ARGS_MAKEAPPL_ARGS}
DEPENDS ${name} ${rsrc_files}) DEPENDS ${name} ${rsrc_files})
add_custom_target(${name}_APPL ALL DEPENDS ${name}.bin) add_custom_target(${name}_APPL ALL DEPENDS ${name}.bin)
@ -109,7 +112,7 @@ function(add_application name)
-DCFRAG_NAME="\\"${name}\\"" -DCFRAG_NAME="\\"${name}\\""
-o "${name}.bin" --cc "${name}.dsk" --cc "${name}.APPL" -o "${name}.bin" --cc "${name}.dsk" --cc "${name}.APPL"
--cc "%${name}.ad" --cc "%${name}.ad"
-t ${ARGS_TYPE} -c ${ARGS_CREATOR} -t '${ARGS_TYPE}' -c '${ARGS_CREATOR}'
--data ${name}.pef --data ${name}.pef
${ARGS_MAKEAPPL_ARGS} ${ARGS_MAKEAPPL_ARGS}
DEPENDS ${name}.pef ${rsrc_files}) DEPENDS ${name}.pef ${rsrc_files})