Author: mturk
Date: Fri Feb 19 07:35:47 2010
New Revision: 911725
URL: http://svn.apache.org/viewvc?rev=911725&view=rev
Log:
Embed manifest if generated by cl
Modified:
tomcat/jk/trunk/native/iis/Makefile.x86
tomcat/jk/trunk/native/netscape/Makefile.vc
Modified: tomcat/jk/trunk/native/iis/Makefile.x86
URL:
http://svn.apache.org/viewvc/tomcat/jk/trunk/native/iis/Makefile.x86?rev=911725&r1=911724&r2=911725&view=diff
==============================================================================
--- tomcat/jk/trunk/native/iis/Makefile.x86 (original)
+++ tomcat/jk/trunk/native/iis/Makefile.x86 Fri Feb 19 07:35:47 2010
@@ -110,6 +110,8 @@
$(LINK32) @<<
$(LINK32_FLAGS) $(LINK32_OBJS) commode.obj
<<
+ 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" $(CFLAGS) /D "WIN32" /D
"NDEBUG" /D "_WINDOWS" /D "JK_ISAPI" /D "ISAPI_EXPORTS" /D "HAS_PCRE" /D
"PCRE_STATIC" /Fo"$(INTDIR)\\" /Fd"$(INTDIR)\isapi_redirector_src" /FD /c
Modified: tomcat/jk/trunk/native/netscape/Makefile.vc
URL:
http://svn.apache.org/viewvc/tomcat/jk/trunk/native/netscape/Makefile.vc?rev=911725&r1=911724&r2=911725&view=diff
==============================================================================
--- tomcat/jk/trunk/native/netscape/Makefile.vc (original)
+++ tomcat/jk/trunk/native/netscape/Makefile.vc Fri Feb 19 07:35:47 2010
@@ -67,7 +67,7 @@
if not exist "$(OUTDIR)/$(NULL)" mkdir "$(OUTDIR)"
CPP=cl.exe
-CPP_PROJ=/nologo /MD /W3 /Zi /O2 /I "..\common" /I "$(SUNONE_HOME)\include" /I
"$(JAVA_HOME)\include" /I "$(JAVA_HOME)\include\win32" /D "WIN32" /D "NDEBUG"
/D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "JK_NSAPI" /D "NSAPI_EXPORTS" /D
"XP_WIN32" /D "MCC_HTTPD" /D "SPAPI20" /Fo"$(INTDIR)\\"
/Fd"Release/nsapi_redirect_src" /FD /c
+CPP_PROJ=/nologo /MD /W3 /Zi /O2 /I "..\common" /I "$(SUNONE_HOME)\include" /I
"$(JAVA_HOME)\include" /I "$(JAVA_HOME)\include\win32" /D "WIN32" /D "NDEBUG"
/D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "JK_NSAPI" /D "NSAPI_EXPORTS" /D
"XP_WIN32" /D "MCC_HTTPD" /D "SPAPI20" /Fo"$(INTDIR)\\"
/Fd"$(OUTDIR)\nsapi_redirect_src" /FD /c
.c{$(INTDIR)}.obj::
$(CPP) @<<
@@ -136,15 +136,8 @@
$(LINK32) @<<
$(LINK32_FLAGS) $(LINK32_OBJS)
<<
-
-
-!IF "$(NO_EXTERNAL_DEPS)" != "1"
-!IF EXISTS("nsapi.dep")
-!INCLUDE "nsapi.dep"
-!ELSE
-!MESSAGE Warning: cannot find "nsapi.dep"
-!ENDIF
-!ENDIF
+ IF EXIST $(OUTDIR)\nsapi_redirect.manifest \
+ mt -nologo -manifest $(OUTDIR)\nsapi_redirect.manifest
-outputresource:$(OUTDIR)\nsapi_redirect.dll;2
!IF "$(CFG)" == "nsapi - Win32 Release"
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
