Thread: [Winmerge-svn] SF.net SVN: winmerge: [5431] trunk/Src/Merge.vcproj
Windows visual diff and merge for files and directories
Brought to you by:
christianlist,
grimmdp
From: <ki...@us...> - 2008-06-05 16:40:54
|
Revision: 5431 http://winmerge.svn.sourceforge.net/winmerge/?rev=5431&view=rev Author: kimmov Date: 2008-06-05 09:40:47 -0700 (Thu, 05 Jun 2008) Log Message: ----------- Fix project file after earlier patch (Remove MFC dependency from LineFiltersList.h and LineFiltersList.cpp.). Precompiled headers generation wasn't correctly changed to all targets. Modified Paths: -------------- trunk/Src/Merge.vcproj Modified: trunk/Src/Merge.vcproj =================================================================== --- trunk/Src/Merge.vcproj 2008-06-05 16:21:35 UTC (rev 5430) +++ trunk/Src/Merge.vcproj 2008-06-05 16:40:47 UTC (rev 5431) @@ -31,8 +31,8 @@ RuntimeLibrary="2" EnableFunctionLevelLinking="TRUE" RuntimeTypeInfo="TRUE" - UsePrecompiledHeader="3" - PrecompiledHeaderThrough="stdafx.h" + UsePrecompiledHeader="2" + PrecompiledHeaderThrough="" PrecompiledHeaderFile=".\..\BuildTmp\MergeUnicodeRelease/Merge.pch" AssemblerListingLocation=".\..\BuildTmp\MergeUnicodeRelease/" ObjectFile=".\..\BuildTmp\MergeUnicodeRelease/" @@ -105,7 +105,7 @@ RuntimeLibrary="3" RuntimeTypeInfo="TRUE" UsePrecompiledHeader="2" - PrecompiledHeaderThrough="stdafx.h" + PrecompiledHeaderThrough="" PrecompiledHeaderFile=".\..\BuildTmp\MergeUnicodeDebug/Merge.pch" AssemblerListingLocation=".\..\BuildTmp\MergeUnicodeDebug/" ObjectFile=".\..\BuildTmp\MergeUnicodeDebug/" @@ -177,7 +177,7 @@ RuntimeLibrary="3" RuntimeTypeInfo="TRUE" UsePrecompiledHeader="2" - PrecompiledHeaderThrough="stdafx.h" + PrecompiledHeaderThrough="" PrecompiledHeaderFile=".\..\BuildTmp\MergeDebug/Merge.pch" AssemblerListingLocation=".\..\BuildTmp\MergeDebug/" ObjectFile=".\..\BuildTmp\MergeDebug/" @@ -250,8 +250,8 @@ RuntimeLibrary="2" EnableFunctionLevelLinking="TRUE" RuntimeTypeInfo="TRUE" - UsePrecompiledHeader="3" - PrecompiledHeaderThrough="stdafx.h" + UsePrecompiledHeader="2" + PrecompiledHeaderThrough="" PrecompiledHeaderFile=".\..\BuildTmp\MergeRelease/Merge.pch" AssemblerListingLocation=".\..\BuildTmp\MergeRelease/" ObjectFile=".\..\BuildTmp\MergeRelease/" This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <ki...@us...> - 2008-06-05 16:49:13
|
Revision: 5433 http://winmerge.svn.sourceforge.net/winmerge/?rev=5433&view=rev Author: kimmov Date: 2008-06-05 09:48:25 -0700 (Thu, 05 Jun 2008) Log Message: ----------- Revert the previous change - it was just wrong to change precompiled headers globally! Modified Paths: -------------- trunk/Src/Merge.vcproj Modified: trunk/Src/Merge.vcproj =================================================================== --- trunk/Src/Merge.vcproj 2008-06-05 16:42:13 UTC (rev 5432) +++ trunk/Src/Merge.vcproj 2008-06-05 16:48:25 UTC (rev 5433) @@ -31,8 +31,8 @@ RuntimeLibrary="2" EnableFunctionLevelLinking="TRUE" RuntimeTypeInfo="TRUE" - UsePrecompiledHeader="2" - PrecompiledHeaderThrough="" + UsePrecompiledHeader="3" + PrecompiledHeaderThrough="stdafx.h" PrecompiledHeaderFile=".\..\BuildTmp\MergeUnicodeRelease/Merge.pch" AssemblerListingLocation=".\..\BuildTmp\MergeUnicodeRelease/" ObjectFile=".\..\BuildTmp\MergeUnicodeRelease/" @@ -105,7 +105,7 @@ RuntimeLibrary="3" RuntimeTypeInfo="TRUE" UsePrecompiledHeader="2" - PrecompiledHeaderThrough="" + PrecompiledHeaderThrough="stdafx.h" PrecompiledHeaderFile=".\..\BuildTmp\MergeUnicodeDebug/Merge.pch" AssemblerListingLocation=".\..\BuildTmp\MergeUnicodeDebug/" ObjectFile=".\..\BuildTmp\MergeUnicodeDebug/" @@ -177,7 +177,7 @@ RuntimeLibrary="3" RuntimeTypeInfo="TRUE" UsePrecompiledHeader="2" - PrecompiledHeaderThrough="" + PrecompiledHeaderThrough="stdafx.h" PrecompiledHeaderFile=".\..\BuildTmp\MergeDebug/Merge.pch" AssemblerListingLocation=".\..\BuildTmp\MergeDebug/" ObjectFile=".\..\BuildTmp\MergeDebug/" @@ -250,8 +250,8 @@ RuntimeLibrary="2" EnableFunctionLevelLinking="TRUE" RuntimeTypeInfo="TRUE" - UsePrecompiledHeader="2" - PrecompiledHeaderThrough="" + UsePrecompiledHeader="3" + PrecompiledHeaderThrough="stdafx.h" PrecompiledHeaderFile=".\..\BuildTmp\MergeRelease/Merge.pch" AssemblerListingLocation=".\..\BuildTmp\MergeRelease/" ObjectFile=".\..\BuildTmp\MergeRelease/" This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <ki...@us...> - 2008-06-05 16:53:31
|
Revision: 5434 http://winmerge.svn.sourceforge.net/winmerge/?rev=5434&view=rev Author: kimmov Date: 2008-06-05 09:52:51 -0700 (Thu, 05 Jun 2008) Log Message: ----------- Fix project file for real now. Change precompiled headers creation setting to automatic for LineFiltersList. The setting was wrong for release targets. Modified Paths: -------------- trunk/Src/Merge.vcproj Modified: trunk/Src/Merge.vcproj =================================================================== --- trunk/Src/Merge.vcproj 2008-06-05 16:48:25 UTC (rev 5433) +++ trunk/Src/Merge.vcproj 2008-06-05 16:52:51 UTC (rev 5434) @@ -2712,6 +2712,7 @@ Optimization="1" AdditionalIncludeDirectories="" PreprocessorDefinitions="" + UsePrecompiledHeader="2" PrecompiledHeaderThrough=""/> </FileConfiguration> <FileConfiguration @@ -2741,6 +2742,7 @@ Optimization="1" AdditionalIncludeDirectories="" PreprocessorDefinitions="" + UsePrecompiledHeader="2" PrecompiledHeaderThrough=""/> </FileConfiguration> </File> This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <ki...@us...> - 2008-06-07 06:57:15
|
Revision: 5445 http://winmerge.svn.sourceforge.net/winmerge/?rev=5445&view=rev Author: kimmov Date: 2008-06-06 23:57:12 -0700 (Fri, 06 Jun 2008) Log Message: ----------- PATCH: [ 1987057 ] Fix case of file names in project file Submitted by Marcel Gosselin Modified Paths: -------------- trunk/Src/Merge.vcproj Modified: trunk/Src/Merge.vcproj =================================================================== --- trunk/Src/Merge.vcproj 2008-06-07 06:48:49 UTC (rev 5444) +++ trunk/Src/Merge.vcproj 2008-06-07 06:57:12 UTC (rev 5445) @@ -1028,7 +1028,7 @@ </FileConfiguration> </File> <File - RelativePath="common\CShellFileOp.cpp"> + RelativePath="Common\CShellFileOp.cpp"> <FileConfiguration Name="UnicodeRelease|Win32"> <Tool @@ -3621,7 +3621,7 @@ </FileConfiguration> </File> <File - RelativePath="common\OptionsMgr.cpp"> + RelativePath="Common\OptionsMgr.cpp"> <FileConfiguration Name="UnicodeRelease|Win32"> <Tool @@ -5902,7 +5902,7 @@ RelativePath="Common\coretypes.h"> </File> <File - RelativePath="common\CShellFileOp.h"> + RelativePath="Common\CShellFileOp.h"> </File> <File RelativePath="Common\CSubclass.h"> @@ -6124,7 +6124,7 @@ RelativePath="OptionsDef.h"> </File> <File - RelativePath="common\OptionsMgr.h"> + RelativePath="Common\OptionsMgr.h"> </File> <File RelativePath="OutputDlg.h"> @@ -6199,7 +6199,7 @@ RelativePath="Common\RegKey.h"> </File> <File - RelativePath="Resource.h"> + RelativePath="resource.h"> </File> <File RelativePath="SaveClosingDlg.h"> @@ -8306,7 +8306,7 @@ Name="DiffEngine" Filter=""> <File - RelativePath="diffutils\src\ANALYZE.C"> + RelativePath="diffutils\src\analyze.c"> <FileConfiguration Name="UnicodeRelease|Win32"> <Tool This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <ki...@us...> - 2008-06-24 19:36:03
|
Revision: 5519 http://winmerge.svn.sourceforge.net/winmerge/?rev=5519&view=rev Author: kimmov Date: 2008-06-24 12:35:08 -0700 (Tue, 24 Jun 2008) Log Message: ----------- Fix ANSI build, Src/Common/RegOptionsMgr.cpp didn't have all needed properties in project file. Modified Paths: -------------- trunk/Src/Merge.vcproj Modified: trunk/Src/Merge.vcproj =================================================================== --- trunk/Src/Merge.vcproj 2008-06-24 17:13:33 UTC (rev 5518) +++ trunk/Src/Merge.vcproj 2008-06-24 19:35:08 UTC (rev 5519) @@ -4612,6 +4612,9 @@ Name="UnicodeRelease|Win32"> <Tool Name="VCCLCompilerTool" + Optimization="1" + AdditionalIncludeDirectories="" + PreprocessorDefinitions="" UsePrecompiledHeader="2" PrecompiledHeaderThrough=""/> </FileConfiguration> @@ -4619,15 +4622,32 @@ Name="UnicodeDebug|Win32"> <Tool Name="VCCLCompilerTool" - PrecompiledHeaderThrough=""/> + Optimization="0" + AdditionalIncludeDirectories="" + PreprocessorDefinitions="" + PrecompiledHeaderThrough="" + BrowseInformation="1"/> </FileConfiguration> <FileConfiguration Name="Debug|Win32"> <Tool Name="VCCLCompilerTool" + Optimization="0" + AdditionalIncludeDirectories="" + PreprocessorDefinitions="" + PrecompiledHeaderThrough="" + BrowseInformation="1"/> + </FileConfiguration> + <FileConfiguration + Name="Release|Win32"> + <Tool + Name="VCCLCompilerTool" + Optimization="1" + AdditionalIncludeDirectories="" + PreprocessorDefinitions="" + UsePrecompiledHeader="2" PrecompiledHeaderThrough=""/> - </FileConfiguration> - </File> + </FileConfiguration> </File> <File RelativePath="SaveClosingDlg.cpp"> <FileConfiguration This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <ki...@us...> - 2008-07-10 19:53:01
|
Revision: 5596 http://winmerge.svn.sourceforge.net/winmerge/?rev=5596&view=rev Author: kimmov Date: 2008-07-10 12:52:59 -0700 (Thu, 10 Jul 2008) Log Message: ----------- Build AnsiConvert.cpp without precompiled headers. Modified Paths: -------------- trunk/Src/Merge.vcproj Modified: trunk/Src/Merge.vcproj =================================================================== --- trunk/Src/Merge.vcproj 2008-07-10 19:52:22 UTC (rev 5595) +++ trunk/Src/Merge.vcproj 2008-07-10 19:52:59 UTC (rev 5596) @@ -395,7 +395,9 @@ Name="VCCLCompilerTool" Optimization="1" AdditionalIncludeDirectories="" - PreprocessorDefinitions="WIN32;_WINDOWS;_AFXDLL;EDITPADC_CLASS=;COMPILE_MULTIMON_STUBS;UNICODE;_UNICODE;$(NoInherit)"/> + PreprocessorDefinitions="WIN32;_WINDOWS;_AFXDLL;EDITPADC_CLASS=;COMPILE_MULTIMON_STUBS;UNICODE;_UNICODE;$(NoInherit)" + UsePrecompiledHeader="2" + PrecompiledHeaderThrough=""/> </FileConfiguration> <FileConfiguration Name="UnicodeDebug|Win32"> @@ -404,6 +406,7 @@ Optimization="0" AdditionalIncludeDirectories="" PreprocessorDefinitions="" + PrecompiledHeaderThrough="" BrowseInformation="1"/> </FileConfiguration> <FileConfiguration @@ -413,6 +416,7 @@ Optimization="0" AdditionalIncludeDirectories="" PreprocessorDefinitions="" + PrecompiledHeaderThrough="" BrowseInformation="1"/> </FileConfiguration> <FileConfiguration @@ -421,8 +425,11 @@ Name="VCCLCompilerTool" Optimization="1" AdditionalIncludeDirectories="" - PreprocessorDefinitions="WIN32;_WINDOWS;_MBCS;_AFXDLL;EDITPADC_CLASS=;COMPILE_MULTIMON_STUBS;$(NoInherit)"/> - </FileConfiguration> </File> + PreprocessorDefinitions="WIN32;_WINDOWS;_MBCS;_AFXDLL;EDITPADC_CLASS=;COMPILE_MULTIMON_STUBS;$(NoInherit)" + UsePrecompiledHeader="2" + PrecompiledHeaderThrough=""/> + </FileConfiguration> + </File> <File RelativePath="BCMenu.cpp"> <FileConfiguration This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |