From 70f0a6f2dcd66f3ec23f79220a0e08bcae8ba5ea Mon Sep 17 00:00:00 2001
From: Andreas Baumann <abaumann@yahoo.com>
Date: Thu, 26 Feb 2009 21:35:14 +0100
Subject: manual linking and running test_log.exe ok

---
 makefiles/nmake/clean.mk    | 16 ++++++++--------
 makefiles/nmake/compiler.mk |  6 +++---
 2 files changed, 11 insertions(+), 11 deletions(-)

(limited to 'makefiles')

diff --git a/makefiles/nmake/clean.mk b/makefiles/nmake/clean.mk
index 19cc006..5740dff 100644
--- a/makefiles/nmake/clean.mk
+++ b/makefiles/nmake/clean.mk
@@ -26,14 +26,14 @@
 #	-@rm $(CMODULES) $(CPPMODULES)
 #	-@rm $(CMODULES .o=.d) $(CPPMODULES .o=.d)
 clean:
-	-@erase *.bak
-	-@erase *~
-	-@erase *.d
-	-@erase *.exe
-	-@erase *.exe.manifest
-	-@erase *.obj
-	-@erase $(OBJS)
-	-@erase *.pdb
+	-@erase *.bak 2>NUL
+	-@erase *~ 2>NUL
+	-@erase *.d 2>NUL
+	-@erase *.exe 2>NUL
+	-@erase *.exe.manifest 2>NUL
+	-@erase *.obj 2>NUL
+	-@erase $(OBJS) 2>NUL
+	-@erase *.pdb 2>NUL
 
 #.PHONY: distclean_recursive distclean local_distclean
 
diff --git a/makefiles/nmake/compiler.mk b/makefiles/nmake/compiler.mk
index 22e30a5..fa4fd74 100644
--- a/makefiles/nmake/compiler.mk
+++ b/makefiles/nmake/compiler.mk
@@ -22,8 +22,8 @@ CCPPFLAGS = $(CCPP_COMPILE_FLAGS) $(PLATFORM_COMPILE_FLAGS) $(DEBUGLEVELFLAGS)
 CC = cl.exe
 CCPP = cl.exe
 
-LDFLAGS = /nologo $(LDFLAGS_DIR)
-LIBS = $(LIBS_DIR)
+LDFLAGS = /nologo $(INCLUDE_LDFLAGS)
+LIBS = $(INCLUDE_LIBS)
 LINK = link.exe
 CCPP_LINK = link.exe
 
@@ -36,7 +36,7 @@ CCPP_LINK = link.exe
 	$(CCPP) $(CCPPFLAGS) $<
 
 .obj.exe:
-	$(CCPP_LINK) $(LDFLAGS) /out:$@ $< $(OBJS)
+	$(CCPP_LINK) $(LDFLAGS) $(LIBS) /out:$@ $< $(OBJS)
 
 #%$(EXE): %.o $(OBJS)
 #	$(CCPP_LINK) -o $@ $(LIBS) $(OBJS) $<
-- 
cgit v1.2.3-54-g00ecf