--- mstools/samples/rpc/mandel/makefile	2018/08/09 18:20:55	1.1.1.2
+++ mstools/samples/rpc/mandel/makefile	2018/08/09 18:21:59	1.1.1.3
@@ -34,6 +34,11 @@ cvtomf =
 cvtomf = mip2coff $@
 !endif
 
+!if "$(CPU)" == "i386"
+# workaround for Windows NT 10/92 beta
+cflags = $(cflags:G3=Gz)
+!endif
+
 .c.obj:
    $(cc) $(cflags) $(cvars) $(RPCFLAG) $<
    $(cvtomf)
@@ -48,26 +53,25 @@ all: client.exe server.exe
 all: mandel.exe
 !endif
 
-mandel.exe: mandel.obj remote.obj mandel.def mandel.res calc.obj
+mandel.exe: mandel.obj remote.obj mandel.def mandel.rbj calc.obj
     $(link) $(guiflags) -out:mandel.exe -map:mandel.map \
-      mandel.obj remote.obj calc.obj mandel.res $(guilibs)
+      mandel.obj remote.obj calc.obj mandel.rbj $(guilibs)
 
-client.exe: mandel.obj remote.obj mandel.def mandel.res \
+client.exe: mandel.obj remote.obj mandel.def mandel.rbj \
             mdlrpc_c.obj mdlrpc_x.obj
     $(link) $(guiflags) -out:client.exe -map:client.map \
       mandel.obj remote.obj mdlrpc_c.obj mdlrpc_x.obj \
-      mandel.res $(LIB)\rpcrt4.lib $(LIB)\rpcndr.lib $(guilibs)
+      mandel.rbj rpcrt4.lib rpcndr.lib $(guilibs)
 
 server.exe: server.obj calc.obj mdlrpc_s.obj mdlrpc_y.obj
     $(link) $(conflags) -out:server.exe -map:server.map \
       server.obj calc.obj mdlrpc_s.obj mdlrpc_y.obj \
-      $(LIB)\rpcrt4.lib $(LIB)\rpcndr.lib $(conlibs)
+      rpcrt4.lib rpcndr.lib $(conlibs)
 
 # Update the resource if necessary
-mandel.res: mandel.rc mandel.h
-    rc -r -fo res.tmp mandel.rc
-    cvtres -$(CPU) res.tmp -o mandel.res
-    del res.tmp
+mandel.rbj: mandel.rc mandel.h
+    rc -r mandel.rc
+    cvtres -$(CPU) mandel.res -o mandel.rbj
 
 # Object file dependencies
 
@@ -115,7 +119,7 @@ mdlrpc_y.obj : mdlrpc_y.c mdlrpc.h
 
 # Stubs, auxiliary and header file from the IDL file
 mdlrpc.h mdlrpc_c.c mdlrpc_x.c mdlrpc_s.c mdlrpc_y.c: mdlrpc.idl mdlrpc.acf
-    midl -cpp_cmd $(cc) -cpp_opt "-E" mdlrpc.idl
+    midl mdlrpc.idl
 
 clean:
     -del client.exe
@@ -126,6 +130,7 @@ cleanall:  clean
     -del *.o
     -del *.oo
     -del *.res
+    -del *.rbj
     -del *.map
     -del *.obj
     -del mdlrpc.h