Thread: [Winmerge-svn] SF.net SVN: winmerge:[7378] branches/R2_14/Src/PreLink.bat
Windows visual diff and merge for files and directories
Brought to you by:
christianlist,
grimmdp
From: <ki...@us...> - 2010-10-28 15:31:15
|
Revision: 7378 http://winmerge.svn.sourceforge.net/winmerge/?rev=7378&view=rev Author: kimmov Date: 2010-10-28 15:31:08 +0000 (Thu, 28 Oct 2010) Log Message: ----------- Fix copying compiled pcre files. Modified Paths: -------------- branches/R2_14/Src/PreLink.bat Modified: branches/R2_14/Src/PreLink.bat =================================================================== --- branches/R2_14/Src/PreLink.bat 2010-10-28 15:04:59 UTC (rev 7377) +++ branches/R2_14/Src/PreLink.bat 2010-10-28 15:31:08 UTC (rev 7378) @@ -134,10 +134,8 @@ cd %2\..\..\..\Externals\pcre\Win32 %msdev% "pcre.dsp" /make "pcre - Win32 Debug" %devenv% "pcre.vcproj" /build "Debug" -cd %2\..\..\pcre -copy Debug\pcre.dll -copy Debug\pcre.lib -copy pcre.dll %2\..\ +copy Debug\pcre.dll %2\..\..\pcre +copy Debug\pcre.lib %2\..\..\pcre goto Common @@ -164,10 +162,8 @@ cd %2\..\..\..\Externals\pcre\Win32 %msdev% "pcre.dsp" /make "pcre - Win32 Release" %devenv% "pcre.vcproj" /build "MinSizeRel" -cd %2\..\..\pcre -copy MinSizeRel\pcre.dll -copy MinSizeRel\pcre.lib -copy pcre.dll %2\..\ +copy MinSizeRel\pcre.dll %2\..\..\pcre +copy MinSizeRel\pcre.lib %2\..\..\pcre goto Common This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <ge...@us...> - 2010-10-31 13:18:52
|
Revision: 7386 http://winmerge.svn.sourceforge.net/winmerge/?rev=7386&view=rev Author: gerundt Date: 2010-10-31 13:18:46 +0000 (Sun, 31 Oct 2010) Log Message: ----------- Drop ANSI config from PreLink.bat - R2_14 Modified Paths: -------------- branches/R2_14/Src/PreLink.bat Modified: branches/R2_14/Src/PreLink.bat =================================================================== --- branches/R2_14/Src/PreLink.bat 2010-10-31 13:17:39 UTC (rev 7385) +++ branches/R2_14/Src/PreLink.bat 2010-10-31 13:18:46 UTC (rev 7386) @@ -49,21 +49,11 @@ mkdir ..\Build\heksedit goto %1 -:.\..\BuildTmp\MergeDebug -%info% ANSI/Debug -mkdir ..\Build\MergeDebug -goto Debug - :.\..\BuildTmp\MergeUnicodeDebug %info% UNICODE/Debug mkdir ..\Build\MergeUnicodeDebug goto Debug -:.\..\BuildTmp\MergeRelease -%info% ANSI/Release -mkdir ..\Build\MergeRelease -goto Release - :.\..\BuildTmp\MergeUnicodeRelease %info% UNICODE/Release mkdir ..\Build\MergeUnicodeRelease This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |