PATCH: [ 809253 ] New release minsize mode

diff --git a/Src/Merge.dsp b/Src/Merge.dsp
index 9874c58..255ef09 100644 (file)
--- a/Src/Merge.dsp
+++ b/Src/Merge.dsp
@@ -18,8 +18,10 @@ CFG=Merge - Win32 UnicodeDebug
 !MESSAGE Possible choices for configuration are:
 !MESSAGE 
 !MESSAGE "Merge - Win32 Release" (based on "Win32 (x86) Application")
+!MESSAGE "Merge - Win32 ReleaseMinsize" (based on "Win32 (x86) Application")
 !MESSAGE "Merge - Win32 Debug" (based on "Win32 (x86) Application")
 !MESSAGE "Merge - Win32 UnicodeRelease" (based on "Win32 (x86) Application")
+!MESSAGE "Merge - Win32 UnicodeReleaseMinsize" (based on "Win32 (x86) Application")
 !MESSAGE "Merge - Win32 UnicodeDebug" (based on "Win32 (x86) Application")
 !MESSAGE 
 
@@ -58,7 +60,41 @@ LINK32=link.exe
 # ADD LINK32 version.lib shlwapi.lib /nologo /subsystem:windows /debug /machine:I386 /nodefaultlib:"msvcrtd.lib" /out:"..\Build\MergeRelease/WinMerge.exe" /verbose:lib
 # SUBTRACT LINK32 /pdb:none
 # Begin Special Build Tool
-TargetPath=\dev\sf\wm\cvsver\Build\MergeRelease\WinMerge.exe
+TargetPath=\programmation\WinMerge\Build\MergeRelease\WinMerge.exe
+SOURCE="$(InputPath)"
+PostBuild_Cmds=StampVer -vstampver.inf -i4 -j4 -o2 $(TargetPath)
+# End Special Build Tool
+
+!ELSEIF  "$(CFG)" == "Merge - Win32 ReleaseMinsize"
+
+# PROP BASE Use_MFC 6
+# PROP BASE Use_Debug_Libraries 0
+# PROP BASE Output_Dir "Merge___Win32_ReleaseMinsize"
+# PROP BASE Intermediate_Dir "Merge___Win32_ReleaseMinsize"
+# PROP BASE Ignore_Export_Lib 0
+# PROP BASE Target_Dir ""
+# PROP Use_MFC 6
+# PROP Use_Debug_Libraries 0
+# PROP Output_Dir "..\Build\MergeReleaseMinsize"
+# PROP Intermediate_Dir "..\Build\MergeReleaseMinsize"
+# PROP Ignore_Export_Lib 0
+# PROP Target_Dir ""
+# ADD BASE CPP /nologo /MD /W4 /GR /GX /Zi /Od /I "." /I "..\common" /I ".\editlib" /D "NDEBUG" /D "WIN32" /D "_WINDOWS" /D "_AFXDLL" /D "HAVE_STDLIB_H" /D "STDC_HEADERS" /D HAVE_STRING_H=1 /D PR_FILE_NAME=\"pr\" /D DIFF_PROGRAM=\"diff\" /D "REGEX_MALLOC" /D "__MSC__" /D "__NT__" /D USG=1 /D EDITPADC_CLASS= /D "COMPILE_MULTIMON_STUBS" /Yu"stdafx.h" /FD /c
+# ADD CPP /nologo /MD /W4 /GR /GX /Zi /O1 /I "." /I "..\common" /I ".\editlib" /D "NDEBUG" /D "WIN32" /D "_WINDOWS" /D "_AFXDLL" /D "HAVE_STDLIB_H" /D "STDC_HEADERS" /D HAVE_STRING_H=1 /D PR_FILE_NAME=\"pr\" /D DIFF_PROGRAM=\"diff\" /D "REGEX_MALLOC" /D "__MSC__" /D "__NT__" /D USG=1 /D EDITPADC_CLASS= /D "COMPILE_MULTIMON_STUBS" /Yu"stdafx.h" /FD /c
+# ADD BASE MTL /nologo /D "NDEBUG" /mktyplib203 /o /win32 "NUL"
+# ADD MTL /nologo /D "NDEBUG" /mktyplib203 /o /win32 "NUL"
+# ADD BASE RSC /l 0x409 /d "NDEBUG" /d "_AFXDLL"
+# ADD RSC /l 0x409 /d "NDEBUG" /d "_AFXDLL"
+BSC32=bscmake.exe
+# ADD BASE BSC32 /nologo
+# ADD BSC32 /nologo
+LINK32=xilink6.exe
+# ADD BASE LINK32 version.lib shlwapi.lib /nologo /subsystem:windows /debug /machine:I386 /nodefaultlib:"msvcrtd.lib" /out:"..\Build\MergeRelease/WinMerge.exe" /verbose:lib
+# SUBTRACT BASE LINK32 /pdb:none
+# ADD LINK32 version.lib shlwapi.lib /nologo /subsystem:windows /debug /machine:I386 /nodefaultlib:"msvcrtd.lib" /out:"..\Build\MergeReleaseMinsize/WinMerge.exe" /verbose:lib
+# SUBTRACT LINK32 /pdb:none
+# Begin Special Build Tool
+TargetPath=\programmation\WinMerge\Build\MergeReleaseMinsize\WinMerge.exe
 SOURCE="$(InputPath)"
 PostBuild_Cmds=StampVer -vstampver.inf -i4 -j4 -o2 $(TargetPath)
 # End Special Build Tool
@@ -115,10 +151,44 @@ BSC32=bscmake.exe
 LINK32=link.exe
 # ADD BASE LINK32 version.lib shlwapi.lib /nologo /subsystem:windows /debug /machine:I386 /nodefaultlib:"msvcrtd.lib" /out:"..\Build\MergeRelease/WinMerge.exe" /verbose:lib
 # SUBTRACT BASE LINK32 /pdb:none
-# ADD LINK32 version.lib shlwapi.lib /nologo /subsystem:windows /debug /machine:I386 /nodefaultlib:"msvcrtd.lib" /out:"..\Build\MergeUnicodeRelease/WinMergeU.exe" /verbose:lib
+# ADD LINK32 version.lib shlwapi.lib /nologo /entry:"wWinMainCRTStartup" /subsystem:windows /debug /machine:I386 /nodefaultlib:"msvcrtd.lib" /out:"..\Build\MergeUnicodeRelease/WinMergeU.exe" /verbose:lib
 # SUBTRACT LINK32 /pdb:none
 # Begin Special Build Tool
-TargetPath=\dev\sf\wm\cvsver\Build\MergeUnicodeRelease\WinMergeU.exe
+TargetPath=\programmation\WinMerge\Build\MergeUnicodeRelease\WinMergeU.exe
+SOURCE="$(InputPath)"
+PostBuild_Cmds=StampVer -vstampver.inf -i4 -j4 -o2 $(TargetPath)
+# End Special Build Tool
+
+!ELSEIF  "$(CFG)" == "Merge - Win32 UnicodeReleaseMinsize"
+
+# PROP BASE Use_MFC 6
+# PROP BASE Use_Debug_Libraries 0
+# PROP BASE Output_Dir "Merge___Win32_UnicodeReleaseMinsize"
+# PROP BASE Intermediate_Dir "Merge___Win32_UnicodeReleaseMinsize"
+# PROP BASE Ignore_Export_Lib 0
+# PROP BASE Target_Dir ""
+# PROP Use_MFC 6
+# PROP Use_Debug_Libraries 0
+# PROP Output_Dir "..\Build\MergeUnicodeReleaseMinsize"
+# PROP Intermediate_Dir "..\Build\MergeUnicodeReleaseMinsize"
+# PROP Ignore_Export_Lib 0
+# PROP Target_Dir ""
+# ADD BASE CPP /nologo /MD /W4 /GR /GX /Zi /Od /I "." /I "..\common" /I ".\editlib" /D "NDEBUG" /D "WIN32" /D "_WINDOWS" /D "_AFXDLL" /D "HAVE_STDLIB_H" /D "STDC_HEADERS" /D HAVE_STRING_H=1 /D PR_FILE_NAME=\"pr\" /D DIFF_PROGRAM=\"diff\" /D "REGEX_MALLOC" /D "__MSC__" /D "__NT__" /D USG=1 /D EDITPADC_CLASS= /D "COMPILE_MULTIMON_STUBS" /D "UNICODE" /D "_UNICODE" /Yu"stdafx.h" /FD /c
+# ADD CPP /nologo /MD /W4 /GR /GX /Zi /O1 /I "." /I "..\common" /I ".\editlib" /D "NDEBUG" /D "WIN32" /D "_WINDOWS" /D "_AFXDLL" /D "HAVE_STDLIB_H" /D "STDC_HEADERS" /D HAVE_STRING_H=1 /D PR_FILE_NAME=\"pr\" /D DIFF_PROGRAM=\"diff\" /D "REGEX_MALLOC" /D "__MSC__" /D "__NT__" /D USG=1 /D EDITPADC_CLASS= /D "COMPILE_MULTIMON_STUBS" /D "UNICODE" /D "_UNICODE" /Yu"stdafx.h" /FD /c
+# ADD BASE MTL /nologo /D "NDEBUG" /mktyplib203 /o /win32 "NUL"
+# ADD MTL /nologo /D "NDEBUG" /mktyplib203 /o /win32 "NUL"
+# ADD BASE RSC /l 0x409 /d "NDEBUG" /d "_AFXDLL"
+# ADD RSC /l 0x409 /d "NDEBUG" /d "_AFXDLL"
+BSC32=bscmake.exe
+# ADD BASE BSC32 /nologo
+# ADD BSC32 /nologo
+LINK32=xilink6.exe
+# ADD BASE LINK32 version.lib shlwapi.lib /nologo /subsystem:windows /debug /machine:I386 /nodefaultlib:"msvcrtd.lib" /out:"..\Build\MergeUnicodeRelease/WinMergeU.exe" /verbose:lib
+# SUBTRACT BASE LINK32 /pdb:none
+# ADD LINK32 version.lib shlwapi.lib /nologo /entry:"wWinMainCRTStartup" /subsystem:windows /debug /machine:I386 /nodefaultlib:"msvcrtd.lib" /out:"..\Build\MergeUnicodeReleaseMinsize/WinMergeU.exe" /verbose:lib
+# SUBTRACT LINK32 /pdb:none
+# Begin Special Build Tool
+TargetPath=\programmation\WinMerge\Build\MergeUnicodeReleaseMinsize\WinMergeU.exe
 SOURCE="$(InputPath)"
 PostBuild_Cmds=StampVer -vstampver.inf -i4 -j4 -o2 $(TargetPath)
 # End Special Build Tool
@@ -155,8 +225,10 @@ LINK32=link.exe
 # Begin Target
 
 # Name "Merge - Win32 Release"
+# Name "Merge - Win32 ReleaseMinsize"
 # Name "Merge - Win32 Debug"
 # Name "Merge - Win32 UnicodeRelease"
+# Name "Merge - Win32 UnicodeReleaseMinsize"
 # Name "Merge - Win32 UnicodeDebug"
 # Begin Group "Source Files"
 
@@ -170,6 +242,13 @@ SOURCE=.\ANALYZE.C
 # ADD CPP /O2
 # SUBTRACT CPP /YX /Yc /Yu
 
+!ELSEIF  "$(CFG)" == "Merge - Win32 ReleaseMinsize"
+
+# ADD BASE CPP /O2
+# SUBTRACT BASE CPP /YX /Yc /Yu
+# ADD CPP /O2
+# SUBTRACT CPP /YX /Yc /Yu
+
 !ELSEIF  "$(CFG)" == "Merge - Win32 Debug"
 
 # SUBTRACT CPP /YX /Yc /Yu
@@ -181,6 +260,13 @@ SOURCE=.\ANALYZE.C
 # ADD CPP /O2
 # SUBTRACT CPP /YX /Yc /Yu
 
+!ELSEIF  "$(CFG)" == "Merge - Win32 UnicodeReleaseMinsize"
+
+# ADD BASE CPP /O2
+# SUBTRACT BASE CPP /YX /Yc /Yu
+# ADD CPP /O2
+# SUBTRACT CPP /YX /Yc /Yu
+
 !ELSEIF  "$(CFG)" == "Merge - Win32 UnicodeDebug"
 
 # SUBTRACT BASE CPP /YX /Yc /Yu
@@ -205,6 +291,11 @@ SOURCE=.\ChildFrm.cpp
 
 # SUBTRACT CPP /D "HAVE_STDLIB_H" /D "STDC_HEADERS" /D HAVE_STRING_H=1 /D PR_FILE_NAME=\"pr\" /D DIFF_PROGRAM=\"diff\" /D "REGEX_MALLOC" /D "__MSC__" /D "__NT__" /D USG=1
 
+!ELSEIF  "$(CFG)" == "Merge - Win32 ReleaseMinsize"
+
+# SUBTRACT BASE CPP /D "HAVE_STDLIB_H" /D "STDC_HEADERS" /D HAVE_STRING_H=1 /D PR_FILE_NAME=\"pr\" /D DIFF_PROGRAM=\"diff\" /D "REGEX_MALLOC" /D "__MSC__" /D "__NT__" /D USG=1
+# SUBTRACT CPP /D "HAVE_STDLIB_H" /D "STDC_HEADERS" /D HAVE_STRING_H=1 /D PR_FILE_NAME=\"pr\" /D DIFF_PROGRAM=\"diff\" /D "REGEX_MALLOC" /D "__MSC__" /D "__NT__" /D USG=1
+
 !ELSEIF  "$(CFG)" == "Merge - Win32 Debug"
 
 !ELSEIF  "$(CFG)" == "Merge - Win32 UnicodeRelease"
@@ -212,6 +303,11 @@ SOURCE=.\ChildFrm.cpp
 # SUBTRACT BASE CPP /D "HAVE_STDLIB_H" /D "STDC_HEADERS" /D HAVE_STRING_H=1 /D PR_FILE_NAME=\"pr\" /D DIFF_PROGRAM=\"diff\" /D "REGEX_MALLOC" /D "__MSC__" /D "__NT__" /D USG=1
 # SUBTRACT CPP /D "HAVE_STDLIB_H" /D "STDC_HEADERS" /D HAVE_STRING_H=1 /D PR_FILE_NAME=\"pr\" /D DIFF_PROGRAM=\"diff\" /D "REGEX_MALLOC" /D "__MSC__" /D "__NT__" /D USG=1
 
+!ELSEIF  "$(CFG)" == "Merge - Win32 UnicodeReleaseMinsize"
+
+# SUBTRACT BASE CPP /D "HAVE_STDLIB_H" /D "STDC_HEADERS" /D HAVE_STRING_H=1 /D PR_FILE_NAME=\"pr\" /D DIFF_PROGRAM=\"diff\" /D "REGEX_MALLOC" /D "__MSC__" /D "__NT__" /D USG=1
+# SUBTRACT CPP /D "HAVE_STDLIB_H" /D "STDC_HEADERS" /D HAVE_STRING_H=1 /D PR_FILE_NAME=\"pr\" /D DIFF_PROGRAM=\"diff\" /D "REGEX_MALLOC" /D "__MSC__" /D "__NT__" /D USG=1
+
 !ELSEIF  "$(CFG)" == "Merge - Win32 UnicodeDebug"
 
 !ENDIF 
@@ -226,6 +322,13 @@ SOURCE=.\CMPBUF.C
 # ADD CPP /O2
 # SUBTRACT CPP /YX /Yc /Yu
 
+!ELSEIF  "$(CFG)" == "Merge - Win32 ReleaseMinsize"
+
+# ADD BASE CPP /O2
+# SUBTRACT BASE CPP /YX /Yc /Yu
+# ADD CPP /O2
+# SUBTRACT CPP /YX /Yc /Yu
+
 !ELSEIF  "$(CFG)" == "Merge - Win32 Debug"
 
 # SUBTRACT CPP /YX /Yc /Yu
@@ -237,6 +340,13 @@ SOURCE=.\CMPBUF.C
 # ADD CPP /O2
 # SUBTRACT CPP /YX /Yc /Yu
 
+!ELSEIF  "$(CFG)" == "Merge - Win32 UnicodeReleaseMinsize"
+
+# ADD BASE CPP /O2
+# SUBTRACT BASE CPP /YX /Yc /Yu
+# ADD CPP /O2
+# SUBTRACT CPP /YX /Yc /Yu
+
 !ELSEIF  "$(CFG)" == "Merge - Win32 UnicodeDebug"
 
 # SUBTRACT BASE CPP /YX /Yc /Yu
@@ -258,6 +368,13 @@ SOURCE=.\CONTEXT.C
 # ADD CPP /O2
 # SUBTRACT CPP /YX /Yc /Yu
 
+!ELSEIF  "$(CFG)" == "Merge - Win32 ReleaseMinsize"
+
+# ADD BASE CPP /O2
+# SUBTRACT BASE CPP /YX /Yc /Yu
+# ADD CPP /O2
+# SUBTRACT CPP /YX /Yc /Yu
+
 !ELSEIF  "$(CFG)" == "Merge - Win32 Debug"
 
 # SUBTRACT CPP /YX /Yc /Yu
@@ -269,6 +386,13 @@ SOURCE=.\CONTEXT.C
 # ADD CPP /O2
 # SUBTRACT CPP /YX /Yc /Yu
 
+!ELSEIF  "$(CFG)" == "Merge - Win32 UnicodeReleaseMinsize"
+
+# ADD BASE CPP /O2
+# SUBTRACT BASE CPP /YX /Yc /Yu
+# ADD CPP /O2
+# SUBTRACT CPP /YX /Yc /Yu
+
 !ELSEIF  "$(CFG)" == "Merge - Win32 UnicodeDebug"
 
 # SUBTRACT BASE CPP /YX /Yc /Yu
@@ -289,6 +413,11 @@ SOURCE=.\Diff.cpp
 
 # ADD CPP /O2
 
+!ELSEIF  "$(CFG)" == "Merge - Win32 ReleaseMinsize"
+
+# ADD BASE CPP /O2
+# ADD CPP /O2
+
 !ELSEIF  "$(CFG)" == "Merge - Win32 Debug"
 
 !ELSEIF  "$(CFG)" == "Merge - Win32 UnicodeRelease"
@@ -296,6 +425,11 @@ SOURCE=.\Diff.cpp
 # ADD BASE CPP /O2
 # ADD CPP /O2
 
+!ELSEIF  "$(CFG)" == "Merge - Win32 UnicodeReleaseMinsize"
+
+# ADD BASE CPP /O2
+# ADD CPP /O2
+
 !ELSEIF  "$(CFG)" == "Merge - Win32 UnicodeDebug"
 
 !ENDIF 
@@ -333,6 +467,11 @@ SOURCE=.\DirDoc.cpp
 
 # SUBTRACT CPP /D "HAVE_STDLIB_H" /D "STDC_HEADERS" /D HAVE_STRING_H=1 /D PR_FILE_NAME=\"pr\" /D DIFF_PROGRAM=\"diff\" /D "REGEX_MALLOC" /D "__MSC__" /D "__NT__" /D USG=1
 
+!ELSEIF  "$(CFG)" == "Merge - Win32 ReleaseMinsize"
+
+# SUBTRACT BASE CPP /D "HAVE_STDLIB_H" /D "STDC_HEADERS" /D HAVE_STRING_H=1 /D PR_FILE_NAME=\"pr\" /D DIFF_PROGRAM=\"diff\" /D "REGEX_MALLOC" /D "__MSC__" /D "__NT__" /D USG=1
+# SUBTRACT CPP /D "HAVE_STDLIB_H" /D "STDC_HEADERS" /D HAVE_STRING_H=1 /D PR_FILE_NAME=\"pr\" /D DIFF_PROGRAM=\"diff\" /D "REGEX_MALLOC" /D "__MSC__" /D "__NT__" /D USG=1
+
 !ELSEIF  "$(CFG)" == "Merge - Win32 Debug"
 
 !ELSEIF  "$(CFG)" == "Merge - Win32 UnicodeRelease"
@@ -340,6 +479,11 @@ SOURCE=.\DirDoc.cpp
 # SUBTRACT BASE CPP /D "HAVE_STDLIB_H" /D "STDC_HEADERS" /D HAVE_STRING_H=1 /D PR_FILE_NAME=\"pr\" /D DIFF_PROGRAM=\"diff\" /D "REGEX_MALLOC" /D "__MSC__" /D "__NT__" /D USG=1
 # SUBTRACT CPP /D "HAVE_STDLIB_H" /D "STDC_HEADERS" /D HAVE_STRING_H=1 /D PR_FILE_NAME=\"pr\" /D DIFF_PROGRAM=\"diff\" /D "REGEX_MALLOC" /D "__MSC__" /D "__NT__" /D USG=1
 
+!ELSEIF  "$(CFG)" == "Merge - Win32 UnicodeReleaseMinsize"
+
+# SUBTRACT BASE CPP /D "HAVE_STDLIB_H" /D "STDC_HEADERS" /D HAVE_STRING_H=1 /D PR_FILE_NAME=\"pr\" /D DIFF_PROGRAM=\"diff\" /D "REGEX_MALLOC" /D "__MSC__" /D "__NT__" /D USG=1
+# SUBTRACT CPP /D "HAVE_STDLIB_H" /D "STDC_HEADERS" /D HAVE_STRING_H=1 /D PR_FILE_NAME=\"pr\" /D DIFF_PROGRAM=\"diff\" /D "REGEX_MALLOC" /D "__MSC__" /D "__NT__" /D USG=1
+
 !ELSEIF  "$(CFG)" == "Merge - Win32 UnicodeDebug"
 
 !ENDIF 
@@ -354,6 +498,13 @@ SOURCE=.\DIRENT.C
 # ADD CPP /O2
 # SUBTRACT CPP /YX /Yc /Yu
 
+!ELSEIF  "$(CFG)" == "Merge - Win32 ReleaseMinsize"
+
+# ADD BASE CPP /O2
+# SUBTRACT BASE CPP /YX /Yc /Yu
+# ADD CPP /O2
+# SUBTRACT CPP /YX /Yc /Yu
+
 !ELSEIF  "$(CFG)" == "Merge - Win32 Debug"
 
 # SUBTRACT CPP /YX /Yc /Yu
@@ -365,6 +516,13 @@ SOURCE=.\DIRENT.C
 # ADD CPP /O2
 # SUBTRACT CPP /YX /Yc /Yu
 
+!ELSEIF  "$(CFG)" == "Merge - Win32 UnicodeReleaseMinsize"
+
+# ADD BASE CPP /O2
+# SUBTRACT BASE CPP /YX /Yc /Yu
+# ADD CPP /O2
+# SUBTRACT CPP /YX /Yc /Yu
+
 !ELSEIF  "$(CFG)" == "Merge - Win32 UnicodeDebug"
 
 # SUBTRACT BASE CPP /YX /Yc /Yu
@@ -381,6 +539,11 @@ SOURCE=.\DirFrame.cpp
 
 # SUBTRACT CPP /D "HAVE_STDLIB_H" /D "STDC_HEADERS" /D HAVE_STRING_H=1 /D PR_FILE_NAME=\"pr\" /D DIFF_PROGRAM=\"diff\" /D "REGEX_MALLOC" /D "__MSC__" /D "__NT__" /D USG=1
 
+!ELSEIF  "$(CFG)" == "Merge - Win32 ReleaseMinsize"
+
+# SUBTRACT BASE CPP /D "HAVE_STDLIB_H" /D "STDC_HEADERS" /D HAVE_STRING_H=1 /D PR_FILE_NAME=\"pr\" /D DIFF_PROGRAM=\"diff\" /D "REGEX_MALLOC" /D "__MSC__" /D "__NT__" /D USG=1
+# SUBTRACT CPP /D "HAVE_STDLIB_H" /D "STDC_HEADERS" /D HAVE_STRING_H=1 /D PR_FILE_NAME=\"pr\" /D DIFF_PROGRAM=\"diff\" /D "REGEX_MALLOC" /D "__MSC__" /D "__NT__" /D USG=1
+
 !ELSEIF  "$(CFG)" == "Merge - Win32 Debug"
 
 !ELSEIF  "$(CFG)" == "Merge - Win32 UnicodeRelease"
@@ -388,6 +551,11 @@ SOURCE=.\DirFrame.cpp
 # SUBTRACT BASE CPP /D "HAVE_STDLIB_H" /D "STDC_HEADERS" /D HAVE_STRING_H=1 /D PR_FILE_NAME=\"pr\" /D DIFF_PROGRAM=\"diff\" /D "REGEX_MALLOC" /D "__MSC__" /D "__NT__" /D USG=1
 # SUBTRACT CPP /D "HAVE_STDLIB_H" /D "STDC_HEADERS" /D HAVE_STRING_H=1 /D PR_FILE_NAME=\"pr\" /D DIFF_PROGRAM=\"diff\" /D "REGEX_MALLOC" /D "__MSC__" /D "__NT__" /D USG=1
 
+!ELSEIF  "$(CFG)" == "Merge - Win32 UnicodeReleaseMinsize"
+
+# SUBTRACT BASE CPP /D "HAVE_STDLIB_H" /D "STDC_HEADERS" /D HAVE_STRING_H=1 /D PR_FILE_NAME=\"pr\" /D DIFF_PROGRAM=\"diff\" /D "REGEX_MALLOC" /D "__MSC__" /D "__NT__" /D USG=1
+# SUBTRACT CPP /D "HAVE_STDLIB_H" /D "STDC_HEADERS" /D HAVE_STRING_H=1 /D PR_FILE_NAME=\"pr\" /D DIFF_PROGRAM=\"diff\" /D "REGEX_MALLOC" /D "__MSC__" /D "__NT__" /D USG=1
+
 !ELSEIF  "$(CFG)" == "Merge - Win32 UnicodeDebug"
 
 !ENDIF 
@@ -405,6 +573,11 @@ SOURCE=.\DirView.cpp
 
 # SUBTRACT CPP /D "HAVE_STDLIB_H" /D "STDC_HEADERS" /D HAVE_STRING_H=1 /D PR_FILE_NAME=\"pr\" /D DIFF_PROGRAM=\"diff\" /D "REGEX_MALLOC" /D "__MSC__" /D "__NT__" /D USG=1
 
+!ELSEIF  "$(CFG)" == "Merge - Win32 ReleaseMinsize"
+
+# SUBTRACT BASE CPP /D "HAVE_STDLIB_H" /D "STDC_HEADERS" /D HAVE_STRING_H=1 /D PR_FILE_NAME=\"pr\" /D DIFF_PROGRAM=\"diff\" /D "REGEX_MALLOC" /D "__MSC__" /D "__NT__" /D USG=1
+# SUBTRACT CPP /D "HAVE_STDLIB_H" /D "STDC_HEADERS" /D HAVE_STRING_H=1 /D PR_FILE_NAME=\"pr\" /D DIFF_PROGRAM=\"diff\" /D "REGEX_MALLOC" /D "__MSC__" /D "__NT__" /D USG=1
+
 !ELSEIF  "$(CFG)" == "Merge - Win32 Debug"
 
 !ELSEIF  "$(CFG)" == "Merge - Win32 UnicodeRelease"
@@ -412,6 +585,11 @@ SOURCE=.\DirView.cpp
 # SUBTRACT BASE CPP /D "HAVE_STDLIB_H" /D "STDC_HEADERS" /D HAVE_STRING_H=1 /D PR_FILE_NAME=\"pr\" /D DIFF_PROGRAM=\"diff\" /D "REGEX_MALLOC" /D "__MSC__" /D "__NT__" /D USG=1
 # SUBTRACT CPP /D "HAVE_STDLIB_H" /D "STDC_HEADERS" /D HAVE_STRING_H=1 /D PR_FILE_NAME=\"pr\" /D DIFF_PROGRAM=\"diff\" /D "REGEX_MALLOC" /D "__MSC__" /D "__NT__" /D USG=1
 
+!ELSEIF  "$(CFG)" == "Merge - Win32 UnicodeReleaseMinsize"
+
+# SUBTRACT BASE CPP /D "HAVE_STDLIB_H" /D "STDC_HEADERS" /D HAVE_STRING_H=1 /D PR_FILE_NAME=\"pr\" /D DIFF_PROGRAM=\"diff\" /D "REGEX_MALLOC" /D "__MSC__" /D "__NT__" /D USG=1
+# SUBTRACT CPP /D "HAVE_STDLIB_H" /D "STDC_HEADERS" /D HAVE_STRING_H=1 /D PR_FILE_NAME=\"pr\" /D DIFF_PROGRAM=\"diff\" /D "REGEX_MALLOC" /D "__MSC__" /D "__NT__" /D USG=1
+
 !ELSEIF  "$(CFG)" == "Merge - Win32 UnicodeDebug"
 
 !ENDIF 
@@ -443,6 +621,13 @@ SOURCE=.\ED.C
 # ADD CPP /O2
 # SUBTRACT CPP /YX /Yc /Yu
 
+!ELSEIF  "$(CFG)" == "Merge - Win32 ReleaseMinsize"
+
+# ADD BASE CPP /O2
+# SUBTRACT BASE CPP /YX /Yc /Yu
+# ADD CPP /O2
+# SUBTRACT CPP /YX /Yc /Yu
+
 !ELSEIF  "$(CFG)" == "Merge - Win32 Debug"
 
 # SUBTRACT CPP /YX /Yc /Yu
@@ -454,6 +639,13 @@ SOURCE=.\ED.C
 # ADD CPP /O2
 # SUBTRACT CPP /YX /Yc /Yu
 
+!ELSEIF  "$(CFG)" == "Merge - Win32 UnicodeReleaseMinsize"
+
+# ADD BASE CPP /O2
+# SUBTRACT BASE CPP /YX /Yc /Yu
+# ADD CPP /O2
+# SUBTRACT CPP /YX /Yc /Yu
+
 !ELSEIF  "$(CFG)" == "Merge - Win32 UnicodeDebug"
 
 # SUBTRACT BASE CPP /YX /Yc /Yu
@@ -487,6 +679,13 @@ SOURCE=.\FNMATCH.C
 # ADD CPP /O2
 # SUBTRACT CPP /YX /Yc /Yu
 
+!ELSEIF  "$(CFG)" == "Merge - Win32 ReleaseMinsize"
+
+# ADD BASE CPP /O2
+# SUBTRACT BASE CPP /YX /Yc /Yu
+# ADD CPP /O2
+# SUBTRACT CPP /YX /Yc /Yu
+
 !ELSEIF  "$(CFG)" == "Merge - Win32 Debug"
 
 # SUBTRACT CPP /YX /Yc /Yu
@@ -498,6 +697,13 @@ SOURCE=.\FNMATCH.C
 # ADD CPP /O2
 # SUBTRACT CPP /YX /Yc /Yu
 
+!ELSEIF  "$(CFG)" == "Merge - Win32 UnicodeReleaseMinsize"
+
+# ADD BASE CPP /O2
+# SUBTRACT BASE CPP /YX /Yc /Yu
+# ADD CPP /O2
+# SUBTRACT CPP /YX /Yc /Yu
+
 !ELSEIF  "$(CFG)" == "Merge - Win32 UnicodeDebug"
 
 # SUBTRACT BASE CPP /YX /Yc /Yu
@@ -528,6 +734,13 @@ SOURCE=.\IFDEF.C
 # ADD CPP /O2
 # SUBTRACT CPP /YX /Yc /Yu
 
+!ELSEIF  "$(CFG)" == "Merge - Win32 ReleaseMinsize"
+
+# ADD BASE CPP /O2
+# SUBTRACT BASE CPP /YX /Yc /Yu
+# ADD CPP /O2
+# SUBTRACT CPP /YX /Yc /Yu
+
 !ELSEIF  "$(CFG)" == "Merge - Win32 Debug"
 
 # SUBTRACT CPP /YX /Yc /Yu
@@ -539,6 +752,13 @@ SOURCE=.\IFDEF.C
 # ADD CPP /O2
 # SUBTRACT CPP /YX /Yc /Yu
 
+!ELSEIF  "$(CFG)" == "Merge - Win32 UnicodeReleaseMinsize"
+
+# ADD BASE CPP /O2
+# SUBTRACT BASE CPP /YX /Yc /Yu
+# ADD CPP /O2
+# SUBTRACT CPP /YX /Yc /Yu
+
 !ELSEIF  "$(CFG)" == "Merge - Win32 UnicodeDebug"
 
 # SUBTRACT BASE CPP /YX /Yc /Yu
@@ -556,6 +776,13 @@ SOURCE=.\IO.C
 # ADD CPP /O2
 # SUBTRACT CPP /YX /Yc /Yu
 
+!ELSEIF  "$(CFG)" == "Merge - Win32 ReleaseMinsize"
+
+# ADD BASE CPP /O2
+# SUBTRACT BASE CPP /YX /Yc /Yu
+# ADD CPP /O2
+# SUBTRACT CPP /YX /Yc /Yu
+
 !ELSEIF  "$(CFG)" == "Merge - Win32 Debug"
 
 # SUBTRACT CPP /YX /Yc /Yu
@@ -567,6 +794,13 @@ SOURCE=.\IO.C
 # ADD CPP /O2
 # SUBTRACT CPP /YX /Yc /Yu
 
+!ELSEIF  "$(CFG)" == "Merge - Win32 UnicodeReleaseMinsize"
+
+# ADD BASE CPP /O2
+# SUBTRACT BASE CPP /YX /Yc /Yu
+# ADD CPP /O2
+# SUBTRACT CPP /YX /Yc /Yu
+
 !ELSEIF  "$(CFG)" == "Merge - Win32 UnicodeDebug"
 
 # SUBTRACT BASE CPP /YX /Yc /Yu
@@ -604,6 +838,11 @@ SOURCE=.\MainFrm.cpp
 
 # SUBTRACT CPP /D "HAVE_STDLIB_H" /D "STDC_HEADERS" /D HAVE_STRING_H=1 /D PR_FILE_NAME=\"pr\" /D DIFF_PROGRAM=\"diff\" /D "REGEX_MALLOC" /D "__MSC__" /D "__NT__" /D USG=1
 
+!ELSEIF  "$(CFG)" == "Merge - Win32 ReleaseMinsize"
+
+# SUBTRACT BASE CPP /D "HAVE_STDLIB_H" /D "STDC_HEADERS" /D HAVE_STRING_H=1 /D PR_FILE_NAME=\"pr\" /D DIFF_PROGRAM=\"diff\" /D "REGEX_MALLOC" /D "__MSC__" /D "__NT__" /D USG=1
+# SUBTRACT CPP /D "HAVE_STDLIB_H" /D "STDC_HEADERS" /D HAVE_STRING_H=1 /D PR_FILE_NAME=\"pr\" /D DIFF_PROGRAM=\"diff\" /D "REGEX_MALLOC" /D "__MSC__" /D "__NT__" /D USG=1
+
 !ELSEIF  "$(CFG)" == "Merge - Win32 Debug"
 
 !ELSEIF  "$(CFG)" == "Merge - Win32 UnicodeRelease"
@@ -611,6 +850,11 @@ SOURCE=.\MainFrm.cpp
 # SUBTRACT BASE CPP /D "HAVE_STDLIB_H" /D "STDC_HEADERS" /D HAVE_STRING_H=1 /D PR_FILE_NAME=\"pr\" /D DIFF_PROGRAM=\"diff\" /D "REGEX_MALLOC" /D "__MSC__" /D "__NT__" /D USG=1
 # SUBTRACT CPP /D "HAVE_STDLIB_H" /D "STDC_HEADERS" /D HAVE_STRING_H=1 /D PR_FILE_NAME=\"pr\" /D DIFF_PROGRAM=\"diff\" /D "REGEX_MALLOC" /D "__MSC__" /D "__NT__" /D USG=1
 
+!ELSEIF  "$(CFG)" == "Merge - Win32 UnicodeReleaseMinsize"
+
+# SUBTRACT BASE CPP /D "HAVE_STDLIB_H" /D "STDC_HEADERS" /D HAVE_STRING_H=1 /D PR_FILE_NAME=\"pr\" /D DIFF_PROGRAM=\"diff\" /D "REGEX_MALLOC" /D "__MSC__" /D "__NT__" /D USG=1
+# SUBTRACT CPP /D "HAVE_STDLIB_H" /D "STDC_HEADERS" /D HAVE_STRING_H=1 /D PR_FILE_NAME=\"pr\" /D DIFF_PROGRAM=\"diff\" /D "REGEX_MALLOC" /D "__MSC__" /D "__NT__" /D USG=1
+
 !ELSEIF  "$(CFG)" == "Merge - Win32 UnicodeDebug"
 
 !ENDIF 
@@ -624,6 +868,11 @@ SOURCE=.\Merge.cpp
 
 # SUBTRACT CPP /D "HAVE_STDLIB_H" /D "STDC_HEADERS" /D HAVE_STRING_H=1 /D PR_FILE_NAME=\"pr\" /D DIFF_PROGRAM=\"diff\" /D "REGEX_MALLOC" /D "__MSC__" /D "__NT__" /D USG=1
 
+!ELSEIF  "$(CFG)" == "Merge - Win32 ReleaseMinsize"
+
+# SUBTRACT BASE CPP /D "HAVE_STDLIB_H" /D "STDC_HEADERS" /D HAVE_STRING_H=1 /D PR_FILE_NAME=\"pr\" /D DIFF_PROGRAM=\"diff\" /D "REGEX_MALLOC" /D "__MSC__" /D "__NT__" /D USG=1
+# SUBTRACT CPP /D "HAVE_STDLIB_H" /D "STDC_HEADERS" /D HAVE_STRING_H=1 /D PR_FILE_NAME=\"pr\" /D DIFF_PROGRAM=\"diff\" /D "REGEX_MALLOC" /D "__MSC__" /D "__NT__" /D USG=1
+
 !ELSEIF  "$(CFG)" == "Merge - Win32 Debug"
 
 !ELSEIF  "$(CFG)" == "Merge - Win32 UnicodeRelease"
@@ -631,6 +880,11 @@ SOURCE=.\Merge.cpp
 # SUBTRACT BASE CPP /D "HAVE_STDLIB_H" /D "STDC_HEADERS" /D HAVE_STRING_H=1 /D PR_FILE_NAME=\"pr\" /D DIFF_PROGRAM=\"diff\" /D "REGEX_MALLOC" /D "__MSC__" /D "__NT__" /D USG=1
 # SUBTRACT CPP /D "HAVE_STDLIB_H" /D "STDC_HEADERS" /D HAVE_STRING_H=1 /D PR_FILE_NAME=\"pr\" /D DIFF_PROGRAM=\"diff\" /D "REGEX_MALLOC" /D "__MSC__" /D "__NT__" /D USG=1
 
+!ELSEIF  "$(CFG)" == "Merge - Win32 UnicodeReleaseMinsize"
+
+# SUBTRACT BASE CPP /D "HAVE_STDLIB_H" /D "STDC_HEADERS" /D HAVE_STRING_H=1 /D PR_FILE_NAME=\"pr\" /D DIFF_PROGRAM=\"diff\" /D "REGEX_MALLOC" /D "__MSC__" /D "__NT__" /D USG=1
+# SUBTRACT CPP /D "HAVE_STDLIB_H" /D "STDC_HEADERS" /D HAVE_STRING_H=1 /D PR_FILE_NAME=\"pr\" /D DIFF_PROGRAM=\"diff\" /D "REGEX_MALLOC" /D "__MSC__" /D "__NT__" /D USG=1
+
 !ELSEIF  "$(CFG)" == "Merge - Win32 UnicodeDebug"
 
 !ENDIF 
@@ -652,6 +906,11 @@ SOURCE=.\MergeDoc.cpp
 
 # SUBTRACT CPP /D "HAVE_STDLIB_H" /D "STDC_HEADERS" /D HAVE_STRING_H=1 /D PR_FILE_NAME=\"pr\" /D DIFF_PROGRAM=\"diff\" /D "REGEX_MALLOC" /D "__MSC__" /D "__NT__" /D USG=1
 
+!ELSEIF  "$(CFG)" == "Merge - Win32 ReleaseMinsize"
+
+# SUBTRACT BASE CPP /D "HAVE_STDLIB_H" /D "STDC_HEADERS" /D HAVE_STRING_H=1 /D PR_FILE_NAME=\"pr\" /D DIFF_PROGRAM=\"diff\" /D "REGEX_MALLOC" /D "__MSC__" /D "__NT__" /D USG=1
+# SUBTRACT CPP /D "HAVE_STDLIB_H" /D "STDC_HEADERS" /D HAVE_STRING_H=1 /D PR_FILE_NAME=\"pr\" /D DIFF_PROGRAM=\"diff\" /D "REGEX_MALLOC" /D "__MSC__" /D "__NT__" /D USG=1
+
 !ELSEIF  "$(CFG)" == "Merge - Win32 Debug"
 
 !ELSEIF  "$(CFG)" == "Merge - Win32 UnicodeRelease"
@@ -659,6 +918,11 @@ SOURCE=.\MergeDoc.cpp
 # SUBTRACT BASE CPP /D "HAVE_STDLIB_H" /D "STDC_HEADERS" /D HAVE_STRING_H=1 /D PR_FILE_NAME=\"pr\" /D DIFF_PROGRAM=\"diff\" /D "REGEX_MALLOC" /D "__MSC__" /D "__NT__" /D USG=1
 # SUBTRACT CPP /D "HAVE_STDLIB_H" /D "STDC_HEADERS" /D HAVE_STRING_H=1 /D PR_FILE_NAME=\"pr\" /D DIFF_PROGRAM=\"diff\" /D "REGEX_MALLOC" /D "__MSC__" /D "__NT__" /D USG=1
 
+!ELSEIF  "$(CFG)" == "Merge - Win32 UnicodeReleaseMinsize"
+
+# SUBTRACT BASE CPP /D "HAVE_STDLIB_H" /D "STDC_HEADERS" /D HAVE_STRING_H=1 /D PR_FILE_NAME=\"pr\" /D DIFF_PROGRAM=\"diff\" /D "REGEX_MALLOC" /D "__MSC__" /D "__NT__" /D USG=1
+# SUBTRACT CPP /D "HAVE_STDLIB_H" /D "STDC_HEADERS" /D HAVE_STRING_H=1 /D PR_FILE_NAME=\"pr\" /D DIFF_PROGRAM=\"diff\" /D "REGEX_MALLOC" /D "__MSC__" /D "__NT__" /D USG=1
+
 !ELSEIF  "$(CFG)" == "Merge - Win32 UnicodeDebug"
 
 !ENDIF 
@@ -677,6 +941,13 @@ SOURCE=.\NORMAL.C
 # ADD CPP /O2
 # SUBTRACT CPP /YX /Yc /Yu
 
+!ELSEIF  "$(CFG)" == "Merge - Win32 ReleaseMinsize"
+
+# ADD BASE CPP /O2
+# SUBTRACT BASE CPP /YX /Yc /Yu
+# ADD CPP /O2
+# SUBTRACT CPP /YX /Yc /Yu
+
 !ELSEIF  "$(CFG)" == "Merge - Win32 Debug"
 
 # SUBTRACT CPP /YX /Yc /Yu
@@ -688,6 +959,13 @@ SOURCE=.\NORMAL.C
 # ADD CPP /O2
 # SUBTRACT CPP /YX /Yc /Yu
 
+!ELSEIF  "$(CFG)" == "Merge - Win32 UnicodeReleaseMinsize"
+
+# ADD BASE CPP /O2
+# SUBTRACT BASE CPP /YX /Yc /Yu
+# ADD CPP /O2
+# SUBTRACT CPP /YX /Yc /Yu
+
 !ELSEIF  "$(CFG)" == "Merge - Win32 UnicodeDebug"
 
 # SUBTRACT BASE CPP /YX /Yc /Yu
@@ -704,6 +982,11 @@ SOURCE=.\OpenDlg.cpp
 
 # SUBTRACT CPP /D "HAVE_STDLIB_H" /D "STDC_HEADERS" /D HAVE_STRING_H=1 /D PR_FILE_NAME=\"pr\" /D DIFF_PROGRAM=\"diff\" /D "REGEX_MALLOC" /D "__MSC__" /D "__NT__" /D USG=1
 
+!ELSEIF  "$(CFG)" == "Merge - Win32 ReleaseMinsize"
+
+# SUBTRACT BASE CPP /D "HAVE_STDLIB_H" /D "STDC_HEADERS" /D HAVE_STRING_H=1 /D PR_FILE_NAME=\"pr\" /D DIFF_PROGRAM=\"diff\" /D "REGEX_MALLOC" /D "__MSC__" /D "__NT__" /D USG=1
+# SUBTRACT CPP /D "HAVE_STDLIB_H" /D "STDC_HEADERS" /D HAVE_STRING_H=1 /D PR_FILE_NAME=\"pr\" /D DIFF_PROGRAM=\"diff\" /D "REGEX_MALLOC" /D "__MSC__" /D "__NT__" /D USG=1
+
 !ELSEIF  "$(CFG)" == "Merge - Win32 Debug"
 
 !ELSEIF  "$(CFG)" == "Merge - Win32 UnicodeRelease"
@@ -711,6 +994,11 @@ SOURCE=.\OpenDlg.cpp
 # SUBTRACT BASE CPP /D "HAVE_STDLIB_H" /D "STDC_HEADERS" /D HAVE_STRING_H=1 /D PR_FILE_NAME=\"pr\" /D DIFF_PROGRAM=\"diff\" /D "REGEX_MALLOC" /D "__MSC__" /D "__NT__" /D USG=1
 # SUBTRACT CPP /D "HAVE_STDLIB_H" /D "STDC_HEADERS" /D HAVE_STRING_H=1 /D PR_FILE_NAME=\"pr\" /D DIFF_PROGRAM=\"diff\" /D "REGEX_MALLOC" /D "__MSC__" /D "__NT__" /D USG=1
 
+!ELSEIF  "$(CFG)" == "Merge - Win32 UnicodeReleaseMinsize"
+
+# SUBTRACT BASE CPP /D "HAVE_STDLIB_H" /D "STDC_HEADERS" /D HAVE_STRING_H=1 /D PR_FILE_NAME=\"pr\" /D DIFF_PROGRAM=\"diff\" /D "REGEX_MALLOC" /D "__MSC__" /D "__NT__" /D USG=1
+# SUBTRACT CPP /D "HAVE_STDLIB_H" /D "STDC_HEADERS" /D HAVE_STRING_H=1 /D PR_FILE_NAME=\"pr\" /D DIFF_PROGRAM=\"diff\" /D "REGEX_MALLOC" /D "__MSC__" /D "__NT__" /D USG=1
+
 !ELSEIF  "$(CFG)" == "Merge - Win32 UnicodeDebug"
 
 !ENDIF 
@@ -748,6 +1036,11 @@ SOURCE=.\PropGeneral.cpp
 
 # SUBTRACT CPP /D "HAVE_STDLIB_H" /D "STDC_HEADERS" /D HAVE_STRING_H=1 /D PR_FILE_NAME=\"pr\" /D DIFF_PROGRAM=\"diff\" /D "REGEX_MALLOC" /D "__MSC__" /D "__NT__" /D USG=1
 
+!ELSEIF  "$(CFG)" == "Merge - Win32 ReleaseMinsize"
+
+# SUBTRACT BASE CPP /D "HAVE_STDLIB_H" /D "STDC_HEADERS" /D HAVE_STRING_H=1 /D PR_FILE_NAME=\"pr\" /D DIFF_PROGRAM=\"diff\" /D "REGEX_MALLOC" /D "__MSC__" /D "__NT__" /D USG=1
+# SUBTRACT CPP /D "HAVE_STDLIB_H" /D "STDC_HEADERS" /D HAVE_STRING_H=1 /D PR_FILE_NAME=\"pr\" /D DIFF_PROGRAM=\"diff\" /D "REGEX_MALLOC" /D "__MSC__" /D "__NT__" /D USG=1
+
 !ELSEIF  "$(CFG)" == "Merge - Win32 Debug"
 
 !ELSEIF  "$(CFG)" == "Merge - Win32 UnicodeRelease"
@@ -755,6 +1048,11 @@ SOURCE=.\PropGeneral.cpp
 # SUBTRACT BASE CPP /D "HAVE_STDLIB_H" /D "STDC_HEADERS" /D HAVE_STRING_H=1 /D PR_FILE_NAME=\"pr\" /D DIFF_PROGRAM=\"diff\" /D "REGEX_MALLOC" /D "__MSC__" /D "__NT__" /D USG=1
 # SUBTRACT CPP /D "HAVE_STDLIB_H" /D "STDC_HEADERS" /D HAVE_STRING_H=1 /D PR_FILE_NAME=\"pr\" /D DIFF_PROGRAM=\"diff\" /D "REGEX_MALLOC" /D "__MSC__" /D "__NT__" /D USG=1
 
+!ELSEIF  "$(CFG)" == "Merge - Win32 UnicodeReleaseMinsize"
+
+# SUBTRACT BASE CPP /D "HAVE_STDLIB_H" /D "STDC_HEADERS" /D HAVE_STRING_H=1 /D PR_FILE_NAME=\"pr\" /D DIFF_PROGRAM=\"diff\" /D "REGEX_MALLOC" /D "__MSC__" /D "__NT__" /D USG=1
+# SUBTRACT CPP /D "HAVE_STDLIB_H" /D "STDC_HEADERS" /D HAVE_STRING_H=1 /D PR_FILE_NAME=\"pr\" /D DIFF_PROGRAM=\"diff\" /D "REGEX_MALLOC" /D "__MSC__" /D "__NT__" /D USG=1
+
 !ELSEIF  "$(CFG)" == "Merge - Win32 UnicodeDebug"
 
 !ENDIF 
@@ -776,6 +1074,11 @@ SOURCE=.\PropVss.cpp
 
 # SUBTRACT CPP /D "HAVE_STDLIB_H" /D "STDC_HEADERS" /D HAVE_STRING_H=1 /D PR_FILE_NAME=\"pr\" /D DIFF_PROGRAM=\"diff\" /D "REGEX_MALLOC" /D "__MSC__" /D "__NT__" /D USG=1
 
+!ELSEIF  "$(CFG)" == "Merge - Win32 ReleaseMinsize"
+
+# SUBTRACT BASE CPP /D "HAVE_STDLIB_H" /D "STDC_HEADERS" /D HAVE_STRING_H=1 /D PR_FILE_NAME=\"pr\" /D DIFF_PROGRAM=\"diff\" /D "REGEX_MALLOC" /D "__MSC__" /D "__NT__" /D USG=1
+# SUBTRACT CPP /D "HAVE_STDLIB_H" /D "STDC_HEADERS" /D HAVE_STRING_H=1 /D PR_FILE_NAME=\"pr\" /D DIFF_PROGRAM=\"diff\" /D "REGEX_MALLOC" /D "__MSC__" /D "__NT__" /D USG=1
+
 !ELSEIF  "$(CFG)" == "Merge - Win32 Debug"
 
 !ELSEIF  "$(CFG)" == "Merge - Win32 UnicodeRelease"
@@ -783,6 +1086,11 @@ SOURCE=.\PropVss.cpp
 # SUBTRACT BASE CPP /D "HAVE_STDLIB_H" /D "STDC_HEADERS" /D HAVE_STRING_H=1 /D PR_FILE_NAME=\"pr\" /D DIFF_PROGRAM=\"diff\" /D "REGEX_MALLOC" /D "__MSC__" /D "__NT__" /D USG=1
 # SUBTRACT CPP /D "HAVE_STDLIB_H" /D "STDC_HEADERS" /D HAVE_STRING_H=1 /D PR_FILE_NAME=\"pr\" /D DIFF_PROGRAM=\"diff\" /D "REGEX_MALLOC" /D "__MSC__" /D "__NT__" /D USG=1
 
+!ELSEIF  "$(CFG)" == "Merge - Win32 UnicodeReleaseMinsize"
+
+# SUBTRACT BASE CPP /D "HAVE_STDLIB_H" /D "STDC_HEADERS" /D HAVE_STRING_H=1 /D PR_FILE_NAME=\"pr\" /D DIFF_PROGRAM=\"diff\" /D "REGEX_MALLOC" /D "__MSC__" /D "__NT__" /D USG=1
+# SUBTRACT CPP /D "HAVE_STDLIB_H" /D "STDC_HEADERS" /D HAVE_STRING_H=1 /D PR_FILE_NAME=\"pr\" /D DIFF_PROGRAM=\"diff\" /D "REGEX_MALLOC" /D "__MSC__" /D "__NT__" /D USG=1
+
 !ELSEIF  "$(CFG)" == "Merge - Win32 UnicodeDebug"
 
 !ENDIF 
@@ -797,6 +1105,13 @@ SOURCE=.\REGEX.C
 # ADD CPP /O2
 # SUBTRACT CPP /YX /Yc /Yu
 
+!ELSEIF  "$(CFG)" == "Merge - Win32 ReleaseMinsize"
+
+# ADD BASE CPP /O2
+# SUBTRACT BASE CPP /YX /Yc /Yu
+# ADD CPP /O2
+# SUBTRACT CPP /YX /Yc /Yu
+
 !ELSEIF  "$(CFG)" == "Merge - Win32 Debug"
 
 # SUBTRACT CPP /YX /Yc /Yu
@@ -808,6 +1123,13 @@ SOURCE=.\REGEX.C
 # ADD CPP /O2
 # SUBTRACT CPP /YX /Yc /Yu
 
+!ELSEIF  "$(CFG)" == "Merge - Win32 UnicodeReleaseMinsize"
+
+# ADD BASE CPP /O2
+# SUBTRACT BASE CPP /YX /Yc /Yu
+# ADD CPP /O2
+# SUBTRACT CPP /YX /Yc /Yu
+
 !ELSEIF  "$(CFG)" == "Merge - Win32 UnicodeDebug"
 
 # SUBTRACT BASE CPP /YX /Yc /Yu
@@ -833,6 +1155,13 @@ SOURCE=.\SIDE.C
 # ADD CPP /O2
 # SUBTRACT CPP /YX /Yc /Yu
 
+!ELSEIF  "$(CFG)" == "Merge - Win32 ReleaseMinsize"
+
+# ADD BASE CPP /O2
+# SUBTRACT BASE CPP /YX /Yc /Yu
+# ADD CPP /O2
+# SUBTRACT CPP /YX /Yc /Yu
+
 !ELSEIF  "$(CFG)" == "Merge - Win32 Debug"
 
 # SUBTRACT CPP /YX /Yc /Yu
@@ -844,6 +1173,13 @@ SOURCE=.\SIDE.C
 # ADD CPP /O2
 # SUBTRACT CPP /YX /Yc /Yu
 
+!ELSEIF  "$(CFG)" == "Merge - Win32 UnicodeReleaseMinsize"
+
+# ADD BASE CPP /O2
+# SUBTRACT BASE CPP /YX /Yc /Yu
+# ADD CPP /O2
+# SUBTRACT CPP /YX /Yc /Yu
+
 !ELSEIF  "$(CFG)" == "Merge - Win32 UnicodeDebug"
 
 # SUBTRACT BASE CPP /YX /Yc /Yu
@@ -872,6 +1208,11 @@ SOURCE=.\Splash.cpp
 
 # SUBTRACT CPP /D "HAVE_STDLIB_H" /D "STDC_HEADERS" /D HAVE_STRING_H=1 /D PR_FILE_NAME=\"pr\" /D DIFF_PROGRAM=\"diff\" /D "REGEX_MALLOC" /D "__MSC__" /D "__NT__" /D USG=1
 
+!ELSEIF  "$(CFG)" == "Merge - Win32 ReleaseMinsize"
+
+# SUBTRACT BASE CPP /D "HAVE_STDLIB_H" /D "STDC_HEADERS" /D HAVE_STRING_H=1 /D PR_FILE_NAME=\"pr\" /D DIFF_PROGRAM=\"diff\" /D "REGEX_MALLOC" /D "__MSC__" /D "__NT__" /D USG=1
+# SUBTRACT CPP /D "HAVE_STDLIB_H" /D "STDC_HEADERS" /D HAVE_STRING_H=1 /D PR_FILE_NAME=\"pr\" /D DIFF_PROGRAM=\"diff\" /D "REGEX_MALLOC" /D "__MSC__" /D "__NT__" /D USG=1
+
 !ELSEIF  "$(CFG)" == "Merge - Win32 Debug"
 
 !ELSEIF  "$(CFG)" == "Merge - Win32 UnicodeRelease"
@@ -879,6 +1220,11 @@ SOURCE=.\Splash.cpp
 # SUBTRACT BASE CPP /D "HAVE_STDLIB_H" /D "STDC_HEADERS" /D HAVE_STRING_H=1 /D PR_FILE_NAME=\"pr\" /D DIFF_PROGRAM=\"diff\" /D "REGEX_MALLOC" /D "__MSC__" /D "__NT__" /D USG=1
 # SUBTRACT CPP /D "HAVE_STDLIB_H" /D "STDC_HEADERS" /D HAVE_STRING_H=1 /D PR_FILE_NAME=\"pr\" /D DIFF_PROGRAM=\"diff\" /D "REGEX_MALLOC" /D "__MSC__" /D "__NT__" /D USG=1
 
+!ELSEIF  "$(CFG)" == "Merge - Win32 UnicodeReleaseMinsize"
+
+# SUBTRACT BASE CPP /D "HAVE_STDLIB_H" /D "STDC_HEADERS" /D HAVE_STRING_H=1 /D PR_FILE_NAME=\"pr\" /D DIFF_PROGRAM=\"diff\" /D "REGEX_MALLOC" /D "__MSC__" /D "__NT__" /D USG=1
+# SUBTRACT CPP /D "HAVE_STDLIB_H" /D "STDC_HEADERS" /D HAVE_STRING_H=1 /D PR_FILE_NAME=\"pr\" /D DIFF_PROGRAM=\"diff\" /D "REGEX_MALLOC" /D "__MSC__" /D "__NT__" /D USG=1
+
 !ELSEIF  "$(CFG)" == "Merge - Win32 UnicodeDebug"
 
 !ENDIF 
@@ -905,6 +1251,13 @@ SOURCE=.\StdAfx.cpp
 # ADD CPP /Yc"stdafx.h"
 # SUBTRACT CPP /D "HAVE_STDLIB_H" /D "STDC_HEADERS" /D HAVE_STRING_H=1 /D PR_FILE_NAME=\"pr\" /D DIFF_PROGRAM=\"diff\" /D "REGEX_MALLOC" /D "__MSC__" /D "__NT__" /D USG=1
 
+!ELSEIF  "$(CFG)" == "Merge - Win32 ReleaseMinsize"
+
+# ADD BASE CPP /Yc"stdafx.h"
+# SUBTRACT BASE CPP /D "HAVE_STDLIB_H" /D "STDC_HEADERS" /D HAVE_STRING_H=1 /D PR_FILE_NAME=\"pr\" /D DIFF_PROGRAM=\"diff\" /D "REGEX_MALLOC" /D "__MSC__" /D "__NT__" /D USG=1
+# ADD CPP /Yc"stdafx.h"
+# SUBTRACT CPP /D "HAVE_STDLIB_H" /D "STDC_HEADERS" /D HAVE_STRING_H=1 /D PR_FILE_NAME=\"pr\" /D DIFF_PROGRAM=\"diff\" /D "REGEX_MALLOC" /D "__MSC__" /D "__NT__" /D USG=1
+
 !ELSEIF  "$(CFG)" == "Merge - Win32 Debug"
 
 # ADD CPP /Yc"stdafx.h"
@@ -916,6 +1269,13 @@ SOURCE=.\StdAfx.cpp
 # ADD CPP /Yc"stdafx.h"
 # SUBTRACT CPP /D "HAVE_STDLIB_H" /D "STDC_HEADERS" /D HAVE_STRING_H=1 /D PR_FILE_NAME=\"pr\" /D DIFF_PROGRAM=\"diff\" /D "REGEX_MALLOC" /D "__MSC__" /D "__NT__" /D USG=1
 
+!ELSEIF  "$(CFG)" == "Merge - Win32 UnicodeReleaseMinsize"
+
+# ADD BASE CPP /Yc"stdafx.h"
+# SUBTRACT BASE CPP /D "HAVE_STDLIB_H" /D "STDC_HEADERS" /D HAVE_STRING_H=1 /D PR_FILE_NAME=\"pr\" /D DIFF_PROGRAM=\"diff\" /D "REGEX_MALLOC" /D "__MSC__" /D "__NT__" /D USG=1
+# ADD CPP /Yc"stdafx.h"
+# SUBTRACT CPP /D "HAVE_STDLIB_H" /D "STDC_HEADERS" /D HAVE_STRING_H=1 /D PR_FILE_NAME=\"pr\" /D DIFF_PROGRAM=\"diff\" /D "REGEX_MALLOC" /D "__MSC__" /D "__NT__" /D USG=1
+
 !ELSEIF  "$(CFG)" == "Merge - Win32 UnicodeDebug"
 
 # ADD BASE CPP /Yc"stdafx.h"
@@ -941,6 +1301,13 @@ SOURCE=.\UTIL.C
 # ADD CPP /O2
 # SUBTRACT CPP /YX /Yc /Yu
 
+!ELSEIF  "$(CFG)" == "Merge - Win32 ReleaseMinsize"
+
+# ADD BASE CPP /O2
+# SUBTRACT BASE CPP /YX /Yc /Yu
+# ADD CPP /O2
+# SUBTRACT CPP /YX /Yc /Yu
+
 !ELSEIF  "$(CFG)" == "Merge - Win32 Debug"
 
 # SUBTRACT CPP /YX /Yc /Yu
@@ -952,6 +1319,13 @@ SOURCE=.\UTIL.C
 # ADD CPP /O2
 # SUBTRACT CPP /YX /Yc /Yu
 
+!ELSEIF  "$(CFG)" == "Merge - Win32 UnicodeReleaseMinsize"
+
+# ADD BASE CPP /O2
+# SUBTRACT BASE CPP /YX /Yc /Yu
+# ADD CPP /O2
+# SUBTRACT CPP /YX /Yc /Yu
+
 !ELSEIF  "$(CFG)" == "Merge - Win32 UnicodeDebug"
 
 # SUBTRACT BASE CPP /YX /Yc /Yu
@@ -972,6 +1346,11 @@ SOURCE=.\VssPrompt.cpp
 
 # SUBTRACT CPP /D "HAVE_STDLIB_H" /D "STDC_HEADERS" /D HAVE_STRING_H=1 /D PR_FILE_NAME=\"pr\" /D DIFF_PROGRAM=\"diff\" /D "REGEX_MALLOC" /D "__MSC__" /D "__NT__" /D USG=1
 
+!ELSEIF  "$(CFG)" == "Merge - Win32 ReleaseMinsize"
+
+# SUBTRACT BASE CPP /D "HAVE_STDLIB_H" /D "STDC_HEADERS" /D HAVE_STRING_H=1 /D PR_FILE_NAME=\"pr\" /D DIFF_PROGRAM=\"diff\" /D "REGEX_MALLOC" /D "__MSC__" /D "__NT__" /D USG=1
+# SUBTRACT CPP /D "HAVE_STDLIB_H" /D "STDC_HEADERS" /D HAVE_STRING_H=1 /D PR_FILE_NAME=\"pr\" /D DIFF_PROGRAM=\"diff\" /D "REGEX_MALLOC" /D "__MSC__" /D "__NT__" /D USG=1
+
 !ELSEIF  "$(CFG)" == "Merge - Win32 Debug"
 
 !ELSEIF  "$(CFG)" == "Merge - Win32 UnicodeRelease"
@@ -979,6 +1358,11 @@ SOURCE=.\VssPrompt.cpp
 # SUBTRACT BASE CPP /D "HAVE_STDLIB_H" /D "STDC_HEADERS" /D HAVE_STRING_H=1 /D PR_FILE_NAME=\"pr\" /D DIFF_PROGRAM=\"diff\" /D "REGEX_MALLOC" /D "__MSC__" /D "__NT__" /D USG=1
 # SUBTRACT CPP /D "HAVE_STDLIB_H" /D "STDC_HEADERS" /D HAVE_STRING_H=1 /D PR_FILE_NAME=\"pr\" /D DIFF_PROGRAM=\"diff\" /D "REGEX_MALLOC" /D "__MSC__" /D "__NT__" /D USG=1
 
+!ELSEIF  "$(CFG)" == "Merge - Win32 UnicodeReleaseMinsize"
+
+# SUBTRACT BASE CPP /D "HAVE_STDLIB_H" /D "STDC_HEADERS" /D HAVE_STRING_H=1 /D PR_FILE_NAME=\"pr\" /D DIFF_PROGRAM=\"diff\" /D "REGEX_MALLOC" /D "__MSC__" /D "__NT__" /D USG=1
+# SUBTRACT CPP /D "HAVE_STDLIB_H" /D "STDC_HEADERS" /D HAVE_STRING_H=1 /D PR_FILE_NAME=\"pr\" /D DIFF_PROGRAM=\"diff\" /D "REGEX_MALLOC" /D "__MSC__" /D "__NT__" /D USG=1
+
 !ELSEIF  "$(CFG)" == "Merge - Win32 UnicodeDebug"
 
 !ENDIF 
@@ -1294,10 +1678,18 @@ SOURCE=.\res\equal.bmp
 # End Source File
 # Begin Source File
 
+SOURCE=.\res\fileskip.bmp
+# End Source File
+# Begin Source File
+
 SOURCE=.\res\folder1.bmp
 # End Source File
 # Begin Source File
 
+SOURCE=.\res\folderskip.bmp
+# End Source File
+# Begin Source File
+
 SOURCE=.\res\lfile.bmp
 # End Source File
 # Begin Source File

diff --git a/Src/readme.txt b/Src/readme.txt
index 9cfb5d8..3b8b037 100644 (file)
--- a/Src/readme.txt
+++ b/Src/readme.txt
@@ -1,4 +1,6 @@
 2003-09-19 Laoran
+ PATCH: [ 809253 ] New release minsize mode
+  WinMerge: Merge.dsp
  Modifications in patch-dialog to compile in Unicode
   WinMerge: PatchDlg.cpp