diff --git a/Samples/SharedLibrary/CMakeLists.txt b/Samples/SharedLibrary/CMakeLists.txt index ca02b32921..4effec394a 100644 --- a/Samples/SharedLibrary/CMakeLists.txt +++ b/Samples/SharedLibrary/CMakeLists.txt @@ -52,12 +52,16 @@ add_custom_command( # Step 4: Combine the PEF data fork with a resource fork containing a cfrg resource: +if (REZ_INCLUDE_PATH) + set(REZ_INCLUDE_FLAG -I${REZ_INCLUDE_PATH}) +endif() + add_custom_command( OUTPUT Library.bin Library Library.dsk Library.ad "%Library.ad" COMMAND ${REZ} ${REZ_FLAGS} ${CMAKE_CURRENT_SOURCE_DIR}/library.r - -I${REZ_INCLUDE_PATH} + ${REZ_INCLUDE_FLAG} -o "Library.bin" --cc "Library.dsk" --cc "Library" --cc "%Library.ad" -t "shlb" -c "????" diff --git a/cmake/add_application.cmake b/cmake/add_application.cmake index 1a723dc286..dc7f2a1c29 100644 --- a/cmake/add_application.cmake +++ b/cmake/add_application.cmake @@ -93,7 +93,7 @@ function(add_application name) OUTPUT ${name}.bin ${name}.APPL ${name}.dsk ${name}.ad "%${name}.ad" COMMAND ${REZ} ${REZ_FLAGS} ${REZ_TEMPLATES_PATH}/Retro68APPL.r - -I${REZ_INCLUDE_PATH} + ${rez_include_options} --copy "${name}.code.bin" -o "${name}.bin" -t "${ARGS_TYPE}" -c "${ARGS_CREATOR}" @@ -120,7 +120,7 @@ function(add_application name) COMMAND ${REZ} ${REZ_FLAGS} ${REZ_TEMPLATE} - -I${REZ_INCLUDE_PATH} + ${rez_include_options} -DCFRAG_NAME="\\"${name}\\"" -o "${name}.bin" --cc "${name}.dsk" --cc "${name}.APPL" --cc "%${name}.ad"