diff --git a/.github/workflows/windows.yml b/.github/workflows/windows.yml index 7f2b9f0..b6a28ee 100644 --- a/.github/workflows/windows.yml +++ b/.github/workflows/windows.yml @@ -43,7 +43,8 @@ jobs: - name: Apply makefile common patch working-directory: ./openFrameworks/libs/openFrameworksCompiled/project/makefileCommon run: | - sed -i 's+\$(foreach var_line, \$(subst $(space),\?,\$(shell cat \$(addon)/addon_config.mk | tr \'\n\' \'\t\')),+\$(foreach var_line, \$(shell cat \$(addon)/addon_config.mk | tr \'\n \' \'\t?\'),+g' config.addons.mk + function sedeasy { sed -i "s/$(echo $1 | sed -e 's/\([[\/.*]\|\]\)/\\&/g')/$(echo $2 | sed -e 's/[\/&]/\\&/g')/g" $3 } + sedeasy "$(foreach var_line, $(subst $(space),?,$(shell cat $(addon)/addon_config.mk | tr '\n' '\t'))," "$(foreach var_line, $(shell cat $(addon)/addon_config.mk | tr '\n ' '\t?')," config.addons.mk - name: Compile openFrameworks working-directory: ./openFrameworks/scripts/msys2 run: ./compileOF.sh