Windows: Add two new targets, x86-32-vista and x86-64-vista for bjourne's

[factor.git] / Nmakefile

diff --git a/Nmakefile b/Nmakefile
index c6f24da08a5182f4c494953adb1e263076c84514..02dbfd4fa981f1cad874a4a1b662cf8a59682164 100755 (executable)
--- a/Nmakefile
+++ b/Nmakefile
@@ -6,22 +6,33 @@ BOOTIMAGE_VERSION = latest
 
 LINK_FLAGS = /nologo shell32.lib
 CL_FLAGS = /nologo /O2 /WX /W3 /D_CRT_SECURE_NO_WARNINGS
-
-!IF DEFINED(DEBUG)
-LINK_FLAGS = $(LINK_FLAGS) /DEBUG
-CL_FLAGS = $(CL_FLAGS) /Zi /DFACTOR_DEBUG
-!ENDIF
+CL_FLAGS_VISTA = /D_WIN32_WINNT=0x0600
 
 !IF "$(PLATFORM)" == "x86-32"
 LINK_FLAGS = $(LINK_FLAGS) /safeseh
-PLAF_DLL_OBJS = vm\os-windows-x86.32.obj vm\safeseh.obj
+PLAF_DLL_OBJS = vm\os-windows-x86.32.obj vm\safeseh.obj vm\cpu-x86.obj
+
+!ELSEIF "$(PLATFORM)" == "x86-32-vista"
+LINK_FLAGS = $(LINK_FLAGS) /safeseh
+CL_FLAGS = $(CL_FLAGS) $(CL_FLAGS_VISTA)
+PLAF_DLL_OBJS = vm\os-windows-x86.32.obj vm\safeseh.obj vm\cpu-x86.obj
+
 !ELSEIF "$(PLATFORM)" == "x86-64"
-PLAF_DLL_OBJS = vm\os-windows-x86.64.obj
+PLAF_DLL_OBJS = vm\os-windows-x86.64.obj vm\cpu-x86.obj
+
+!ELSEIF "$(PLATFORM)" == "x86-64-vista"
+CL_FLAGS = $(CL_FLAGS) $(CL_FLAGS_VISTA)
+PLAF_DLL_OBJS = vm\os-windows-x86.64.obj vm\cpu-x86.obj
+!ENDIF
+
+!IF DEFINED(DEBUG)
+LINK_FLAGS = $(LINK_FLAGS) /DEBUG
+CL_FLAGS = $(CL_FLAGS) /Zi /DFACTOR_DEBUG
 !ENDIF
 
 ML_FLAGS = /nologo /safeseh
 
-EXE_OBJS = vm/main-windows.obj vm\factor.res
+EXE_OBJS = vm\main-windows.obj vm\factor.res
 
 DLL_OBJS = $(PLAF_DLL_OBJS) \
        vm\os-windows.obj \
@@ -29,7 +40,6 @@ DLL_OBJS = $(PLAF_DLL_OBJS) \
        vm\alien.obj \
        vm\arrays.obj \
        vm\bignum.obj \
-       vm\booleans.obj \
        vm\byte_arrays.obj \
        vm\callbacks.obj \
        vm\callstack.obj \
@@ -60,9 +70,10 @@ DLL_OBJS = $(PLAF_DLL_OBJS) \
        vm\object_start_map.obj \
        vm\objects.obj \
        vm\primitives.obj \
-       vm\profiler.obj \
        vm\quotations.obj \
        vm\run.obj \
+       vm\safepoints.obj \
+       vm\sampling_profiler.obj \
        vm\strings.obj \
        vm\to_tenured_collector.obj \
        vm\tuples.obj \
@@ -103,6 +114,8 @@ default:
        @echo Where platform is one of:
        @echo x86-32
        @echo x86-64
+       @echo x86-32-vista
+       @echo x86-64-vista
        @exit 1
 
 x86-32:
@@ -111,6 +124,12 @@ x86-32:
 x86-64:
        nmake /nologo PLATFORM=x86-64 /f Nmakefile all
 
+x86-32-vista:
+       nmake /nologo PLATFORM=x86-32-vista /f Nmakefile all
+
+x86-64-vista:
+       nmake /nologo PLATFORM=x86-64-vista /f Nmakefile all
+
 clean:
        del vm\*.obj
        if exist factor.lib del factor.lib
@@ -120,6 +139,6 @@ clean:
        if exist factor.dll del factor.dll
        if exist factor.dll.lib del factor.dll.lib
 
-.PHONY: all default x86-32 x86-64 clean
+.PHONY: all default x86-32 x86-64 x86-32-vista x86-64-vista clean
 
 .SUFFIXES: .rs