Fix conflict from master

[factor.git] / Makefile

diff --git a/Makefile b/Makefile
index c19d83e58efa63f5416a67c804dd0c27a7f373f4..a346bdfa0ab81e2fe3a2c4f0c69c009f2f866e5b 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -36,6 +36,7 @@ DLL_OBJS = $(PLAF_DLL_OBJS) \
        vm/data_gc.o \
        vm/data_heap.o \
        vm/debug.o \
+       vm/dispatch.o \
        vm/errors.o \
        vm/factor.o \
        vm/image.o \
@@ -183,5 +184,5 @@ vm/ffi_test.o: vm/ffi_test.c
 
 .m.o:
        $(CC) -c $(CFLAGS) -o $@ $<
-       
+
 .PHONY: factor