tomcat-dev mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From mt...@apache.org
Subject cvs commit: jakarta-tomcat-connectors/jk/native2/server/isapi isapi.dsp
Date Tue, 22 Oct 2002 11:57:33 GMT
mturk       2002/10/22 04:57:33

  Modified:    jk/native2/server/isapi isapi.dsp
  Log:
  Added HAS_PCRE cause Apache2 (required for build)
  comes with pcre.
  
  Revision  Changes    Path
  1.21      +12 -12    jakarta-tomcat-connectors/jk/native2/server/isapi/isapi.dsp
  
  Index: isapi.dsp
  ===================================================================
  RCS file: /home/cvs/jakarta-tomcat-connectors/jk/native2/server/isapi/isapi.dsp,v
  retrieving revision 1.20
  retrieving revision 1.21
  diff -u -r1.20 -r1.21
  --- isapi.dsp	27 Sep 2002 17:59:53 -0000	1.20
  +++ isapi.dsp	22 Oct 2002 11:57:33 -0000	1.21
  @@ -45,7 +45,7 @@
   # PROP Ignore_Export_Lib 0
   # PROP Target_Dir ""
   # ADD BASE CPP /nologo /MD /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_MBCS"
/D "_USRDLL" /D "ISAPI_EXPORTS" /YX /FD /c
  -# ADD CPP /nologo /MD /W3 /GX /O2 /I "..\..\include" /I "$(JAVA_HOME)\include" /I "$(JAVA_HOME)\include\win32"
/I "$(APACHE2_HOME)\include" /I "$(APACHE2_HOME)\os\win32" /D "WIN32" /D "NDEBUG" /D "_WINDOWS"
/D "_MBCS" /D "_USRDLL" /D "ISAPI_EXPORTS" /D "HAVE_JNI" /D "HAS_APR" /FR /YX /FD /c
  +# ADD CPP /nologo /MD /W3 /GX /O2 /I "..\..\include" /I "$(JAVA_HOME)\include" /I "$(JAVA_HOME)\include\win32"
/I "$(APACHE2_HOME)\include" /I "$(APACHE2_HOME)\os\win32" /D "NDEBUG" /D "WIN32" /D "_WINDOWS"
/D "_MBCS" /D "_USRDLL" /D "ISAPI_EXPORTS" /D "HAVE_JNI" /D "HAS_APR" /D "HAS_PCRE" /FR /YX
/FD /c
   # ADD BASE MTL /nologo /D "NDEBUG" /mktyplib203 /win32
   # ADD MTL /nologo /D "NDEBUG" /mktyplib203 /win32
   # ADD BASE RSC /l 0xc0a /d "NDEBUG"
  @@ -55,7 +55,7 @@
   # ADD BSC32 /nologo
   LINK32=link.exe
   # ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib
shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /dll /machine:I386
  -# ADD LINK32 libapr.lib libaprutil.lib wsock32.lib advapi32.lib /nologo /dll /machine:I386
/out:"Release/isapi_redirector2.dll" /libpath:"$(APACHE2_HOME)\lib"
  +# ADD LINK32 libapr.lib libaprutil.lib wsock32.lib advapi32.lib pcre.lib pcreposix.lib
/nologo /dll /machine:I386 /out:"Release/isapi_redirector2.dll" /libpath:"$(APACHE2_HOME)\lib"
   
   !ELSEIF  "$(CFG)" == "isapi - Win32 Debug"
   
  @@ -71,7 +71,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 /MTd /W3 /Gm /GX /ZI /Od /I "..\..\include" /I "$(JAVA_HOME)\include"
/I "$(JAVA_HOME)\include\win32" /I "$(APACHE2_HOME)\include" /I "$(APACHE2_HOME)\os\win32"
/D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "ISAPI_EXPORTS" /D "HAVE_JNI"
/D "HAS_APR" /FR /YX /FD /GZ /c
  +# ADD CPP /nologo /MTd /W3 /Gm /GX /ZI /Od /I "..\..\include" /I "$(JAVA_HOME)\include"
/I "$(JAVA_HOME)\include\win32" /I "$(APACHE2_HOME)\include" /I "$(APACHE2_HOME)\os\win32"
/D "_DEBUG" /D "WIN32" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "ISAPI_EXPORTS" /D "HAVE_JNI"
/D "HAS_APR" /D "HAS_PCRE" /FR /YX /FD /GZ /c
   # ADD BASE MTL /nologo /D "_DEBUG" /mktyplib203 /win32
   # ADD MTL /nologo /D "_DEBUG" /mktyplib203 /win32
   # ADD BASE RSC /l 0xc0a /d "_DEBUG"
  @@ -81,15 +81,15 @@
   # ADD BSC32 /nologo
   LINK32=link.exe
   # ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib
shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /dll /debug /machine:I386
/pdbtype:sept
  -# ADD LINK32 libapr.lib libaprutil.lib wsock32.lib advapi32.lib /nologo /dll /debug /machine:I386
/out:"Debug/isapi_redirector2.dll" /pdbtype:sept /libpath:"$(APACHE2_HOME)\lib"
  +# ADD LINK32 libapr.lib libaprutil.lib wsock32.lib advapi32.lib pcre.lib pcreposix.lib
/nologo /dll /debug /machine:I386 /out:"Debug/isapi_redirector2.dll" /pdbtype:sept /libpath:"$(APACHE2_HOME)\lib"
   # SUBTRACT LINK32 /nodefaultlib
   
   !ELSEIF  "$(CFG)" == "isapi - Win32 Debug Static"
   
   # PROP BASE Use_MFC 0
   # PROP BASE Use_Debug_Libraries 1
  -# PROP BASE Output_Dir "isapi___Win32_Debug_Static"
  -# PROP BASE Intermediate_Dir "isapi___Win32_Debug_Static"
  +# PROP BASE Output_Dir "DebugS"
  +# PROP BASE Intermediate_Dir "DebugS"
   # PROP BASE Ignore_Export_Lib 0
   # PROP BASE Target_Dir ""
   # PROP Use_MFC 0
  @@ -99,7 +99,7 @@
   # PROP Ignore_Export_Lib 0
   # PROP Target_Dir ""
   # ADD BASE CPP /nologo /MTd /W3 /Gm /GX /ZI /Od /I "..\..\include" /I "$(JAVA_HOME)\include"
/I "$(JAVA_HOME)\include\win32" /I "$(APACHE2_HOME)\include" /I "$(APACHE2_HOME)\os\win32"
/D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "ISAPI_EXPORTS" /D "HAVE_JNI"
/D "HAS_APR" /FR /YX /FD /GZ /c
  -# ADD CPP /nologo /MDd /W3 /Gm /GX /ZI /Od /I "..\..\include" /I "$(JAVA_HOME)\include"
/I "$(JAVA_HOME)\include\win32" /I "$(APACHE2_HOME)\include" /I "$(APACHE2_HOME)\os\win32"
/D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "ISAPI_EXPORTS" /D "HAVE_JNI"
/D "HAS_APR" /D "APR_DECLARE_STATIC" /D "APU_DECLARE_STATIC" /FR /YX /FD /GZ /c
  +# ADD CPP /nologo /MDd /W3 /Gm /GX /ZI /Od /I "..\..\include" /I "$(JAVA_HOME)\include"
/I "$(JAVA_HOME)\include\win32" /I "$(APACHE2_HOME)\include" /I "$(APACHE2_HOME)\os\win32"
/D "_DEBUG" /D "APR_DECLARE_STATIC" /D "APU_DECLARE_STATIC" /D "WIN32" /D "_WINDOWS" /D "_MBCS"
/D "_USRDLL" /D "ISAPI_EXPORTS" /D "HAVE_JNI" /D "HAS_APR" /D "HAS_PCRE" /FR /YX /FD /GZ /c
   # ADD BASE MTL /nologo /D "_DEBUG" /mktyplib203 /win32
   # ADD MTL /nologo /D "_DEBUG" /mktyplib203 /win32
   # ADD BASE RSC /l 0x409 /d "_DEBUG"
  @@ -110,15 +110,15 @@
   LINK32=link.exe
   # ADD BASE LINK32 libapr.lib libaprutil.lib wsock32.lib advapi32.lib /nologo /dll /debug
/machine:I386 /out:"Debug/isapi_redirector2.dll" /pdbtype:sept /libpath:"$(APACHE2_HOME)\lib"
   # SUBTRACT BASE LINK32 /nodefaultlib
  -# ADD LINK32 apr.lib aprutil.lib wsock32.lib advapi32.lib ws2_32.lib /nologo /dll /debug
/machine:I386 /out:"DebugS/isapi_redirector2.dll" /pdbtype:sept /libpath:"$(APACHE2_HOME)\lib"
  +# ADD LINK32 apr.lib aprutil.lib ws2_32.lib wsock32.lib advapi32.lib pcre.lib pcreposix.lib
/nologo /dll /debug /machine:I386 /out:"DebugS/isapi_redirector2.dll" /pdbtype:sept /libpath:"$(APACHE2_HOME)\lib"
   # SUBTRACT LINK32 /nodefaultlib
   
   !ELSEIF  "$(CFG)" == "isapi - Win32 Release Static"
   
   # PROP BASE Use_MFC 0
   # PROP BASE Use_Debug_Libraries 0
  -# PROP BASE Output_Dir "isapi___Win32_Release_Static"
  -# PROP BASE Intermediate_Dir "isapi___Win32_Release_Static"
  +# PROP BASE Output_Dir "ReleaseS"
  +# PROP BASE Intermediate_Dir "ReleaseS"
   # PROP BASE Ignore_Export_Lib 0
   # PROP BASE Target_Dir ""
   # PROP Use_MFC 0
  @@ -128,7 +128,7 @@
   # PROP Ignore_Export_Lib 0
   # PROP Target_Dir ""
   # ADD BASE CPP /nologo /MD /W3 /GX /O2 /I "..\..\include" /I "$(JAVA_HOME)\include" /I
"$(JAVA_HOME)\include\win32" /I "$(APACHE2_HOME)\include" /I "$(APACHE2_HOME)\os\win32" /D
"WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "ISAPI_EXPORTS" /D "HAVE_JNI"
/D "HAS_APR" /FR /YX /FD /c
  -# ADD CPP /nologo /MD /W3 /GX /O2 /I "..\..\include" /I "$(JAVA_HOME)\include" /I "$(JAVA_HOME)\include\win32"
/I "$(APACHE2_HOME)\include" /I "$(APACHE2_HOME)\os\win32" /D "WIN32" /D "NDEBUG" /D "_WINDOWS"
/D "_WIN32" /D "_MBCS" /D "_USRDLL" /D "ISAPI_EXPORTS" /D "HAVE_JNI" /D "HAS_APR" /D "APR_DECLARE_STATIC"
/D "APU_DECLARE_STATIC" /FR /YX /FD /c
  +# ADD CPP /nologo /MD /W3 /GX /O2 /I "..\..\include" /I "$(JAVA_HOME)\include" /I "$(JAVA_HOME)\include\win32"
/I "$(APACHE2_HOME)\include" /I "$(APACHE2_HOME)\os\win32" /D "NDEBUG" /D "_WIN32" /D "APR_DECLARE_STATIC"
/D "APU_DECLARE_STATIC" /D "WIN32" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "ISAPI_EXPORTS"
/D "HAVE_JNI" /D "HAS_APR" /D "HAS_PCRE" /FR /YX /FD /c
   # ADD BASE MTL /nologo /D "NDEBUG" /mktyplib203 /win32
   # ADD MTL /nologo /D "NDEBUG" /mktyplib203 /win32
   # ADD BASE RSC /l 0x409 /d "NDEBUG"
  @@ -138,7 +138,7 @@
   # ADD BSC32 /nologo
   LINK32=link.exe
   # ADD BASE LINK32 libapr.lib libaprutil.lib wsock32.lib advapi32.lib /nologo /dll /machine:I386
/out:"Release/isapi_redirector2.dll" /libpath:"$(APACHE2_HOME)\lib"
  -# ADD LINK32 apr.lib aprutil.lib wsock32.lib advapi32.lib ws2_32.lib /nologo /dll /machine:I386
/out:"ReleaseS/isapi_redirector2.dll" /libpath:"$(APACHE2_HOME)\lib"
  +# ADD LINK32 apr.lib aprutil.lib ws2_32.lib wsock32.lib advapi32.lib pcre.lib pcreposix.lib
/nologo /dll /machine:I386 /out:"ReleaseS/isapi_redirector2.dll" /libpath:"$(APACHE2_HOME)\lib"
   
   !ENDIF 
   
  
  
  

--
To unsubscribe, e-mail:   <mailto:tomcat-dev-unsubscribe@jakarta.apache.org>
For additional commands, e-mail: <mailto:tomcat-dev-help@jakarta.apache.org>


Mime
View raw message