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 2004/02/27 19:48:22 UTC
cvs commit: jakarta-tomcat-connectors/jk/native2/server/isapi isapi.dsp isapi.dsw
mturk 2004/02/27 10:48:22
Modified: jk/native2/server/isapi isapi.dsp isapi.dsw
Log:
Remove unneeded link targets to apr libraries.
Use the dependencies instead.
Revision Changes Path
1.25 +4 -4 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.24
retrieving revision 1.25
diff -u -r1.24 -r1.25
--- isapi.dsp 3 Feb 2004 16:27:56 -0000 1.24
+++ isapi.dsp 27 Feb 2004 18:48:22 -0000 1.25
@@ -55,7 +55,7 @@
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 apriconv.lib ws2_32.lib wsock32.lib advapi32.lib pcre.lib pcreposix.lib /nologo /dll /debug /machine:I386 /out:"Debug/isapi_redirector2.dll" /pdbtype:sept /libpath:"..\..\srclib\apr\libD" /libpath:"..\..\srclib\apr-util\libD" /libpath:"..\..\srclib\apr-iconv\libD" /libpath:"..\..\srclib\pcre\libD"
+# ADD LINK32 ws2_32.lib wsock32.lib advapi32.lib /nologo /dll /debug /machine:I386 /out:"Debug/isapi_redirector2.dll" /pdbtype:sept /libpath:"..\..\srclib\apr\libD" /libpath:"..\..\srclib\apr-util\libD" /libpath:"..\..\srclib\apr-iconv\libD" /libpath:"..\..\srclib\pcre\libD"
# SUBTRACT LINK32 /nodefaultlib
!ELSEIF "$(CFG)" == "isapi - Win32 Release"
@@ -83,7 +83,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 apriconv.lib ws2_32.lib wsock32.lib advapi32.lib pcre.lib pcreposix.lib /nologo /dll /machine:I386 /out:"Release/isapi_redirector2.dll" /libpath:"..\..\srclib\apr\libR" /libpath:"..\..\srclib\apr-util\libR" /libpath:"..\..\srclib\apr-iconv\libR" /libpath:"..\..\srclib\pcre\libD"
+# ADD LINK32 ws2_32.lib wsock32.lib advapi32.lib /nologo /dll /machine:I386 /out:"Release/isapi_redirector2.dll" /libpath:"..\..\srclib\apr\libR" /libpath:"..\..\srclib\apr-util\libR" /libpath:"..\..\srclib\apr-iconv\libR" /libpath:"..\..\srclib\pcre\libD"
!ENDIF
@@ -371,7 +371,7 @@
# PROP BASE Ignore_Default_Tool 1
# PROP Ignore_Default_Tool 1
# Begin Custom Build - Creating resources from $(InputPath)
-InputDir=\WORK\PROJECTS\apache\jk2\common
+InputDir=\WRKPLACE\PROJECTS\jtc\jk\native2\common
InputPath=..\..\common\jk_logger_win32_message.mc
"..\..\common\jk_logger_win32_message.rc" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
@@ -382,7 +382,7 @@
!ELSEIF "$(CFG)" == "isapi - Win32 Release"
# Begin Custom Build - Creating resources from $(InputPath)
-InputDir=\WORK\PROJECTS\apache\jk2\common
+InputDir=\WRKPLACE\PROJECTS\jtc\jk\native2\common
InputPath=..\..\common\jk_logger_win32_message.mc
"..\..\common\jk_logger_win32_message.rc" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
1.5 +21 -0 jakarta-tomcat-connectors/jk/native2/server/isapi/isapi.dsw
Index: isapi.dsw
===================================================================
RCS file: /home/cvs/jakarta-tomcat-connectors/jk/native2/server/isapi/isapi.dsw,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- isapi.dsw 25 Feb 2004 15:10:02 -0000 1.4
+++ isapi.dsw 27 Feb 2004 18:48:22 -0000 1.5
@@ -38,6 +38,15 @@
Begin Project Dependency
Project_Dep_Name gen_uri_delims
End Project Dependency
+ Begin Project Dependency
+ Project_Dep_Name apr
+ End Project Dependency
+ Begin Project Dependency
+ Project_Dep_Name apriconv
+ End Project Dependency
+ Begin Project Dependency
+ Project_Dep_Name xml
+ End Project Dependency
}}}
###############################################################################
@@ -74,6 +83,18 @@
Package=<4>
{{{
+ Begin Project Dependency
+ Project_Dep_Name apr
+ End Project Dependency
+ Begin Project Dependency
+ Project_Dep_Name aprutil
+ End Project Dependency
+ Begin Project Dependency
+ Project_Dep_Name pcre
+ End Project Dependency
+ Begin Project Dependency
+ Project_Dep_Name pcreposix
+ End Project Dependency
}}}
###############################################################################
---------------------------------------------------------------------
To unsubscribe, e-mail: tomcat-dev-unsubscribe@jakarta.apache.org
For additional commands, e-mail: tomcat-dev-help@jakarta.apache.org