You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@apr.apache.org by wr...@apache.org on 2006/06/22 00:11:28 UTC
svn commit: r416131 - in /apr/apr-util/trunk: CHANGES libaprutil.dsp
Author: wrowe
Date: Wed Jun 21 15:11:28 2006
New Revision: 416131
URL: http://svn.apache.org/viewvc?rev=416131&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.
Crossports: 416113
Modified:
apr/apr-util/trunk/CHANGES
apr/apr-util/trunk/libaprutil.dsp
Modified: apr/apr-util/trunk/CHANGES
URL: http://svn.apache.org/viewvc/apr/apr-util/trunk/CHANGES?rev=416131&r1=416130&r2=416131&view=diff
==============================================================================
--- apr/apr-util/trunk/CHANGES (original)
+++ apr/apr-util/trunk/CHANGES Wed Jun 21 15:11:28 2006
@@ -1,5 +1,8 @@
Changes with APR-util 1.3.0
+ *) Provide folding in autogenerated .manifest files for Win32 builders
+ using VisualStudio 2005 [William Rowe]
+
*) Implement DBD transaction modes
[Bojan Smojver with help from many on the APR list]
Modified: apr/apr-util/trunk/libaprutil.dsp
URL: http://svn.apache.org/viewvc/apr/apr-util/trunk/libaprutil.dsp?rev=416131&r1=416130&r2=416131&view=diff
==============================================================================
--- apr/apr-util/trunk/libaprutil.dsp (original)
+++ apr/apr-util/trunk/libaprutil.dsp Wed Jun 21 15:11:28 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 /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 /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
# ADD LINK32 kernel32.lib advapi32.lib ws2_32.lib mswsock.lib wldap32.lib ole32.lib /nologo /base:"0x6EE60000" /subsystem:windows /dll /incremental:no /debug /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