1 # Microsoft Developer Studio Project File - Name="Merge" - Package Owner=<4>
2 # Microsoft Developer Studio Generated Build File, Format Version 6.00
5 # TARGTYPE "Win32 (x86) Application" 0x0101
7 CFG=Merge - Win32 UnicodeDebug
8 !MESSAGE This is not a valid makefile. To build this project using NMAKE,
9 !MESSAGE use the Export Makefile command and run
11 !MESSAGE NMAKE /f "Merge.mak".
13 !MESSAGE You can specify a configuration when running NMAKE
14 !MESSAGE by defining the macro CFG on the command line. For example:
16 !MESSAGE NMAKE /f "Merge.mak" CFG="Merge - Win32 UnicodeDebug"
18 !MESSAGE Possible choices for configuration are:
20 !MESSAGE "Merge - Win32 Debug" (based on "Win32 (x86) Application")
21 !MESSAGE "Merge - Win32 UnicodeDebug" (based on "Win32 (x86) Application")
22 !MESSAGE "Merge - Win32 Release" (based on "Win32 (x86) Application")
23 !MESSAGE "Merge - Win32 UnicodeRelease" (based on "Win32 (x86) Application")
27 # PROP AllowPerConfigDependencies 0
28 # PROP Scc_ProjName ""
29 # PROP Scc_LocalPath ""
34 !IF "$(CFG)" == "Merge - Win32 Debug"
37 # PROP BASE Use_Debug_Libraries 1
38 # PROP BASE Output_Dir "..\BuildTmp\MergeDebug"
39 # PROP BASE Intermediate_Dir "..\BuildTmp\MergeDebug"
40 # PROP BASE Target_Dir ""
42 # PROP Use_Debug_Libraries 1
43 # PROP Output_Dir "..\BuildTmp\MergeDebug"
44 # PROP Intermediate_Dir "..\BuildTmp\MergeDebug"
45 # PROP Ignore_Export_Lib 0
47 # ADD BASE CPP /nologo /MDd /W3 /Gm /GX /Zi /Od /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "_AFXDLL" /Yu"stdafx.h" /FD /c
48 # ADD CPP /nologo /MDd /W3 /Gm /GR /GX /ZI /Od /I "." /I ".\Common" /I ".\editlib" /I ".\diffutils" /I ".\diffutils\lib" /I ".\diffutils\src" /D "_DEBUG" /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" /FR /Yu"stdafx.h" /FD /c
49 # ADD BASE MTL /nologo /D "_DEBUG" /mktyplib203 /o /win32 "NUL"
50 # ADD MTL /nologo /D "_DEBUG" /mktyplib203 /o /win32 "NUL"
51 # ADD BASE RSC /l 0x409 /d "_DEBUG" /d "_AFXDLL"
52 # ADD RSC /l 0x409 /d "_DEBUG" /d "_AFXDLL"
54 # ADD BASE BSC32 /nologo
57 # ADD BASE LINK32 /nologo /subsystem:windows /debug /machine:I386 /pdbtype:sept
58 # ADD LINK32 version.lib shlwapi.lib /nologo /subsystem:windows /debug /machine:I386 /out:"..\Build\MergeDebug/WinMerge.exe" /pdbtype:sept
60 !ELSEIF "$(CFG)" == "Merge - Win32 UnicodeDebug"
63 # PROP BASE Use_Debug_Libraries 1
64 # PROP BASE Output_Dir "..\BuildTmp\MergeUnicodeDebug"
65 # PROP BASE Intermediate_Dir "..\BuildTmp\MergeUnicodeDebug"
66 # PROP BASE Ignore_Export_Lib 0
67 # PROP BASE Target_Dir ""
69 # PROP Use_Debug_Libraries 1
70 # PROP Output_Dir "..\BuildTmp\MergeUnicodeDebug"
71 # PROP Intermediate_Dir "..\BuildTmp\MergeUnicodeDebug"
72 # PROP Ignore_Export_Lib 0
74 # ADD BASE CPP /nologo /MDd /W3 /Gm /GR /GX /ZI /Od /I "." /I "..\common" /I ".\editlib" /D "_DEBUG" /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" /FR /Yu"stdafx.h" /FD /c
75 # ADD CPP /nologo /MDd /W3 /Gm /GR /GX /ZI /Od /I "." /I ".\Common" /I ".\editlib" /I ".\diffutils" /I ".\diffutils\lib" /I ".\diffutils\src" /D "_DEBUG" /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" /FR /Yu"stdafx.h" /FD /c
76 # ADD BASE MTL /nologo /D "_DEBUG" /mktyplib203 /o /win32 "NUL"
77 # ADD MTL /nologo /D "_DEBUG" /mktyplib203 /o /win32 "NUL"
78 # ADD BASE RSC /l 0x409 /d "_DEBUG" /d "_AFXDLL"
79 # ADD RSC /l 0x409 /d "_DEBUG" /d "_AFXDLL"
81 # ADD BASE BSC32 /nologo
84 # ADD BASE LINK32 version.lib shlwapi.lib /nologo /subsystem:windows /debug /machine:I386 /out:"..\Build\MergeUnicodeDebug/WinMerge.exe" /pdbtype:sept
85 # ADD LINK32 version.lib shlwapi.lib /nologo /entry:"wWinMainCRTStartup" /subsystem:windows /debug /machine:I386 /out:"..\Build\MergeUnicodeDebug/WinMergeU.exe" /pdbtype:sept
87 !ELSEIF "$(CFG)" == "Merge - Win32 Release"
90 # PROP BASE Use_Debug_Libraries 0
91 # PROP BASE Output_Dir "..\BuildTmp\MergeRelease"
92 # PROP BASE Intermediate_Dir "..\BuildTmp\MergeRelease"
93 # PROP BASE Ignore_Export_Lib 0
94 # PROP BASE Target_Dir ""
96 # PROP Use_Debug_Libraries 0
97 # PROP Output_Dir "..\BuildTmp\MergeRelease"
98 # PROP Intermediate_Dir "..\BuildTmp\MergeRelease"
99 # PROP Ignore_Export_Lib 0
101 # ADD BASE CPP /nologo /MD /W4 /GR /GX /Zi /O1 /I "." /I ".\Common" /I ".\editlib" /I ".\diffutils" /I ".\diffutils\lib" /I ".\diffutils\src" /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
102 # ADD CPP /nologo /MD /W4 /GR /GX /Zi /O1 /I "." /I ".\Common" /I ".\editlib" /I ".\diffutils" /I ".\diffutils\lib" /I ".\diffutils\src" /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
103 # ADD BASE MTL /nologo /D "NDEBUG" /mktyplib203 /o /win32 "NUL"
104 # ADD MTL /nologo /D "NDEBUG" /mktyplib203 /o /win32 "NUL"
105 # ADD BASE RSC /l 0x409 /d "NDEBUG" /d "_AFXDLL"
106 # ADD RSC /l 0x409 /d "NDEBUG" /d "_AFXDLL"
108 # ADD BASE BSC32 /nologo
111 # ADD BASE LINK32 version.lib shlwapi.lib /nologo /subsystem:windows /debug /machine:I386 /nodefaultlib:"msvcrtd.lib" /out:"..\Build\MergeRelease/WinMerge.exe" /verbose:lib
112 # SUBTRACT BASE LINK32 /pdb:none
113 # ADD LINK32 version.lib shlwapi.lib /nologo /subsystem:windows /debug /machine:I386 /nodefaultlib:"msvcrtd.lib" /out:"..\Build\MergeRelease/WinMerge.exe" /verbose:lib
114 # SUBTRACT LINK32 /pdb:none
115 # Begin Special Build Tool
116 TargetPath=\Download\WinMerge\WinMergeCompile\Build\MergeRelease\WinMerge.exe
117 SOURCE="$(InputPath)"
118 PostBuild_Cmds=StampVer -vstampver.inf -i4 -j4 -o2 $(TargetPath)
119 # End Special Build Tool
121 !ELSEIF "$(CFG)" == "Merge - Win32 UnicodeRelease"
123 # PROP BASE Use_MFC 6
124 # PROP BASE Use_Debug_Libraries 0
125 # PROP BASE Output_Dir "..\BuildTmp\MergeUnicodeRelease"
126 # PROP BASE Intermediate_Dir "..\BuildTmp\MergeUnicodeRelease"
127 # PROP BASE Ignore_Export_Lib 0
128 # PROP BASE Target_Dir ""
130 # PROP Use_Debug_Libraries 0
131 # PROP Output_Dir "..\BuildTmp\MergeUnicodeRelease"
132 # PROP Intermediate_Dir "..\BuildTmp\MergeUnicodeRelease"
133 # PROP Ignore_Export_Lib 0
135 # ADD BASE CPP /nologo /MD /W4 /GR /GX /Zi /O1 /I "." /I ".\Common" /I ".\editlib" /I ".\diffutils" /I ".\diffutils\lib" /I ".\diffutils\src" /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
136 # ADD CPP /nologo /MD /W4 /GR /GX /Zi /O1 /I "." /I ".\Common" /I ".\editlib" /I ".\diffutils" /I ".\diffutils\lib" /I ".\diffutils\src" /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
137 # ADD BASE MTL /nologo /D "NDEBUG" /mktyplib203 /o /win32 "NUL"
138 # ADD MTL /nologo /D "NDEBUG" /mktyplib203 /o /win32 "NUL"
139 # ADD BASE RSC /l 0x409 /d "NDEBUG" /d "_AFXDLL"
140 # ADD RSC /l 0x409 /d "NDEBUG" /d "_AFXDLL"
142 # ADD BASE BSC32 /nologo
145 # ADD BASE LINK32 version.lib shlwapi.lib /nologo /entry:"wWinMainCRTStartup" /subsystem:windows /debug /machine:I386 /nodefaultlib:"msvcrtd.lib" /out:"..\Build\MergeUnicodeRelease/WinMergeU.exe" /verbose:lib
146 # SUBTRACT BASE LINK32 /pdb:none
147 # ADD LINK32 version.lib shlwapi.lib /nologo /entry:"wWinMainCRTStartup" /subsystem:windows /debug /machine:I386 /nodefaultlib:"msvcrtd.lib" /out:"..\Build\MergeUnicodeReleaseMinsize/WinMergeU.exe" /verbose:lib
148 # SUBTRACT LINK32 /pdb:none
149 # Begin Special Build Tool
150 TargetPath=\Download\WinMerge\WinMergeCompile\Build\MergeUnicodeRelease\WinMergeU.exe
151 SOURCE="$(InputPath)"
152 PostBuild_Cmds=StampVer -vstampver.inf -i4 -j4 -o2 $(TargetPath)
153 # End Special Build Tool
159 # Name "Merge - Win32 Debug"
160 # Name "Merge - Win32 UnicodeDebug"
161 # Name "Merge - Win32 Release"
162 # Name "Merge - Win32 UnicodeRelease"
163 # Begin Group "Source Files"
165 # PROP Default_Filter "cpp;c;cxx;rc;def;r;odl;idl;hpj;bat"
168 SOURCE=.\7zCommon.cpp
172 SOURCE=.\diffutils\src\ANALYZE.C
174 !IF "$(CFG)" == "Merge - Win32 Debug"
176 # SUBTRACT CPP /YX /Yc /Yu
178 !ELSEIF "$(CFG)" == "Merge - Win32 UnicodeDebug"
180 # SUBTRACT BASE CPP /YX /Yc /Yu
181 # SUBTRACT CPP /YX /Yc /Yu
183 !ELSEIF "$(CFG)" == "Merge - Win32 Release"
186 # SUBTRACT BASE CPP /YX /Yc /Yu
188 # SUBTRACT CPP /YX /Yc /Yu
190 !ELSEIF "$(CFG)" == "Merge - Win32 UnicodeRelease"
193 # SUBTRACT BASE CPP /YX /Yc /Yu
195 # SUBTRACT CPP /YX /Yc /Yu
206 SOURCE=.\CCPrompt.cpp
210 SOURCE=.\ChildFrm.cpp
212 !IF "$(CFG)" == "Merge - Win32 Debug"
214 !ELSEIF "$(CFG)" == "Merge - Win32 UnicodeDebug"
216 !ELSEIF "$(CFG)" == "Merge - Win32 Release"
218 # 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
219 # 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
221 !ELSEIF "$(CFG)" == "Merge - Win32 UnicodeRelease"
223 # 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
224 # 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
231 SOURCE=.\Common\CMoveConstraint.cpp
235 SOURCE=.\diffutils\lib\CMPBUF.C
237 !IF "$(CFG)" == "Merge - Win32 Debug"
239 # SUBTRACT CPP /YX /Yc /Yu
241 !ELSEIF "$(CFG)" == "Merge - Win32 UnicodeDebug"
243 # SUBTRACT BASE CPP /YX /Yc /Yu
244 # SUBTRACT CPP /YX /Yc /Yu
246 !ELSEIF "$(CFG)" == "Merge - Win32 Release"
249 # SUBTRACT BASE CPP /YX /Yc /Yu
251 # SUBTRACT CPP /YX /Yc /Yu
253 !ELSEIF "$(CFG)" == "Merge - Win32 UnicodeRelease"
256 # SUBTRACT BASE CPP /YX /Yc /Yu
258 # SUBTRACT CPP /YX /Yc /Yu
265 SOURCE=.\ColorButton.cpp
269 SOURCE=.\ConfigLog.cpp
273 SOURCE=.\diffutils\src\CONTEXT.C
275 !IF "$(CFG)" == "Merge - Win32 Debug"
277 # SUBTRACT CPP /YX /Yc /Yu
279 !ELSEIF "$(CFG)" == "Merge - Win32 UnicodeDebug"
281 # SUBTRACT BASE CPP /YX /Yc /Yu
282 # SUBTRACT CPP /YX /Yc /Yu
284 !ELSEIF "$(CFG)" == "Merge - Win32 Release"
287 # SUBTRACT BASE CPP /YX /Yc /Yu
289 # SUBTRACT CPP /YX /Yc /Yu
291 !ELSEIF "$(CFG)" == "Merge - Win32 UnicodeRelease"
294 # SUBTRACT BASE CPP /YX /Yc /Yu
296 # SUBTRACT CPP /YX /Yc /Yu
303 SOURCE=.\Common\coretools.cpp
307 SOURCE=.\common\CShellFileOp.cpp
311 SOURCE=.\Common\CSubclass.cpp
317 !IF "$(CFG)" == "Merge - Win32 Debug"
319 !ELSEIF "$(CFG)" == "Merge - Win32 UnicodeDebug"
321 !ELSEIF "$(CFG)" == "Merge - Win32 Release"
326 !ELSEIF "$(CFG)" == "Merge - Win32 UnicodeRelease"
336 SOURCE=.\DiffContext.cpp
340 SOURCE=.\DiffFileInfo.cpp
344 SOURCE=.\DiffThread.cpp
348 SOURCE=.\DiffViewBar.cpp
352 SOURCE=.\DiffWrapper.cpp
356 SOURCE=.\DirActions.cpp
360 SOURCE=.\DirColsDlg.cpp
364 SOURCE=.\DirCompStateBar.cpp
370 !IF "$(CFG)" == "Merge - Win32 Debug"
372 !ELSEIF "$(CFG)" == "Merge - Win32 UnicodeDebug"
374 !ELSEIF "$(CFG)" == "Merge - Win32 Release"
376 # 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
377 # 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
379 !ELSEIF "$(CFG)" == "Merge - Win32 UnicodeRelease"
381 # 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
382 # 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
389 SOURCE=.\diffutils\src\DIRENT.C
391 !IF "$(CFG)" == "Merge - Win32 Debug"
393 # SUBTRACT CPP /YX /Yc /Yu
395 !ELSEIF "$(CFG)" == "Merge - Win32 UnicodeDebug"
397 # SUBTRACT BASE CPP /YX /Yc /Yu
398 # SUBTRACT CPP /YX /Yc /Yu
400 !ELSEIF "$(CFG)" == "Merge - Win32 Release"
403 # SUBTRACT BASE CPP /YX /Yc /Yu
405 # SUBTRACT CPP /YX /Yc /Yu
407 !ELSEIF "$(CFG)" == "Merge - Win32 UnicodeRelease"
410 # SUBTRACT BASE CPP /YX /Yc /Yu
412 # SUBTRACT CPP /YX /Yc /Yu
419 SOURCE=.\DirFrame.cpp
421 !IF "$(CFG)" == "Merge - Win32 Debug"
423 !ELSEIF "$(CFG)" == "Merge - Win32 UnicodeDebug"
425 !ELSEIF "$(CFG)" == "Merge - Win32 Release"
427 # 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
428 # 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
430 !ELSEIF "$(CFG)" == "Merge - Win32 UnicodeRelease"
432 # 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
433 # 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
446 !IF "$(CFG)" == "Merge - Win32 Debug"
448 !ELSEIF "$(CFG)" == "Merge - Win32 UnicodeDebug"
450 !ELSEIF "$(CFG)" == "Merge - Win32 Release"
452 # 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
453 # 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
455 !ELSEIF "$(CFG)" == "Merge - Win32 UnicodeRelease"
457 # 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
458 # 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
465 SOURCE=.\DirViewColHandler.cpp
469 SOURCE=.\DirViewColItems.cpp
473 SOURCE=.\Common\dllproxy.c
474 # SUBTRACT CPP /YX /Yc /Yu
482 SOURCE=.\diffutils\src\ED.C
484 !IF "$(CFG)" == "Merge - Win32 Debug"
486 # SUBTRACT CPP /YX /Yc /Yu
488 !ELSEIF "$(CFG)" == "Merge - Win32 UnicodeDebug"
490 # SUBTRACT BASE CPP /YX /Yc /Yu
491 # SUBTRACT CPP /YX /Yc /Yu
493 !ELSEIF "$(CFG)" == "Merge - Win32 Release"
496 # SUBTRACT BASE CPP /YX /Yc /Yu
498 # SUBTRACT CPP /YX /Yc /Yu
500 !ELSEIF "$(CFG)" == "Merge - Win32 UnicodeRelease"
503 # SUBTRACT BASE CPP /YX /Yc /Yu
505 # SUBTRACT CPP /YX /Yc /Yu
512 SOURCE=.\EditorFilepathBar.cpp
516 SOURCE=.\FileFilterHelper.cpp
520 SOURCE=.\FileFilterMgr.cpp
524 SOURCE=.\FileFiltersDlg.cpp
528 SOURCE=.\FilepathEdit.cpp
536 SOURCE=.\FileTransform.cpp
540 SOURCE=.\diffutils\lib\FNMATCH.C
542 !IF "$(CFG)" == "Merge - Win32 Debug"
544 # SUBTRACT CPP /YX /Yc /Yu
546 !ELSEIF "$(CFG)" == "Merge - Win32 UnicodeDebug"
548 # SUBTRACT BASE CPP /YX /Yc /Yu
549 # SUBTRACT CPP /YX /Yc /Yu
551 !ELSEIF "$(CFG)" == "Merge - Win32 Release"
554 # SUBTRACT BASE CPP /YX /Yc /Yu
556 # SUBTRACT CPP /YX /Yc /Yu
558 !ELSEIF "$(CFG)" == "Merge - Win32 UnicodeRelease"
561 # SUBTRACT BASE CPP /YX /Yc /Yu
563 # SUBTRACT CPP /YX /Yc /Yu
570 SOURCE=.\GhostTextBuffer.cpp
574 SOURCE=.\GhostTextView.cpp
578 SOURCE=.\diffutils\GnuVersion.c
579 # SUBTRACT CPP /YX /Yc /Yu
583 SOURCE=.\Common\HScrollListBox.cpp
587 SOURCE=.\diffutils\src\IFDEF.C
589 !IF "$(CFG)" == "Merge - Win32 Debug"
591 # SUBTRACT CPP /YX /Yc /Yu
593 !ELSEIF "$(CFG)" == "Merge - Win32 UnicodeDebug"
595 # SUBTRACT BASE CPP /YX /Yc /Yu
596 # SUBTRACT CPP /YX /Yc /Yu
598 !ELSEIF "$(CFG)" == "Merge - Win32 Release"
601 # SUBTRACT BASE CPP /YX /Yc /Yu
603 # SUBTRACT CPP /YX /Yc /Yu
605 !ELSEIF "$(CFG)" == "Merge - Win32 UnicodeRelease"
608 # SUBTRACT BASE CPP /YX /Yc /Yu
610 # SUBTRACT CPP /YX /Yc /Yu
617 SOURCE=.\diffutils\src\IO.C
619 !IF "$(CFG)" == "Merge - Win32 Debug"
621 # SUBTRACT CPP /YX /Yc /Yu
623 !ELSEIF "$(CFG)" == "Merge - Win32 UnicodeDebug"
625 # SUBTRACT BASE CPP /YX /Yc /Yu
626 # SUBTRACT CPP /YX /Yc /Yu
628 !ELSEIF "$(CFG)" == "Merge - Win32 Release"
631 # SUBTRACT BASE CPP /YX /Yc /Yu
633 # SUBTRACT CPP /YX /Yc /Yu
635 !ELSEIF "$(CFG)" == "Merge - Win32 UnicodeRelease"
638 # SUBTRACT BASE CPP /YX /Yc /Yu
640 # SUBTRACT CPP /YX /Yc /Yu
647 SOURCE=.\Common\LanguageSelect.cpp
651 SOURCE=.\Common\listvwex.cpp
655 SOURCE=.\locality.cpp
659 SOURCE=.\LocationBar.cpp
663 SOURCE=.\LocationView.cpp
667 SOURCE=.\Common\LogFile.cpp
671 SOURCE=.\Common\lwdisp.c
672 # SUBTRACT CPP /YX /Yc /Yu
678 !IF "$(CFG)" == "Merge - Win32 Debug"
680 !ELSEIF "$(CFG)" == "Merge - Win32 UnicodeDebug"
682 !ELSEIF "$(CFG)" == "Merge - Win32 Release"
684 # 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
685 # 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
687 !ELSEIF "$(CFG)" == "Merge - Win32 UnicodeRelease"
689 # 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
690 # 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
699 !IF "$(CFG)" == "Merge - Win32 Debug"
701 !ELSEIF "$(CFG)" == "Merge - Win32 UnicodeDebug"
703 !ELSEIF "$(CFG)" == "Merge - Win32 Release"
705 # 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
706 # 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
708 !ELSEIF "$(CFG)" == "Merge - Win32 UnicodeRelease"
710 # 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
711 # 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
722 SOURCE=.\MergeDiffDetailView.cpp
726 SOURCE=.\MergeDoc.cpp
728 !IF "$(CFG)" == "Merge - Win32 Debug"
730 !ELSEIF "$(CFG)" == "Merge - Win32 UnicodeDebug"
732 !ELSEIF "$(CFG)" == "Merge - Win32 Release"
734 # 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
735 # 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
737 !ELSEIF "$(CFG)" == "Merge - Win32 UnicodeRelease"
739 # 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
740 # 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
747 SOURCE=.\MergeDocLineDiffs.cpp
751 SOURCE=.\MergeEditView.cpp
755 SOURCE=.\Common\MessageBoxDialog.cpp
759 SOURCE=.\Common\multiformatText.cpp
763 SOURCE=.\diffutils\src\NORMAL.C
765 !IF "$(CFG)" == "Merge - Win32 Debug"
767 # SUBTRACT CPP /YX /Yc /Yu
769 !ELSEIF "$(CFG)" == "Merge - Win32 UnicodeDebug"
771 # SUBTRACT BASE CPP /YX /Yc /Yu
772 # SUBTRACT CPP /YX /Yc /Yu
774 !ELSEIF "$(CFG)" == "Merge - Win32 Release"
777 # SUBTRACT BASE CPP /YX /Yc /Yu
779 # SUBTRACT CPP /YX /Yc /Yu
781 !ELSEIF "$(CFG)" == "Merge - Win32 UnicodeRelease"
784 # SUBTRACT BASE CPP /YX /Yc /Yu
786 # SUBTRACT CPP /YX /Yc /Yu
795 !IF "$(CFG)" == "Merge - Win32 Debug"
797 !ELSEIF "$(CFG)" == "Merge - Win32 UnicodeDebug"
799 !ELSEIF "$(CFG)" == "Merge - Win32 Release"
801 # 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
802 # 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
804 !ELSEIF "$(CFG)" == "Merge - Win32 UnicodeRelease"
806 # 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
807 # 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
814 SOURCE=.\common\OptionsMgr.cpp
818 SOURCE=.\OutputDlg.cpp
822 SOURCE=.\PatchDlg.cpp
826 SOURCE=.\PatchTool.cpp
834 SOURCE=.\PluginManager.cpp
842 SOURCE=.\PropColors.cpp
846 SOURCE=.\PropCompare.cpp
850 SOURCE=.\PropEditor.cpp
854 SOURCE=.\PropFilter.cpp
858 SOURCE=.\PropGeneral.cpp
860 !IF "$(CFG)" == "Merge - Win32 Debug"
862 !ELSEIF "$(CFG)" == "Merge - Win32 UnicodeDebug"
864 !ELSEIF "$(CFG)" == "Merge - Win32 Release"
866 # 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
867 # 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
869 !ELSEIF "$(CFG)" == "Merge - Win32 UnicodeRelease"
871 # 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
872 # 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
879 SOURCE=.\PropRegistry.cpp
885 !IF "$(CFG)" == "Merge - Win32 Debug"
887 !ELSEIF "$(CFG)" == "Merge - Win32 UnicodeDebug"
889 !ELSEIF "$(CFG)" == "Merge - Win32 Release"
891 # 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
892 # 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
894 !ELSEIF "$(CFG)" == "Merge - Win32 UnicodeRelease"
896 # 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
897 # 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
904 SOURCE=.\diffutils\lib\REGEX.C
906 !IF "$(CFG)" == "Merge - Win32 Debug"
908 # SUBTRACT CPP /YX /Yc /Yu
910 !ELSEIF "$(CFG)" == "Merge - Win32 UnicodeDebug"
912 # SUBTRACT BASE CPP /YX /Yc /Yu
913 # SUBTRACT CPP /YX /Yc /Yu
915 !ELSEIF "$(CFG)" == "Merge - Win32 Release"
918 # SUBTRACT BASE CPP /YX /Yc /Yu
920 # SUBTRACT CPP /YX /Yc /Yu
922 !ELSEIF "$(CFG)" == "Merge - Win32 UnicodeRelease"
925 # SUBTRACT BASE CPP /YX /Yc /Yu
927 # SUBTRACT CPP /YX /Yc /Yu
934 SOURCE=.\Common\RegExp.cpp
938 SOURCE=.\Common\RegKey.cpp
942 SOURCE=.\SaveClosingDlg.cpp
946 SOURCE=.\SelectUnpackerDlg.cpp
950 SOURCE=.\diffutils\src\SIDE.C
952 !IF "$(CFG)" == "Merge - Win32 Debug"
954 # SUBTRACT CPP /YX /Yc /Yu
956 !ELSEIF "$(CFG)" == "Merge - Win32 UnicodeDebug"
958 # SUBTRACT BASE CPP /YX /Yc /Yu
959 # SUBTRACT CPP /YX /Yc /Yu
961 !ELSEIF "$(CFG)" == "Merge - Win32 Release"
964 # SUBTRACT BASE CPP /YX /Yc /Yu
966 # SUBTRACT CPP /YX /Yc /Yu
968 !ELSEIF "$(CFG)" == "Merge - Win32 UnicodeRelease"
971 # SUBTRACT BASE CPP /YX /Yc /Yu
973 # SUBTRACT CPP /YX /Yc /Yu
980 SOURCE=.\Common\sizecbar.cpp
984 SOURCE=.\Common\sizecbarg.cpp
988 SOURCE=.\Common\SortHeaderCtrl.cpp
994 !IF "$(CFG)" == "Merge - Win32 Debug"
996 !ELSEIF "$(CFG)" == "Merge - Win32 UnicodeDebug"
998 !ELSEIF "$(CFG)" == "Merge - Win32 Release"
1000 # 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
1001 # 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
1003 !ELSEIF "$(CFG)" == "Merge - Win32 UnicodeRelease"
1005 # 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
1006 # 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
1013 SOURCE=.\Common\SplitterWndEx.cpp
1021 SOURCE=.\Common\StatLink.cpp
1027 !IF "$(CFG)" == "Merge - Win32 Debug"
1029 # ADD CPP /Yc"stdafx.h"
1031 !ELSEIF "$(CFG)" == "Merge - Win32 UnicodeDebug"
1033 # ADD BASE CPP /Yc"stdafx.h"
1034 # ADD CPP /Yc"stdafx.h"
1036 !ELSEIF "$(CFG)" == "Merge - Win32 Release"
1038 # ADD BASE CPP /Yc"stdafx.h"
1039 # 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
1040 # ADD CPP /Yc"stdafx.h"
1041 # 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
1043 !ELSEIF "$(CFG)" == "Merge - Win32 UnicodeRelease"
1045 # ADD BASE CPP /Yc"stdafx.h"
1046 # 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
1047 # ADD CPP /Yc"stdafx.h"
1048 # 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
1055 SOURCE=.\stringdiffs.cpp
1059 SOURCE=.\Common\SuperComboBox.cpp
1063 SOURCE=.\Common\textfile.cpp
1067 SOURCE=.\Common\unicoder.cpp
1071 SOURCE=.\Common\UniFile.cpp
1075 SOURCE=.\diffutils\src\UTIL.C
1077 !IF "$(CFG)" == "Merge - Win32 Debug"
1079 # SUBTRACT CPP /YX /Yc /Yu
1081 !ELSEIF "$(CFG)" == "Merge - Win32 UnicodeDebug"
1083 # SUBTRACT BASE CPP /YX /Yc /Yu
1084 # SUBTRACT CPP /YX /Yc /Yu
1086 !ELSEIF "$(CFG)" == "Merge - Win32 Release"
1089 # SUBTRACT BASE CPP /YX /Yc /Yu
1091 # SUBTRACT CPP /YX /Yc /Yu
1093 !ELSEIF "$(CFG)" == "Merge - Win32 UnicodeRelease"
1096 # SUBTRACT BASE CPP /YX /Yc /Yu
1098 # SUBTRACT CPP /YX /Yc /Yu
1105 SOURCE=.\Common\varprop.cpp
1109 SOURCE=.\Common\version.cpp
1113 SOURCE=.\VssPrompt.cpp
1115 !IF "$(CFG)" == "Merge - Win32 Debug"
1117 !ELSEIF "$(CFG)" == "Merge - Win32 UnicodeDebug"
1119 !ELSEIF "$(CFG)" == "Merge - Win32 Release"
1121 # 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
1122 # 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
1124 !ELSEIF "$(CFG)" == "Merge - Win32 UnicodeRelease"
1126 # 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
1127 # 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
1134 SOURCE=.\WaitStatusCursor.cpp
1138 SOURCE=.\WMGotoDlg.cpp
1141 # Begin Group "Header Files"
1143 # PROP Default_Filter "h;hpp;hxx;hm;inl"
1162 SOURCE=.\Common\CMoveConstraint.h
1166 SOURCE=.\diffutils\lib\CMPBUF.H
1170 SOURCE=.\ColorButton.h
1174 SOURCE=.\diffutils\CONFIG.H
1178 SOURCE=.\ConfigLog.h
1182 SOURCE=.\Common\coretools.h
1186 SOURCE=.\common\CShellFileOp.h
1190 SOURCE=.\Common\CSubclass.h
1194 SOURCE=.\diffutils\src\DIFF.H
1198 SOURCE=.\DiffContext.h
1202 SOURCE=.\DiffFileInfo.h
1206 SOURCE=.\DiffThread.h
1210 SOURCE=.\DiffViewBar.h
1214 SOURCE=.\DiffWrapper.h
1218 SOURCE=.\DirColsDlg.h
1222 SOURCE=.\DirCompStateBar.h
1230 SOURCE=.\diffutils\src\DIRENT.H
1246 SOURCE=.\DirViewColItems.h
1250 SOURCE=.\Common\dllproxy.h
1258 SOURCE=.\EditorFilepathBar.h
1262 SOURCE=.\Exceptions.h
1266 SOURCE=.\FileFilterHelper.h
1270 SOURCE=.\FileFilterMgr.h
1274 SOURCE=.\FileFiltersDlg.h
1278 SOURCE=.\FilepathEdit.h
1286 SOURCE=.\FileTransform.h
1290 SOURCE=.\diffutils\src\FNMATCH.H
1294 SOURCE=.\GhostTextBuffer.h
1298 SOURCE=.\GhostTextView.h
1302 SOURCE=.\Common\HScrollListBox.h
1306 SOURCE=.\Common\LanguageSelect.h
1310 SOURCE=.\Common\listvwex.h
1318 SOURCE=.\LocationBar.h
1322 SOURCE=.\LocationView.h
1326 SOURCE=.\Common\LogFile.h
1330 SOURCE=.\Common\lwdisp.h
1342 SOURCE=.\MergeDiffDetailView.h
1350 SOURCE=.\MergeEditStatus.h
1354 SOURCE=.\MergeEditView.h
1358 SOURCE=.\Common\MessageBoxDialog.h
1362 SOURCE=.\Common\multiformatText.h
1374 SOURCE=.\OptionsDef.h
1378 SOURCE=.\common\OptionsMgr.h
1382 SOURCE=.\OutputDlg.h
1390 SOURCE=.\PatchTool.h
1398 SOURCE=.\PluginManager.h
1406 SOURCE=.\PropColors.h
1410 SOURCE=.\PropCompare.h
1414 SOURCE=.\PropEditor.h
1418 SOURCE=.\PropFilter.h
1422 SOURCE=.\PropGeneral.h
1426 SOURCE=.\PropRegistry.h
1434 SOURCE=.\diffutils\lib\REGEX.H
1438 SOURCE=.\Common\RegExp.h
1442 SOURCE=.\Common\RegKey.h
1450 SOURCE=.\SaveClosingDlg.h
1454 SOURCE=.\SelectUnpackerDlg.h
1458 SOURCE=.\Common\sizecbar.h
1462 SOURCE=.\Common\sizecbarg.h
1466 SOURCE=.\Common\SortHeaderCtrl.h
1474 SOURCE=.\Common\SplitterWndEx.h
1482 SOURCE=.\Common\StatLink.h
1490 SOURCE=.\stringdiffs.h
1494 SOURCE=.\stringdiffsi.h
1498 SOURCE=.\Common\SuperComboBox.h
1502 SOURCE=.\diffutils\src\SYSTEM.H
1506 SOURCE=.\Common\textfile.h
1510 SOURCE=.\Common\unicoder.h
1514 SOURCE=.\Common\UniFile.h
1518 SOURCE=.\Common\varprop.h
1522 SOURCE=.\Common\version.h
1526 SOURCE=.\VssPrompt.h
1530 SOURCE=.\WaitStatusCursor.h
1534 SOURCE=.\WMGotoDlg.h
1537 # Begin Group "Resource Files"
1539 # PROP Default_Filter "ico;cur;bmp;dlg;rc2;rct;bin;cnt;rtf;gif;jpg;jpeg;jpe"
1542 SOURCE=.\res\binary.bmp
1546 SOURCE=.\res\binarydiff.bmp
1550 SOURCE=.\res\equal.bmp
1554 SOURCE=.\res\error.bmp
1558 SOURCE=.\res\fileskip.bmp
1562 SOURCE=.\res\folder.bmp
1566 SOURCE=.\res\folderskip.bmp
1570 SOURCE=.\res\lfile.bmp
1574 SOURCE=.\res\lfolder.bmp
1578 SOURCE=.\res\Merge.ico
1582 SOURCE=.\res\Merge.rc2
1586 SOURCE=.\res\MergeDoc.ico
1590 SOURCE=.\res\mg_cur.cur
1594 SOURCE=.\res\notequal.bmp
1598 SOURCE=.\res\rfile.bmp
1602 SOURCE=.\res\rfolder.bmp
1606 SOURCE=.\res\splash1.bmp
1610 SOURCE=.\Splsh16.bmp
1614 SOURCE=.\res\Toolbar.bmp
1618 SOURCE=.\res\unknown.bmp
1622 SOURCE=.\res\winmerge.bmp
1625 # Begin Group "EditLib"
1627 # PROP Default_Filter ""
1630 SOURCE=.\editlib\asp.cpp
1634 SOURCE=.\editlib\basic.cpp
1638 SOURCE=.\editlib\batch.cpp
1642 SOURCE=.\editlib\ccrystaleditview.cpp
1646 SOURCE=.\editlib\ccrystaleditview.h
1650 SOURCE=.\editlib\ccrystaleditview.inl
1654 SOURCE=.\editlib\ccrystaltextbuffer.cpp
1658 SOURCE=.\editlib\ccrystaltextbuffer.h
1662 SOURCE=.\editlib\ccrystaltextbuffer.inl
1666 SOURCE=.\editlib\ccrystaltextview.cpp
1670 SOURCE=.\editlib\ccrystaltextview.h
1674 SOURCE=.\editlib\ccrystaltextview.inl
1678 SOURCE=.\editlib\ccrystaltextview2.cpp
1682 SOURCE=.\editlib\ceditreplacedlg.cpp
1686 SOURCE=.\editlib\ceditreplacedlg.h
1690 SOURCE=.\editlib\cfindtextdlg.cpp
1694 SOURCE=.\editlib\cfindtextdlg.h
1698 SOURCE=.\editlib\chcondlg.cpp
1702 SOURCE=.\editlib\chcondlg.h
1706 SOURCE=.\editlib\cplusplus.cpp
1710 SOURCE=.\editlib\cregexp.cpp
1714 SOURCE=.\editlib\cregexp.h
1718 SOURCE=.\editlib\crystaleditviewex.cpp
1722 SOURCE=.\editlib\crystaleditviewex.h
1726 SOURCE=.\editlib\crystalparser.cpp
1730 SOURCE=.\editlib\crystalparser.h
1734 SOURCE=.\editlib\crystaltextblock.cpp
1738 SOURCE=.\editlib\crystaltextblock.h
1742 SOURCE=.\editlib\cs2cs.cpp
1746 SOURCE=.\editlib\cs2cs.h
1750 SOURCE=.\editlib\csharp.cpp
1754 SOURCE=.\editlib\dcl.cpp
1758 SOURCE=.\editlib\editcmd.h
1762 SOURCE=.\editlib\editreg.h
1766 SOURCE=.\editlib\edtlib.h
1770 SOURCE=.\editlib\filesup.cpp
1774 SOURCE=.\editlib\filesup.h
1778 SOURCE=.\editlib\filesup.inl
1782 SOURCE=.\editlib\fortran.cpp
1786 SOURCE=.\editlib\fpattern.cpp
1790 SOURCE=.\editlib\fpattern.h
1794 SOURCE=.\editlib\gotodlg.cpp
1798 SOURCE=.\editlib\gotodlg.h
1802 SOURCE=.\editlib\html.cpp
1806 SOURCE=.\editlib\ini.cpp
1810 SOURCE=.\editlib\is.cpp
1814 SOURCE=.\editlib\java.cpp
1818 SOURCE=.\editlib\lisp.cpp
1822 SOURCE=.\editlib\memcombo.cpp
1826 SOURCE=.\editlib\memcombo.h
1830 SOURCE=.\editlib\memcombo.inl
1834 SOURCE=.\editlib\pascal.cpp
1838 SOURCE=.\editlib\perl.cpp
1842 SOURCE=.\editlib\php.cpp
1846 SOURCE=.\editlib\python.cpp
1850 SOURCE=.\editlib\registry.cpp
1854 SOURCE=.\editlib\registry.h
1858 SOURCE=.\editlib\resource.h
1862 SOURCE=.\editlib\rexx.cpp
1866 SOURCE=.\editlib\rsrc.cpp
1870 SOURCE=.\editlib\sgml.cpp
1874 SOURCE=.\editlib\sh.cpp
1878 SOURCE=.\editlib\siod.cpp
1882 SOURCE=.\editlib\sql.cpp
1886 SOURCE=.\editlib\statbar.cpp
1890 SOURCE=.\editlib\statbar.h
1894 SOURCE=.\editlib\tcl.cpp
1898 SOURCE=.\editlib\tex.cpp
1902 SOURCE=.\editlib\wispelld.h
1906 SOURCE=.\editlib\xml.cpp
1915 SOURCE=.\stampver.inf
1919 # Section Merge : {6F747475-446E-6C62-436C-6B0000003100}
1920 # 1:10:IDB_SPLASH:103
1921 # 2:21:SplashScreenInsertKey:4.0
1923 # Section Merge : {00312E6C-0754-0055-90BD-550078075500}
1924 # 1:19:IDR_POPUP_ABOUT_DLG:104