mirror of
https://github.com/wpilibsuite/allwpilib
synced 2026-06-20 00:51:42 +00:00
25 lines
882 B
Diff
25 lines
882 B
Diff
|
From d4d045c843d4b4de747d800e570c32cff3759a80 Mon Sep 17 00:00:00 2001
|
||
|
|
From: PJ Reiniger <pj.reiniger@gmail.com>
|
||
|
|
Date: Sat, 29 Oct 2022 12:16:36 -0400
|
||
|
|
Subject: [PATCH 2/3] Update amalgamation script
|
||
|
|
|
||
|
|
---
|
||
|
|
tools/amalgamate.sh | 4 ++--
|
||
|
|
1 file changed, 2 insertions(+), 2 deletions(-)
|
||
|
|
|
||
|
|
diff --git a/tools/amalgamate.sh b/tools/amalgamate.sh
|
||
|
|
index 2e24e27..4dfe999 100755
|
||
|
|
--- a/tools/amalgamate.sh
|
||
|
|
+++ b/tools/amalgamate.sh
|
||
|
|
@@ -74,8 +74,8 @@ echo -e "#endif\n" >> $HEADER
|
||
|
|
|
||
|
|
# assemble source
|
||
|
|
echo -e "#define MPACK_INTERNAL 1" >> $SOURCE
|
||
|
|
-echo -e "#define MPACK_EMIT_INLINE_DEFS 1\n" >> $SOURCE
|
||
|
|
-echo -e "#include \"mpack.h\"\n" >> $SOURCE
|
||
|
|
+echo -e "#define MPACK_EMIT_INLINE_DEFS 0\n" >> $SOURCE
|
||
|
|
+echo -e "#include \"wpi/mpack.h\"\n" >> $SOURCE
|
||
|
|
for f in $SOURCES; do
|
||
|
|
echo -e "\n/* $f.c */" >> $SOURCE
|
||
|
|
sed -e 's@^#include ".*@/* & */@' -e '0,/^ \*\/$/d' src/$f >> $SOURCE
|