| James Kuszmaul | b13e13f | 2023-11-22 20:44:04 -0800 | [diff] [blame] | 1 | From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 |
| James Kuszmaul | cf32412 | 2023-01-14 14:07:17 -0800 | [diff] [blame] | 2 | From: PJ Reiniger <pj.reiniger@gmail.com> |
| 3 | Date: Sat, 29 Oct 2022 12:16:36 -0400 |
| James Kuszmaul | b13e13f | 2023-11-22 20:44:04 -0800 | [diff] [blame] | 4 | Subject: [PATCH 2/4] Update amalgamation script |
| James Kuszmaul | cf32412 | 2023-01-14 14:07:17 -0800 | [diff] [blame] | 5 | |
| 6 | --- |
| 7 | tools/amalgamate.sh | 4 ++-- |
| 8 | 1 file changed, 2 insertions(+), 2 deletions(-) |
| 9 | |
| 10 | diff --git a/tools/amalgamate.sh b/tools/amalgamate.sh |
| James Kuszmaul | b13e13f | 2023-11-22 20:44:04 -0800 | [diff] [blame] | 11 | index 2e24e278e54bbc52967bfe1f8970f4f8d4b238d5..4dfe999ee49ee67fd394e948b0bb3133d6acdbdc 100755 |
| James Kuszmaul | cf32412 | 2023-01-14 14:07:17 -0800 | [diff] [blame] | 12 | --- a/tools/amalgamate.sh |
| 13 | +++ b/tools/amalgamate.sh |
| 14 | @@ -74,8 +74,8 @@ echo -e "#endif\n" >> $HEADER |
| 15 | |
| 16 | # assemble source |
| 17 | echo -e "#define MPACK_INTERNAL 1" >> $SOURCE |
| 18 | -echo -e "#define MPACK_EMIT_INLINE_DEFS 1\n" >> $SOURCE |
| 19 | -echo -e "#include \"mpack.h\"\n" >> $SOURCE |
| 20 | +echo -e "#define MPACK_EMIT_INLINE_DEFS 0\n" >> $SOURCE |
| 21 | +echo -e "#include \"wpi/mpack.h\"\n" >> $SOURCE |
| 22 | for f in $SOURCES; do |
| 23 | echo -e "\n/* $f.c */" >> $SOURCE |
| 24 | sed -e 's@^#include ".*@/* & */@' -e '0,/^ \*\/$/d' src/$f >> $SOURCE |