You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@tomcat.apache.org by mt...@apache.org on 2007/03/21 13:27:51 UTC
svn commit: r520856 - in /tomcat/connectors/trunk/jk/native/iis:
Makefile.amd64 Makefile.ia64
Author: mturk
Date: Wed Mar 21 05:27:51 2007
New Revision: 520856
URL: http://svn.apache.org/viewvc?view=rev&rev=520856
Log:
Embed manifests into dll if generated
Modified:
tomcat/connectors/trunk/jk/native/iis/Makefile.amd64
tomcat/connectors/trunk/jk/native/iis/Makefile.ia64
Modified: tomcat/connectors/trunk/jk/native/iis/Makefile.amd64
URL: http://svn.apache.org/viewvc/tomcat/connectors/trunk/jk/native/iis/Makefile.amd64?view=diff&rev=520856&r1=520855&r2=520856
==============================================================================
--- tomcat/connectors/trunk/jk/native/iis/Makefile.amd64 (original)
+++ tomcat/connectors/trunk/jk/native/iis/Makefile.amd64 Wed Mar 21 05:27:51 2007
@@ -6,10 +6,10 @@
CPP=cl.exe
MTL=midl.exe
RSC=rc.exe
-OUTDIR=.\Release_x86
-INTDIR=.\Release_x86
+OUTDIR=.\Release_amd64
+INTDIR=.\Release_amd64
# Begin Custom Macros
-OutDir=.\Release_x86
+OutDir=.\Release_amd64
# End Custom Macros
!IF "$(RECURSE)" == "0"
@@ -98,6 +98,8 @@
$(LINK32) @<<
$(LINK32_FLAGS) $(LINK32_OBJS)
<<
+ IF EXIST $(OUTDIR)\isapi_redirect.manifest \
+ mt -nologo -manifest $(OUTDIR)\isapi_redirect.manifest -outputresource:$(OUTDIR)\isapi_redirect.dll;2
CPP_PROJ=/nologo /MD /W3 /Zi /O2 /I "..\common" /I "pcre" /I "$(JAVA_HOME)\include" /I "$(JAVA_HOME)\include\win32" /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_AMD64_=1" -DWIN64 /D "_WIN64" /Wp64 /FIPRE64PRA.H /D "ISAPI_EXPORTS" /D "HAS_PCRE" /Fo"$(INTDIR)\\" /Fd"$(INTDIR)\isapi_redirector_src" /FD /c
Modified: tomcat/connectors/trunk/jk/native/iis/Makefile.ia64
URL: http://svn.apache.org/viewvc/tomcat/connectors/trunk/jk/native/iis/Makefile.ia64?view=diff&rev=520856&r1=520855&r2=520856
==============================================================================
--- tomcat/connectors/trunk/jk/native/iis/Makefile.ia64 (original)
+++ tomcat/connectors/trunk/jk/native/iis/Makefile.ia64 Wed Mar 21 05:27:51 2007
@@ -98,6 +98,8 @@
$(LINK32) @<<
$(LINK32_FLAGS) $(LINK32_OBJS)
<<
+ IF EXIST $(OUTDIR)\isapi_redirect.manifest \
+ mt -nologo -manifest $(OUTDIR)\isapi_redirect.manifest -outputresource:$(OUTDIR)\isapi_redirect.dll;2
CPP_PROJ=/nologo /MD /W3 /Zi /O2 /I "..\common" /I "pcre" /I "$(JAVA_HOME)\include" /I "$(JAVA_HOME)\include\win32" /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_IA64_=1" -DWIN64 /D "_WIN64" /Wp64 /FIPRE64PRA.H /D "ISAPI_EXPORTS" /D "HAS_PCRE" /Fo"$(INTDIR)\\" /Fd"$(INTDIR)\isapi_redirector_src" /FD /c
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@tomcat.apache.org
For additional commands, e-mail: dev-help@tomcat.apache.org