[ 804408 ] Fixes to help compile release version

diff --git a/Src/Merge.dsp b/Src/Merge.dsp
index 04df4de..29ff088 100644 (file)
--- a/Src/Merge.dsp
+++ b/Src/Merge.dsp
@@ -53,7 +53,7 @@ BSC32=bscmake.exe
 # ADD BSC32 /nologo
 LINK32=link.exe
 # ADD BASE LINK32 /nologo /subsystem:windows /machine:I386
-# ADD LINK32 version.lib /nologo /subsystem:windows /debug /machine:I386 /nodefaultlib:"msvcrtd.lib" /out:"..\Build\MergeRelease/WinMerge.exe" /verbose:lib
+# 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
@@ -196,11 +196,11 @@ SOURCE=.\DiffThread.cpp
 # End Source File
 # Begin Source File
 
-SOURCE=.\DiffWrapper.cpp
+SOURCE=.\DiffViewBar.cpp
 # End Source File
 # Begin Source File
 
-SOURCE=.\DiffViewBar.cpp
+SOURCE=.\DiffWrapper.cpp
 # End Source File
 # Begin Source File
 
@@ -280,15 +280,7 @@ SOURCE=.\DirViewColItems.cpp
 # Begin Source File
 
 SOURCE=..\common\dllproxy.c
-
-!IF  "$(CFG)" == "Merge - Win32 Release"
-
-!ELSEIF  "$(CFG)" == "Merge - Win32 Debug"
-
 # SUBTRACT CPP /YX /Yc /Yu
-
-!ENDIF 
-
 # End Source File
 # Begin Source File
 
@@ -406,15 +398,7 @@ SOURCE=..\common\LogFile.cpp
 # Begin Source File
 
 SOURCE=..\common\lwdisp.c
-
-!IF  "$(CFG)" == "Merge - Win32 Release"
-
-!ELSEIF  "$(CFG)" == "Merge - Win32 Debug"
-
 # SUBTRACT CPP /YX /Yc /Yu
-
-!ENDIF 
-
 # End Source File
 # Begin Source File
 
@@ -734,15 +718,15 @@ SOURCE=.\DiffThread.h
 # End Source File
 # Begin Source File
 
-SOURCE=.\DiffWrapper.h
+SOURCE=.\DiffViewBar.h
 # End Source File
 # Begin Source File
 
-SOURCE=.\DirColsDlg.h
+SOURCE=.\DiffWrapper.h
 # End Source File
 # Begin Source File
 
-SOURCE=.\DiffViewBar.h
+SOURCE=.\DirColsDlg.h
 # End Source File
 # Begin Source File
 

diff --git a/Src/readme.txt b/Src/readme.txt
index 4ec4c54..2e7ff6a 100644 (file)
--- a/Src/readme.txt
+++ b/Src/readme.txt
@@ -1,4 +1,6 @@
 2003-09-11 Laoran
+ PATCH: [ 804408 ] Fixes to help compile release version
+  WinMerge: Merge.dsp 
  PATCH: [ 797821 ] GUI for the file EOL option
   WinMerge: ChildFrm.cpp GhostTextBuffer.cpp MainFrm.cpp MainFrm.h Merge.rc MergeDoc.cpp 
    MergeDoc.h MergeEditView.cpp MergeEditView.h PropGeneral.cpp PropGeneral.h resource.h