From: Petteri Aimonen Date: Sat, 25 Feb 2017 15:14:39 +0000 (+0200) Subject: Windows build fix X-Git-Tag: 3.99.1~14^2~22 X-Git-Url: https://gerrit.automotivelinux.org/gerrit/gitweb?a=commitdiff_plain;h=b5abefc25d033f7e12e369f5c664f1f0efaf398b;p=apps%2Flow-level-can-service.git Windows build fix --- diff --git a/tests/alltypes_callback/SConscript b/tests/alltypes_callback/SConscript index 1cef397..8be5390 100644 --- a/tests/alltypes_callback/SConscript +++ b/tests/alltypes_callback/SConscript @@ -22,6 +22,7 @@ env.RunTest("optionals.refdecout", [refdec, "optionals.output"], ARGS = ['1']) env.RunTest("optionals.decout", [dec, "optionals.output"], ARGS = ['1']) # Try with malloc support also -mallocbin = malloc_env.Object("decode_with_malloc.o", "decode_alltypes_callback.c") -mallocdec = malloc_env.Program("decode_with_malloc", [mallocbin, "alltypes.pb.o", "$COMMON/pb_decode_with_malloc.o", "$COMMON/pb_common_with_malloc.o", "$COMMON/malloc_wrappers.o"]) +mallocbin1 = malloc_env.Object("decode_with_malloc.o", "decode_alltypes_callback.c") +mallocbin2 = malloc_env.Object("alltypes_malloc.pb.o", "alltypes.pb.c") +mallocdec = malloc_env.Program("decode_with_malloc", [mallocbin1, mallocbin2, "$COMMON/pb_decode_with_malloc.o", "$COMMON/pb_common_with_malloc.o", "$COMMON/malloc_wrappers.o"]) env.RunTest("decode_with_malloc.output", [mallocdec, "encode_alltypes_callback.output"])