Windows build fix
authorPetteri Aimonen <jpa@git.mail.kapsi.fi>
Sat, 25 Feb 2017 15:14:39 +0000 (17:14 +0200)
committerPetteri Aimonen <jpa@git.mail.kapsi.fi>
Sat, 25 Feb 2017 15:14:39 +0000 (17:14 +0200)
tests/alltypes_callback/SConscript

index 1cef397..8be5390 100644 (file)
@@ -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"])