Fix conflict

[factor.git] / Makefile

diff --git a/Makefile b/Makefile
index 6aee3e329df38352f8084559496d16260c086863..e5229ef7dfb562cfeb4a676b7718f40a1926ef0c 100755 (executable)
--- a/Makefile
+++ b/Makefile
@@ -39,7 +39,7 @@ DLL_OBJS = $(PLAF_DLL_OBJS) \
        vm/byte_arrays.o \
        vm/callbacks.o \
        vm/callstack.o \
-       vm/code_block.o \
+       vm/code_blocks.o \
        vm/code_heap.o \
        vm/compaction.o \
        vm/contexts.o \
@@ -47,6 +47,7 @@ DLL_OBJS = $(PLAF_DLL_OBJS) \
        vm/data_heap_checker.o \
        vm/debug.o \
        vm/dispatch.o \
+       vm/embedded_pointers.o \
        vm/errors.o \
        vm/factor.o \
        vm/free_list.o \