Author: mturk
Date: Thu Mar 22 12:52:51 2007
New Revision: 521424
URL: http://svn.apache.org/viewvc?view=rev&rev=521424
Log:
Add /D "PCRE_STATIC" to build files
Modified:
tomcat/connectors/trunk/jk/native/iis/Makefile.amd64
tomcat/connectors/trunk/jk/native/iis/Makefile.ia64
tomcat/connectors/trunk/jk/native/iis/Makefile.x86
tomcat/connectors/trunk/jk/native/iis/isapi.dsp
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=521424&r1=521423&r2=521424
==============================================================================
--- tomcat/connectors/trunk/jk/native/iis/Makefile.amd64 (original)
+++ tomcat/connectors/trunk/jk/native/iis/Makefile.amd64 Thu Mar 22 12:52:51
2007
@@ -101,7 +101,7 @@
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
+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" /D "PCRE_STATIC" /Fo"$(INTDIR)\\"
/Fd"$(INTDIR)\isapi_redirector_src" /FD /c
.c{$(INTDIR)}.obj::
$(CPP) @<<
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=521424&r1=521423&r2=521424
==============================================================================
--- tomcat/connectors/trunk/jk/native/iis/Makefile.ia64 (original)
+++ tomcat/connectors/trunk/jk/native/iis/Makefile.ia64 Thu Mar 22 12:52:51 2007
@@ -101,7 +101,7 @@
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
+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" /D "PCRE_STATIC" /Fo"$(INTDIR)\\"
/Fd"$(INTDIR)\isapi_redirector_src" /FD /c
.c{$(INTDIR)}.obj::
$(CPP) @<<
Modified: tomcat/connectors/trunk/jk/native/iis/Makefile.x86
URL:
http://svn.apache.org/viewvc/tomcat/connectors/trunk/jk/native/iis/Makefile.x86?view=diff&rev=521424&r1=521423&r2=521424
==============================================================================
--- tomcat/connectors/trunk/jk/native/iis/Makefile.x86 (original)
+++ tomcat/connectors/trunk/jk/native/iis/Makefile.x86 Thu Mar 22 12:52:51 2007
@@ -94,7 +94,7 @@
$(LINK32_FLAGS) $(LINK32_OBJS)
<<
-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 "ISAPI_EXPORTS" /D "HAS_PCRE" /Fo"$(INTDIR)\\"
/Fd"$(INTDIR)\isapi_redirector_src" /FD /c
+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 "ISAPI_EXPORTS" /D "HAS_PCRE" /D "PCRE_STATIC"
/Fo"$(INTDIR)\\" /Fd"$(INTDIR)\isapi_redirector_src" /FD /c
.c{$(INTDIR)}.obj::
$(CPP) @<<
Modified: tomcat/connectors/trunk/jk/native/iis/isapi.dsp
URL:
http://svn.apache.org/viewvc/tomcat/connectors/trunk/jk/native/iis/isapi.dsp?view=diff&rev=521424&r1=521423&r2=521424
==============================================================================
--- tomcat/connectors/trunk/jk/native/iis/isapi.dsp (original)
+++ tomcat/connectors/trunk/jk/native/iis/isapi.dsp Thu Mar 22 12:52:51 2007
@@ -43,7 +43,7 @@
# PROP Ignore_Export_Lib 0
# PROP Target_Dir ""
# ADD BASE CPP /nologo /MT /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D
"_MBCS" /D "_USRDLL" /D "ISAPI_EXPORTS" /YX /FD /c
-# ADD CPP /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 "ISAPI_EXPORTS" /D "HAS_PCRE"
/Fd"Release/isapi_redirector_src" /FD /c
+# ADD CPP /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 "ISAPI_EXPORTS" /D "HAS_PCRE" /D "PCRE_STATIC"
/Fd"Release/isapi_redirector_src" /FD /c
# ADD BASE MTL /nologo /D "NDEBUG" /mktyplib203 /win32
# ADD MTL /nologo /D "NDEBUG" /mktyplib203 /win32
# ADD BASE RSC /l 0x809 /d "NDEBUG"
@@ -69,7 +69,7 @@
# PROP Ignore_Export_Lib 0
# PROP Target_Dir ""
# ADD BASE CPP /nologo /MTd /W3 /Gm /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D
"_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "ISAPI_EXPORTS" /YX /FD /GZ /c
-# ADD CPP /nologo /MDd /W3 /GX /Zi /Od /I "..\common" /I "pcre" /I
"$(JAVA_HOME)\include" /I "$(JAVA_HOME)\include\win32" /D "_DEBUG" /D "WIN32"
/D "_WINDOWS" /D "ISAPI_EXPORTS" /D "HAS_PCRE" /Fd"Debug/isapi_redirector_src"
/FD /c
+# ADD CPP /nologo /MDd /W3 /GX /Zi /Od /I "..\common" /I "pcre" /I
"$(JAVA_HOME)\include" /I "$(JAVA_HOME)\include\win32" /D "_DEBUG" /D "WIN32"
/D "_WINDOWS" /D "ISAPI_EXPORTS" /D "HAS_PCRE" /D "PCRE_STATIC"
/Fd"Debug/isapi_redirector_src" /FD /c
# ADD BASE MTL /nologo /D "_DEBUG" /mktyplib203 /win32
# ADD MTL /nologo /D "_DEBUG" /mktyplib203 /win32
# ADD BASE RSC /l 0x809 /d "_DEBUG"
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
