1 files changed, 34 insertions, 9 deletions
diff --git a/CPP/Build.mak b/CPP/Build.mak
index 81ac79d..70c9c48 100755..100644
--- a/CPP/Build.mak
+++ b/CPP/Build.mak
@@ -1,11 +1,10 @@
 LIBS = $(LIBS) oleaut32.lib ole32.lib
 
-!IFDEF CPU
-!IFNDEF NO_BUFFEROVERFLOWU
-LIBS = $(LIBS) bufferoverflowU.lib
-!ENDIF
+!IFNDEF MY_NO_UNICODE
+CFLAGS = $(CFLAGS) -DUNICODE -D_UNICODE
 !ENDIF
 
+# CFLAGS = $(CFLAGS) -FAsc -Fa$O/Asm/
 
 !IFNDEF O
 !IFDEF CPU
@@ -43,7 +42,7 @@ COMPL_ASM = $(MY_ML) $** $O/$(*B).obj
 COMPL_ASM = $(MY_ML) -c -Fo$O/ $**
 !ENDIF
 
-CFLAGS = $(CFLAGS) -nologo -c -Fo$O/ -WX -EHsc -Gy -GR-
+CFLAGS = $(CFLAGS) -nologo -c -Fo$O/ -W4 -WX -EHsc -Gy -GR-
 
 !IFDEF MY_STATIC_LINK
 !IFNDEF MY_SINGLE_THREAD
@@ -54,9 +53,12 @@ CFLAGS = $(CFLAGS) -MD
 !ENDIF
 
 !IFDEF NEW_COMPILER
-CFLAGS = $(CFLAGS) -W4 -GS- -Zc:forScope
+CFLAGS = $(CFLAGS) -GS- -Zc:forScope
+!IFNDEF UNDER_CE
+CFLAGS = $(CFLAGS) -MP2
+!ENDIF
 !ELSE
-CFLAGS = $(CFLAGS) -W3
+CFLAGS = $(CFLAGS)
 !ENDIF
 
 CFLAGS_O1 = $(CFLAGS) -O1
@@ -64,10 +66,21 @@ CFLAGS_O2 = $(CFLAGS) -O2
 
 LFLAGS = $(LFLAGS) -nologo -OPT:REF -OPT:ICF
 
+!IFNDEF UNDER_CE
+LFLAGS = $(LFLAGS) /LARGEADDRESSAWARE
+!ENDIF
+
 !IFDEF DEF_FILE
 LFLAGS = $(LFLAGS) -DLL -DEF:$(DEF_FILE)
 !ENDIF
 
+MY_SUB_SYS_VER=6.0
+!IFDEF MY_CONSOLE
+# LFLAGS = $(LFLAGS) /SUBSYSTEM:console,$(MY_SUB_SYS_VER)
+!ELSE
+# LFLAGS = $(LFLAGS) /SUBSYSTEM:windows,$(MY_SUB_SYS_VER)
+!ENDIF
+
 PROGPATH = $O\$(PROG)
 
 COMPL_O1   = $(CC) $(CFLAGS_O1) $**
@@ -75,15 +88,27 @@ COMPL_O2   = $(CC) $(CFLAGS_O2) $**
 COMPL_PCH  = $(CC) $(CFLAGS_O1) -Yc"StdAfx.h" -Fp$O/a.pch $**
 COMPL      = $(CC) $(CFLAGS_O1) -Yu"StdAfx.h" -Fp$O/a.pch $**
 
+COMPLB    = $(CC) $(CFLAGS_O1) -Yu"StdAfx.h" -Fp$O/a.pch $<
+# COMPLB_O2 = $(CC) $(CFLAGS_O2) -Yu"StdAfx.h" -Fp$O/a.pch $<
+COMPLB_O2 = $(CC) $(CFLAGS_O2) $<
+
+CCOMPL_PCH  = $(CC) $(CFLAGS_O2) -Yc"Precomp.h" -Fp$O/a.pch $**
+CCOMPL_USE  = $(CC) $(CFLAGS_O2) -Yu"Precomp.h" -Fp$O/a.pch $**
+CCOMPL      = $(CC) $(CFLAGS_O2) $**
+CCOMPLB     = $(CC) $(CFLAGS_O2) $<
+
+
 all: $(PROGPATH)
 
 clean:
-	-del /Q $(PROGPATH) $O\*.exe $O\*.dll $O\*.obj $O\*.lib $O\*.exp $O\*.res $O\*.pch
+	-del /Q $(PROGPATH) $O\*.exe $O\*.dll $O\*.obj $O\*.lib $O\*.exp $O\*.res $O\*.pch $O\*.asm
 
 $O:
 	if not exist "$O" mkdir "$O"
+$O/Asm:
+	if not exist "$O/Asm" mkdir "$O/Asm"
 
-$(PROGPATH): $O $(OBJS) $(DEF_FILE)
+$(PROGPATH): $O $O/Asm $(OBJS) $(DEF_FILE)
 	link $(LFLAGS) -out:$(PROGPATH) $(OBJS) $(LIBS)
 
 !IFNDEF NO_DEFAULT_RES