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 01:09:03 UTC
svn commit: r416160 - in /apr/apr-iconv/trunk: build/modules.mk.win
libapriconv.dsp
Author: wrowe
Date: Wed Jun 21 16:09:02 2006
New Revision: 416160
URL: http://svn.apache.org/viewvc?rev=416160&view=rev
Log:
Merge VS2005 .manifest files to their .dll/.so objects.
Modified:
apr/apr-iconv/trunk/build/modules.mk.win
apr/apr-iconv/trunk/libapriconv.dsp
Modified: apr/apr-iconv/trunk/build/modules.mk.win
URL: http://svn.apache.org/viewvc/apr/apr-iconv/trunk/build/modules.mk.win?rev=416160&r1=416159&r2=416160&view=diff
==============================================================================
--- apr/apr-iconv/trunk/build/modules.mk.win (original)
+++ apr/apr-iconv/trunk/build/modules.mk.win Wed Jun 21 16:09:02 2006
@@ -30,7 +30,7 @@
API_LIB_PFX = $(API_SOURCE)\LibR\ # no line continuation
CFG_CFLAGS = /MD /O2 /Oy- /Zi
CFG_DEFINES = /D "NDEBUG" /D "APR_DECLARE_STATIC" /D "API_DECLARE_STATIC"
-CFG_LDFLAGS = /debug /opt:ref
+CFG_LDFLAGS = /debug /incremental:no /opt:ref
CFG_OUTPUT = LibR\iconv
!ELSE
@@ -98,6 +98,7 @@
/base:@"..\build\BaseAddr.ref",$(@F) \
"$(API_LIB_PFX)apriconv-1.lib" "$(APR_LIB_PFX)apr-1.lib" \
kernel32.lib advapi32.lib ws2_32.lib mswsock.lib
+ if exist $@.manifest mt.exe -manifest $@.manifest -outputresource:$@;2
$(SILENT)echo.
$(SILENT)del "$*.exp"
$(SILENT)del "$*.lib"
Modified: apr/apr-iconv/trunk/libapriconv.dsp
URL: http://svn.apache.org/viewvc/apr/apr-iconv/trunk/libapriconv.dsp?rev=416160&r1=416159&r2=416160&view=diff
==============================================================================
--- apr/apr-iconv/trunk/libapriconv.dsp (original)
+++ apr/apr-iconv/trunk/libapriconv.dsp Wed Jun 21 16:09:02 2006
@@ -54,6 +54,12 @@
LINK32=link.exe
# ADD BASE LINK32 kernel32.lib advapi32.lib /nologo /base:"0x6EE50000" /subsystem:windows /dll /incremental:no /debug /opt:ref
# ADD LINK32 kernel32.lib advapi32.lib /nologo /base:"0x6EE50000" /subsystem:windows /dll /incremental:no /debug /out:"Release/libapriconv-1.dll" /opt:ref
+# Begin Special Build Tool
+OutDir=.\Release
+SOURCE="$(InputPath)"
+PostBuild_Desc=Embed .manifest
+PostBuild_Cmds=if exist $(OUTDIR)\libapriconv-1.dll.manifest mt.exe -manifest $(OUTDIR)\libapriconv-1.dll.manifest -outputresource:$(OUTDIR)\libapriconv-1.dll;2
+# End Special Build Tool
!ELSEIF "$(CFG)" == "libapriconv - Win32 Debug"
@@ -80,6 +86,12 @@
LINK32=link.exe
# ADD BASE LINK32 kernel32.lib advapi32.lib /nologo /base:"0x6EE50000" /subsystem:windows /dll /incremental:no /debug
# ADD LINK32 kernel32.lib advapi32.lib /nologo /base:"0x6EE50000" /subsystem:windows /dll /incremental:no /debug /out:"Debug/libapriconv-1.dll"
+# Begin Special Build Tool
+OutDir=.\Debug
+SOURCE="$(InputPath)"
+PostBuild_Desc=Embed .manifest
+PostBuild_Cmds=if exist $(OUTDIR)\libapriconv-1.dll.manifest mt.exe -manifest $(OUTDIR)\libapriconv-1.dll.manifest -outputresource:$(OUTDIR)\libapriconv-1.dll;2
+# End Special Build Tool
!ENDIF