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 2005/01/03 09:31:37 UTC

cvs commit: jakarta-tomcat-connectors/jk/native/netscape nsapi.dsp

mturk       2005/01/03 00:31:37

  Modified:    jk/native/netscape nsapi.dsp
  Log:
  Update build files for SunONE/iPlanet
  
  Revision  Changes    Path
  1.9       +18 -9     jakarta-tomcat-connectors/jk/native/netscape/nsapi.dsp
  
  Index: nsapi.dsp
  ===================================================================
  RCS file: /home/cvs/jakarta-tomcat-connectors/jk/native/netscape/nsapi.dsp,v
  retrieving revision 1.8
  retrieving revision 1.9
  diff -u -r1.8 -r1.9
  --- nsapi.dsp	10 Feb 2004 13:29:28 -0000	1.8
  +++ nsapi.dsp	3 Jan 2005 08:31:37 -0000	1.9
  @@ -38,12 +38,12 @@
   # PROP BASE Target_Dir ""
   # PROP Use_MFC 0
   # PROP Use_Debug_Libraries 0
  -# PROP Output_Dir "nsapi_release"
  -# PROP Intermediate_Dir "nsapi_release"
  +# PROP Output_Dir "Release"
  +# PROP Intermediate_Dir "Release"
   # 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 "NSAPI_EXPORTS" /YX /FD /c
  -# ADD CPP /nologo /MT /W3 /GX /O2 /I "..\common" /I "$(NS_HOME)\include" /I "$(JAVA_HOME)\include" /I "$(JAVA_HOME)\include\win32" /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "NSAPI_EXPORTS" /D "XP_WIN32" /YX /FD /c
  +# ADD CPP /nologo /MD /W3 /Zi /O2 /I "..\common" /I "$(NS_HOME)\plugins\include" /I "$(JAVA_HOME)\include" /I "$(JAVA_HOME)\include\win32" /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "NSAPI_EXPORTS" /D "XP_WIN32" /Fd"Release/nsapi_redirect_src" /FD /c
   # ADD BASE MTL /nologo /D "NDEBUG" /mktyplib203 /win32
   # ADD MTL /nologo /D "NDEBUG" /mktyplib203 /win32
   # ADD BASE RSC /l 0x409 /d "NDEBUG"
  @@ -53,7 +53,8 @@
   # 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 wsock32.lib ns-httpd36.lib /nologo /dll /machine:I386 /out:"nsapi_release/nsapi_redirect.dll" /libpath:"$(NS_HOME)\lib"
  +# ADD LINK32 wsock32.lib ns-httpd36.lib /nologo /base:"0x6A6B0000" /dll /machine:I386 /out:"Release/nsapi_redirect.dll" /libpath:"$(NS_HOME)\plugins\lib"
  +# SUBTRACT LINK32 /pdb:none
   
   !ELSEIF  "$(CFG)" == "nsapi - Win32 Debug"
   
  @@ -64,12 +65,12 @@
   # PROP BASE Target_Dir ""
   # PROP Use_MFC 0
   # PROP Use_Debug_Libraries 1
  -# PROP Output_Dir "nsapi_debug"
  -# PROP Intermediate_Dir "nsapi_debug"
  +# PROP Output_Dir "Debug"
  +# PROP Intermediate_Dir "Debug"
   # 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 "NSAPI_EXPORTS" /YX /FD /GZ /c
  -# ADD CPP /nologo /MTd /W3 /Gm /GX /ZI /Od /I "..\common" /I "$(NS_HOME)\include" /I "$(JAVA_HOME)\include" /I "$(JAVA_HOME)\include\win32" /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "NSAPI_EXPORTS" /D "XP_WIN32" /D "MCC_HTTPD" /D "SPAPI20" /YX /FD /GZ /c
  +# ADD CPP /nologo /MDd /W3 /GX /Zi /Od /I "..\common" /I "$(NS_HOME)\include" /I "$(JAVA_HOME)\include" /I "$(JAVA_HOME)\include\win32" /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "NSAPI_EXPORTS" /D "XP_WIN32" /D "MCC_HTTPD" /D "SPAPI20" /Fd"Debug/nsapi_redirect_src" /FD /c
   # ADD BASE MTL /nologo /D "_DEBUG" /mktyplib203 /win32
   # ADD MTL /nologo /D "_DEBUG" /mktyplib203 /win32
   # ADD BASE RSC /l 0x409 /d "_DEBUG"
  @@ -79,7 +80,8 @@
   # 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 wsock32.lib ns-httpd36.lib /nologo /dll /debug /machine:I386 /out:"nsapi_debug/nsapi_redirect.dll" /pdbtype:sept /libpath:"$(NS_HOME)\lib"
  +# ADD LINK32 wsock32.lib ns-httpd36.lib /nologo /base:"0x6A6B0000" /dll /debug /machine:I386 /out:"Debug/nsapi_redirect.dll" /pdbtype:sept /libpath:"$(NS_HOME)\lib"
  +# SUBTRACT LINK32 /pdb:none
   
   !ENDIF 
   
  @@ -92,6 +94,10 @@
   # PROP Default_Filter "cpp;c;cxx;rc;def;r;odl;idl;hpj;bat"
   # Begin Source File
   
  +SOURCE=..\common\jk_ajp12_worker.c
  +# End Source File
  +# Begin Source File
  +
   SOURCE=..\common\jk_ajp13.c
   # End Source File
   # Begin Source File
  @@ -148,6 +154,10 @@
   # End Source File
   # Begin Source File
   
  +SOURCE=..\common\jk_sockbuf.c
  +# End Source File
  +# Begin Source File
  +
   SOURCE=..\common\jk_uri_worker_map.c
   # End Source File
   # Begin Source File
  @@ -243,7 +253,6 @@
   SOURCE=..\common\jk_worker.h
   # End Source File
   # End Group
  -
   # Begin Group "Resource Files"
   
   # PROP Default_Filter "ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe"
  
  
  

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