[Winmerge-svn] SF.net SVN: winmerge: [5381] trunk/Src

[<ki...@us...>]

Revision: 5381
          http://winmerge.svn.sourceforge.net/winmerge/?rev=5381&view=rev
Author:   kimmov
Date:     2008-05-27 07:33:49 -0700 (Tue, 27 May 2008)

Log Message:
-----------
TODO: [ 1941779 ] Update PCRE to latest version
 Fix include paths to WinMerge project file, fix Prelink.bat.

Modified Paths:
--------------
    trunk/Src/Merge.vcproj
    trunk/Src/PreLink.bat

Modified: trunk/Src/Merge.vcproj
===================================================================
--- trunk/Src/Merge.vcproj	2008-05-27 14:12:36 UTC (rev 5380)
+++ trunk/Src/Merge.vcproj	2008-05-27 14:33:49 UTC (rev 5381)
@@ -25,7 +25,7 @@
 				AdditionalOptions="/EHa "
 				Optimization="1"
 				InlineFunctionExpansion="1"
-				AdditionalIncludeDirectories=".,.\CompareEngines,.\Common,.\editlib,.\diffutils,.\diffutils\lib,.\diffutils\src,..\Externals\expat\lib,..\Externals\expat\xmlwf,..\Externals\scew,..\Externals\pcre\pcre-6.7"
+				AdditionalIncludeDirectories=".;.\CompareEngines;.\Common;.\editlib;.\diffutils;.\diffutils\lib;.\diffutils\src;..\Externals\expat\lib;..\Externals\expat\xmlwf;..\Externals\scew;..\Externals\pcre\Win32"
 				PreprocessorDefinitions="WIN32;_WINDOWS;HAVE_STDLIB_H;STDC_HEADERS;HAVE_STRING_H=1;PR_FILE_NAME=\"pr\";DIFF_PROGRAM=\"diff\";REGEX_MALLOC;__MSC__;__NT__;USG=1;EDITPADC_CLASS=;COMPILE_MULTIMON_STUBS;UNICODE"
 				StringPooling="TRUE"
 				RuntimeLibrary="2"
@@ -100,7 +100,7 @@
 				Name="VCCLCompilerTool"
 				AdditionalOptions="/EHa "
 				Optimization="0"
-				AdditionalIncludeDirectories=".,.\CompareEngines,.\Common,.\editlib,.\diffutils,.\diffutils\lib,.\diffutils\src,..\Externals\expat\lib,..\Externals\expat\xmlwf,..\Externals\scew,..\Externals\pcre\pcre-6.7"
+				AdditionalIncludeDirectories=".;.\CompareEngines;.\Common;.\editlib;.\diffutils;.\diffutils\lib;.\diffutils\src;..\Externals\expat\lib;..\Externals\expat\xmlwf;..\Externals\scew;..\Externals\pcre\Win32"
 				PreprocessorDefinitions="_DEBUG;WIN32;_WINDOWS;HAVE_STDLIB_H;STDC_HEADERS;HAVE_STRING_H=1;PR_FILE_NAME=\"pr\";DIFF_PROGRAM=\"diff\";REGEX_MALLOC;__MSC__;__NT__;USG=1;EDITPADC_CLASS=;COMPILE_MULTIMON_STUBS;UNICODE"
 				RuntimeLibrary="3"
 				RuntimeTypeInfo="TRUE"
@@ -172,7 +172,7 @@
 				Name="VCCLCompilerTool"
 				AdditionalOptions="/EHa "
 				Optimization="0"
-				AdditionalIncludeDirectories=".,.\CompareEngines,.\Common,.\editlib,.\diffutils,.\diffutils\lib,.\diffutils\src,..\Externals\expat\lib,..\Externals\expat\xmlwf,..\Externals\scew,..\Externals\pcre\pcre-6.7"
+				AdditionalIncludeDirectories=".;.\CompareEngines;.\Common;.\editlib;.\diffutils;.\diffutils\lib;.\diffutils\src;..\Externals\expat\lib;..\Externals\expat\xmlwf;..\Externals\scew;..\Externals\pcre\Win32"
 				PreprocessorDefinitions="_DEBUG;WIN32;_WINDOWS;HAVE_STDLIB_H;STDC_HEADERS;HAVE_STRING_H=1;PR_FILE_NAME=\"pr\";DIFF_PROGRAM=\"diff\";REGEX_MALLOC;__MSC__;__NT__;USG=1;EDITPADC_CLASS=;COMPILE_MULTIMON_STUBS"
 				RuntimeLibrary="3"
 				RuntimeTypeInfo="TRUE"
@@ -244,7 +244,7 @@
 				AdditionalOptions="/EHa "
 				Optimization="1"
 				InlineFunctionExpansion="1"
-				AdditionalIncludeDirectories=".,.\CompareEngines,.\Common,.\editlib,.\diffutils,.\diffutils\lib,.\diffutils\src,..\Externals\expat\lib,..\Externals\expat\xmlwf,..\Externals\scew,..\Externals\pcre\pcre-6.7"
+				AdditionalIncludeDirectories=".;.\CompareEngines;.\Common;.\editlib;.\diffutils;.\diffutils\lib;.\diffutils\src;..\Externals\expat\lib;..\Externals\expat\xmlwf;..\Externals\scew;..\Externals\pcre\Win32"
 				PreprocessorDefinitions="WIN32;_WINDOWS;HAVE_STDLIB_H;STDC_HEADERS;HAVE_STRING_H=1;PR_FILE_NAME=\"pr\";DIFF_PROGRAM=\"diff\";REGEX_MALLOC;__MSC__;__NT__;USG=1;EDITPADC_CLASS=;COMPILE_MULTIMON_STUBS"
 				StringPooling="TRUE"
 				RuntimeLibrary="2"

Modified: trunk/Src/PreLink.bat
===================================================================
--- trunk/Src/PreLink.bat	2008-05-27 14:12:36 UTC (rev 5380)
+++ trunk/Src/PreLink.bat	2008-05-27 14:33:49 UTC (rev 5381)
@@ -37,10 +37,6 @@
 REM Create build directories
 mkdir ..\Build\expat
 mkdir ..\Build\pcre
-
-REM Configure PCRE
-cd %2\..\..\..\Externals\pcre\config_pcre
-nmake /f "configure.mak"
 goto %1
 
 :.\..\BuildTmp\MergeDebug
@@ -75,7 +71,7 @@
 %devenv% "scew.vcproj" /build "Debug"
 
 REM Build PCRE
-cd %2\..\..\..\Externals\pcre\dll_pcre
+cd %2\..\..\..\Externals\pcre\Win32
 %msdev% "pcre.dsp" /make "pcre - Win32 Debug"
 %devenv% "pcre.vcproj" /build "Debug"
 cd %2\..\..\pcre
@@ -99,9 +95,9 @@
 %devenv% "scew.vcproj" /build "Release"
 
 REM Build PCRE
-cd %2\..\..\..\Externals\pcre\dll_pcre
+cd %2\..\..\..\Externals\pcre\Win32
 %msdev% "pcre.dsp" /make "pcre - Win32 Release"
-%devenv% "pcre.vcproj" /build "Release"
+%devenv% "pcre.vcproj" /build "MinSizeRel"
 cd %2\..\..\pcre
 copy bin\release\pcre.dll %2\..\
 goto Common


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.