haiwan
/
Sod
0
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

chore: resolve merge conflict

Browse Source
main
Sean McBride 4 years ago
parent 5d9da0b611
commit 8df9f4d8a3
1 changed files with 1 additions and 1 deletions
Show Stats Download Patch File Download Diff File

2
Makefile.wasm.inc
Unescape View File

@ -15,7 +15,7 @@ MEMC_MPX=mpx.c
MEMC_SEG=segmented.c MEMC_SEG=segmented.c
# for silverfish # for silverfish
RT_DIR=${BASE_DIR}/runtime/ RT_DIR=${BASE_DIR}/awsm/runtime/
RT_MEM=${RT_DIR}/memory/ RT_MEM=${RT_DIR}/memory/
RT_LIBC=${RT_DIR}/libc/libc_backing.c RT_LIBC=${RT_DIR}/libc/libc_backing.c
RT_RT=${RT_DIR}/runtime.c RT_RT=${RT_DIR}/runtime.c

Write Preview
Loading…
Cancel
Save