Merge up

[factor.git] / Nmakefile

diff --git a/Nmakefile b/Nmakefile
index 07984e35c82bfdf6b4df6d0f501de862b388709b..7457ea43be11dbe2801414fbeae8a6fbbb8f1dd1 100755 (executable)
--- a/Nmakefile
+++ b/Nmakefile
@@ -1,88 +1,88 @@
-!IF DEFINED(DEBUG)\r
-LINK_FLAGS = /nologo /DEBUG shell32.lib\r
-CL_FLAGS = /nologo /Zi /O2 /W3 /DFACTOR_DEBUG\r
-!ELSE\r
-LINK_FLAGS = /nologo shell32.lib\r
-CL_FLAGS = /nologo /O2 /W3\r
-!ENDIF\r
-\r
-EXE_OBJS = factor.dll.lib vm\main-windows-nt.obj vm\factor.res\r
-\r
-DLL_OBJS = vm\os-windows-nt.obj \\r
-       vm\os-windows.obj \\r
-       vm\aging_collector.obj \\r
-       vm\alien.obj \\r
-       vm\arrays.obj \\r
-       vm\bignum.obj \\r
-       vm\booleans.obj \\r
-       vm\byte_arrays.obj \\r
-       vm\callbacks.obj \\r
-       vm\callstack.obj \\r
-       vm\code_blocks.obj \\r
-       vm\code_heap.obj \\r
-       vm\compaction.obj \\r
-       vm\contexts.obj \\r
-       vm\data_heap.obj \\r
-       vm\data_heap_checker.obj \\r
-       vm\debug.obj \\r
-       vm\dispatch.obj \\r
-       vm\entry_points.obj \\r
-       vm\errors.obj \\r
-       vm\factor.obj \\r
-       vm\free_list.obj \\r
-       vm\full_collector.obj \\r
-       vm\gc.obj \\r
-       vm\image.obj \\r
-       vm\inline_cache.obj \\r
-       vm\instruction_operands.obj \\r
-       vm\io.obj \\r
-       vm\jit.obj \\r
-       vm\math.obj \\r
-       vm\nursery_collector.obj \\r
-       vm\object_start_map.obj \\r
-       vm\objects.obj \\r
-       vm\primitives.obj \\r
-       vm\profiler.obj \\r
-       vm\quotations.obj \\r
-       vm\run.obj \\r
-       vm\strings.obj \\r
-       vm\to_tenured_collector.obj \\r
-       vm\tuples.obj \\r
-       vm\utilities.obj \\r
-        vm\vm.obj \\r
-       vm\words.obj\r
-\r
-.cpp.obj:\r
-       cl /EHsc $(CL_FLAGS) /Fo$@ /c $<\r
-\r
-.c.obj:\r
-       cl $(CL_FLAGS) /Fo$@ /c $<\r
-\r
-.rs.res:\r
-       rc $<\r
-\r
-all: factor.com factor.exe\r
-\r
-libfactor-ffi-test.dll: vm/ffi_test.obj\r
-       link $(LINK_FLAGS) /out:libfactor-ffi-test.dll /dll vm/ffi_test.obj\r
-\r
-factor.dll.lib: $(DLL_OBJS)\r
-       link $(LINK_FLAGS) /implib:factor.dll.lib /out:factor.dll /dll $(DLL_OBJS)\r
-\r
-factor.com: $(EXE_OBJS)\r
-       link $(LINK_FLAGS) /out:factor.com /SUBSYSTEM:console $(EXE_OBJS)\r
-\r
-factor.exe: $(EXE_OBJS)\r
-       link $(LINK_FLAGS) /out:factor.exe /SUBSYSTEM:windows $(EXE_OBJS)\r
-\r
-clean:\r
-       del vm\*.obj\r
-       del factor.lib\r
-       del factor.com\r
-       del factor.exe\r
-       del factor.dll\r
-       del factor.dll.lib\r
-\r
-.PHONY: all clean\r
-\r
-.SUFFIXES: .rs\r
+!IF DEFINED(DEBUG)
+LINK_FLAGS = /nologo /DEBUG shell32.lib
+CL_FLAGS = /nologo /Zi /O2 /W3 /DFACTOR_DEBUG
+!ELSE
+LINK_FLAGS = /nologo shell32.lib
+CL_FLAGS = /nologo /O2 /W3
+!ENDIF
+
+EXE_OBJS = factor.dll.lib vm\main-windows-nt.obj vm\factor.res
+
+DLL_OBJS = vm\os-windows-nt.obj \
+       vm\os-windows.obj \
+       vm\aging_collector.obj \
+       vm\alien.obj \
+       vm\arrays.obj \
+       vm\bignum.obj \
+       vm\booleans.obj \
+       vm\byte_arrays.obj \
+       vm\callbacks.obj \
+       vm\callstack.obj \
+       vm\code_blocks.obj \
+       vm\code_heap.obj \
+       vm\compaction.obj \
+       vm\contexts.obj \
+       vm\data_heap.obj \
+       vm\data_heap_checker.obj \
+       vm\debug.obj \
+       vm\dispatch.obj \
+       vm\entry_points.obj \
+       vm\errors.obj \
+       vm\factor.obj \
+       vm\free_list.obj \
+       vm\full_collector.obj \
+       vm\gc.obj \
+       vm\image.obj \
+       vm\inline_cache.obj \
+       vm\instruction_operands.obj \
+       vm\io.obj \
+       vm\jit.obj \
+       vm\math.obj \
+       vm\nursery_collector.obj \
+       vm\object_start_map.obj \
+       vm\objects.obj \
+       vm\primitives.obj \
+       vm\profiler.obj \
+       vm\quotations.obj \
+       vm\run.obj \
+       vm\strings.obj \
+       vm\to_tenured_collector.obj \
+       vm\tuples.obj \
+       vm\utilities.obj \
+        vm\vm.obj \
+       vm\words.obj
+
+.cpp.obj:
+       cl /EHsc $(CL_FLAGS) /Fo$@ /c $<
+
+.c.obj:
+       cl $(CL_FLAGS) /Fo$@ /c $<
+
+.rs.res:
+       rc $<
+
+all: factor.com factor.exe
+
+libfactor-ffi-test.dll: vm/ffi_test.obj
+       link $(LINK_FLAGS) /out:libfactor-ffi-test.dll /dll vm/ffi_test.obj
+
+factor.dll.lib: $(DLL_OBJS)
+       link $(LINK_FLAGS) /implib:factor.dll.lib /out:factor.dll /dll $(DLL_OBJS)
+
+factor.com: $(EXE_OBJS)
+       link $(LINK_FLAGS) /out:factor.com /SUBSYSTEM:console $(EXE_OBJS)
+
+factor.exe: $(EXE_OBJS)
+       link $(LINK_FLAGS) /out:factor.exe /SUBSYSTEM:windows $(EXE_OBJS)
+
+clean:
+       del vm\*.obj
+       del factor.lib
+       del factor.com
+       del factor.exe
+       del factor.dll
+       del factor.dll.lib
+
+.PHONY: all clean
+
+.SUFFIXES: .rs