--- mstools/samples/filer/makefile	2018/08/09 18:22:14	1.1.1.2
+++ mstools/samples/filer/makefile	2018/08/09 18:24:28	1.1.1.3
@@ -1,34 +1,42 @@
-# Nmake macros for building Windows 32-Bit apps
+# Nmake macros for building FILER
+# Define NODEBUG to build FILER without debugging information.
+# Define UNICODE to build FILER with UNICODE characters.
 
 !include <ntwin32.mak>
 
-cflags=$(cflags) -DDEVL=1
+!ifdef UNICODE
+unicode = -DUNICODE
+!else
+unicode =
+!endif
+
+#cflags=$(cflags) -DDEVL=1
 
 all: filer.exe
 
 # Update the resource if necessary
 
-filer.rbj: filer.rc filer.h globals.h *.bmp filer.ico
-    rc -r filer.rc
-    cvtres -$(CPU) filer.res -o filer.rbj
+filer.rbj: filer.rc filer.dlg filer.h globals.h *.bmp filer.ico
+    $(rc) $(rcvars) -r filer.rc
+    $(cvtres) -$(CPU) filer.res -o filer.rbj
 
 # Update the object files if necessary
 
 enumdrv.obj: enumdrv.c enumdrv.h globals.h
-    $(cc) $(cdebug) $(cflags) $(cvars) enumdrv.c
+    $(cc) $(cdebug) $(cflags) $(cvars) $(unicode) enumdrv.c
 
-walk.obj: walk.c walk.h globals.h
-    $(cc) $(cdebug) $(cflags) $(cvars) walk.c
+drvproc.obj: drvproc.c drvproc.h globals.h expdir.h filer.h
+    $(cc) $(cdebug) $(cflags) $(cvars) $(unicode) drvproc.c
 
-drvproc.obj: drvproc.c globals.h
-    $(cc) $(cdebug) $(cflags) $(cvars) drvproc.c
+expdir.obj: expdir.c expdir.h filer.h drvproc.h globals.h
+    $(cc) $(cdebug) $(cflags) $(cvars) $(unicode) expdir.c
 
 filer.obj: filer.c filer.h enumdrv.h globals.h
-    $(cc) $(cdebug) $(cflags) $(cvars) filer.c
+    $(cc) $(cdebug) $(cflags) $(cvars) $(unicode) filer.c
 
 # Update the executable file if necessary, and if so, add the resource back in.
 
-filer.exe: filer.obj enumdrv.obj walk.obj drvproc.obj filer.rbj
-    $(cvtobj) $(cvtdebug) *.obj
+filer.exe: filer.obj enumdrv.obj drvproc.obj expdir.obj filer.rbj makefile
     $(link) $(linkdebug)  $(guiflags) -out:filer.exe\
-    filer.obj enumdrv.obj walk.obj drvproc.obj filer.rbj $(guilibsmt)
+    filer.obj enumdrv.obj drvproc.obj expdir.obj filer.rbj\
+    version.lib $(guilibsmt)