Author: wrowe
Date: Wed Jun 21 15:11:51 2006
New Revision: 416132

URL: http://svn.apache.org/viewvc?rev=416132&view=rev
Log:

  Provide folding in autogenerated .manifest files for Win32 builders
  using VisualStudio 2005.  This causes the correct c runtime to be
  resolved at run time.

Backports: 416131

Modified:
    apr/apr-util/branches/1.2.x/CHANGES
    apr/apr-util/branches/1.2.x/libaprutil.dsp

Modified: apr/apr-util/branches/1.2.x/CHANGES
URL: http://svn.apache.org/viewvc/apr/apr-util/branches/1.2.x/CHANGES?rev=416132&r1=416131&r2=416132&view=diff
==============================================================================
--- apr/apr-util/branches/1.2.x/CHANGES (original)
+++ apr/apr-util/branches/1.2.x/CHANGES Wed Jun 21 15:11:51 2006
@@ -1,5 +1,8 @@
 Changes with APR-util 1.2.8
 
+  *) Provide folding in autogenerated .manifest files for Win32 builders
+     using VisualStudio 2005  [William Rowe]
+
   *) Implement prepared statement support in SQLite3 DBD driver
      [Bojan Smojver]
 

Modified: apr/apr-util/branches/1.2.x/libaprutil.dsp
URL: http://svn.apache.org/viewvc/apr/apr-util/branches/1.2.x/libaprutil.dsp?rev=416132&r1=416131&r2=416132&view=diff
==============================================================================
--- apr/apr-util/branches/1.2.x/libaprutil.dsp (original)
+++ apr/apr-util/branches/1.2.x/libaprutil.dsp Wed Jun 21 15:11:51 2006
@@ -54,6 +54,12 @@
 LINK32=link.exe
 # ADD BASE LINK32 kernel32.lib advapi32.lib ws2_32.lib mswsock.lib wldap32.lib ole32.lib /nologo /base:"0x6EE60000" /subsystem:windows /dll /incremental:no /debug /machine:I386 /opt:ref
 # ADD LINK32 kernel32.lib advapi32.lib ws2_32.lib mswsock.lib wldap32.lib ole32.lib /nologo /base:"0x6EE60000" /subsystem:windows /dll /incremental:no /debug /machine:I386 /out:"Release/libaprutil-1.dll" /opt:ref
+# Begin Special Build Tool
+OutDir=.\Release
+SOURCE="$(InputPath)"
+PostBuild_Desc=Embed .manifest
+PostBuild_Cmds=echo if exist $(OUTDIR)\libaprutil-1.dll.manifest mt.exe -manifest $(OUTDIR)\libaprutil-1.dll.manifest -outputresource:$(OUTDIR)\libaprutil-1.dll;2
+# End Special Build Tool
 
 !ELSEIF  "$(CFG)" == "libaprutil - Win32 Debug"
 
@@ -80,6 +86,12 @@
 LINK32=link.exe
 # ADD BASE LINK32 kernel32.lib advapi32.lib ws2_32.lib mswsock.lib wldap32.lib ole32.lib /nologo /base:"0x6EE60000" /subsystem:windows /dll /incremental:no /debug /machine:I386
 # ADD LINK32 kernel32.lib advapi32.lib ws2_32.lib mswsock.lib wldap32.lib ole32.lib /nologo /base:"0x6EE60000" /subsystem:windows /dll /incremental:no /debug /machine:I386 /out:"Debug/libaprutil-1.dll"
+# Begin Special Build Tool
+OutDir=.\Debug
+SOURCE="$(InputPath)"
+PostBuild_Desc=Embed .manifest
+PostBuild_Cmds=echo if exist $(OUTDIR)\libaprutil-1.dll.manifest mt.exe -manifest $(OUTDIR)\libaprutil-1.dll.manifest -outputresource:$(OUTDIR)\libaprutil-1.dll;2
+# End Special Build Tool
 
 !ENDIF