update Nmakefile to properly delete vm\factor.res.

[factor.git] / Nmakefile

diff --git a/Nmakefile b/Nmakefile
index d7a5d26122e4f3342cc2f576d4b8bb3038dbba61..160ec7a3350a9098f5f40d57ac0268d7d7007b0e 100644 (file)
--- a/Nmakefile
+++ b/Nmakefile
@@ -1,7 +1,3 @@
-!IF !DEFINED(BOOTIMAGE_VERSION)
-BOOTIMAGE_VERSION = latest
-!ENDIF
-
 !IF !DEFINED(VERSION)
 VERSION = version-missing
 !ENDIF
@@ -12,15 +8,10 @@ GIT_LABEL = git-label-missing
 
 !IF DEFINED(PLATFORM)
 
-LINK_FLAGS = /nologo shell32.lib
+LINK_FLAGS = /nologo shell32.lib user32.lib
 CL_FLAGS = /nologo /O2 /WX /W3 /D_CRT_SECURE_NO_WARNINGS /DFACTOR_VERSION=$(VERSION) /DFACTOR_GIT_LABEL=$(GIT_LABEL)
 CL_FLAGS_VISTA = /D_WIN32_WINNT=0x0600
 
-!IF DEFINED(DEBUG)
-LINK_FLAGS = $(LINK_FLAGS) /DEBUG
-CL_FLAGS = $(CL_FLAGS) /Zi /DFACTOR_DEBUG
-!ENDIF
-
 !IF "$(PLATFORM)" == "x86-32"
 LINK_FLAGS = $(LINK_FLAGS) /safeseh
 PLAF_DLL_OBJS = vm\os-windows-x86.32.obj vm\safeseh.obj vm\cpu-x86.obj
@@ -76,10 +67,8 @@ DLL_OBJS = $(PLAF_DLL_OBJS) \
        vm\entry_points.obj \
        vm\errors.obj \
        vm\factor.obj \
-       vm\free_list.obj \
        vm\full_collector.obj \
        vm\gc.obj \
-       vm/gc_info.obj \
        vm\image.obj \
        vm\inline_cache.obj \
        vm\instruction_operands.obj \
@@ -154,8 +143,8 @@ x86-64-vista:
 
 clean:
        del vm\*.obj
+       if exist vm\factor.res del vm\factor.res
        if exist factor.lib del factor.lib
-       if exist factor.res del factor.res
        if exist factor.com del factor.com
        if exist factor.exe del factor.exe
        if exist factor.dll del factor.dll