mturk 2002/09/25 00:37:54 Modified: jk/native2/server/isapi isapi.dsp Log: Add two new configurations to the build. Release Static and Debug Static, allowing compiling with the static versions of APR/APR-UTIL. Revision Changes Path 1.19 +90 -6 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.18 retrieving revision 1.19 diff -u -r1.18 -r1.19 --- isapi.dsp 8 Aug 2002 18:21:41 -0000 1.18 +++ isapi.dsp 25 Sep 2002 07:37:54 -0000 1.19 @@ -4,7 +4,7 @@ # TARGTYPE "Win32 (x86) Dynamic-Link Library" 0x0102 -CFG=isapi - Win32 Debug +CFG=isapi - Win32 Debug Static !MESSAGE This is not a valid makefile. To build this project using NMAKE, !MESSAGE use the Export Makefile command and run !MESSAGE @@ -13,12 +13,14 @@ !MESSAGE You can specify a configuration when running NMAKE !MESSAGE by defining the macro CFG on the command line. For example: !MESSAGE -!MESSAGE NMAKE /f "isapi.mak" CFG="isapi - Win32 Debug" +!MESSAGE NMAKE /f "isapi.mak" CFG="isapi - Win32 Debug Static" !MESSAGE !MESSAGE Possible choices for configuration are: !MESSAGE !MESSAGE "isapi - Win32 Release" (based on "Win32 (x86) Dynamic-Link Library") !MESSAGE "isapi - Win32 Debug" (based on "Win32 (x86) Dynamic-Link Library") +!MESSAGE "isapi - Win32 Debug Static" (based on "Win32 (x86) Dynamic-Link Library") +!MESSAGE "isapi - Win32 Release Static" (based on "Win32 (x86) Dynamic-Link Library") !MESSAGE # Begin Project @@ -82,12 +84,70 @@ # 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" # 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 Ignore_Export_Lib 0 +# PROP BASE Target_Dir "" +# PROP Use_MFC 0 +# PROP Use_Debug_Libraries 1 +# PROP Output_Dir "DebugS" +# PROP Intermediate_Dir "DebugS" +# 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 /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" /D "APR_DECLARE_STATIC" /D "APU_DECLARE_STATIC" /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" +# ADD RSC /l 0x409 /d "_DEBUG" +BSC32=bscmake.exe +# ADD BASE BSC32 /nologo +# ADD BSC32 /nologo +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" +# 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 Ignore_Export_Lib 0 +# PROP BASE Target_Dir "" +# PROP Use_MFC 0 +# PROP Use_Debug_Libraries 0 +# PROP Output_Dir "ReleaseS" +# PROP Intermediate_Dir "ReleaseS" +# 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 BASE MTL /nologo /D "NDEBUG" /mktyplib203 /win32 +# ADD MTL /nologo /D "NDEBUG" /mktyplib203 /win32 +# ADD BASE RSC /l 0x409 /d "NDEBUG" +# ADD RSC /l 0x409 /d "NDEBUG" +BSC32=bscmake.exe +# ADD BASE BSC32 /nologo +# 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" + !ENDIF # Begin Target # Name "isapi - Win32 Release" # Name "isapi - Win32 Debug" +# Name "isapi - Win32 Debug Static" +# Name "isapi - Win32 Release Static" # Begin Group "Source Files" # PROP Default_Filter "cpp;c;cxx;rc;def;r;odl;idl;hpj;bat" @@ -141,11 +201,11 @@ # End Source File # Begin Source File -SOURCE=.\jk_isapi_plugin.c +SOURCE=.\jk_iis_thread_pool.c # End Source File # Begin Source File -SOURCE=.\jk_iis_thread_pool.c +SOURCE=.\jk_isapi_plugin.c # End Source File # Begin Source File @@ -374,7 +434,7 @@ !IF "$(CFG)" == "isapi - Win32 Release" # Begin Custom Build - Creating resources from $(InputPath) -InputDir=\tomcat\jakarta-tomcat-connectors\jk\native2\common +InputDir=\WORK\apache\jakarta-tomcat-connectors\jk\native2\common InputPath=..\..\common\jk_logger_win32_message.mc "..\..\common\jk_logger_win32_message.rc" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)" @@ -386,7 +446,31 @@ # PROP Ignore_Default_Tool 1 # Begin Custom Build - Creating resources from $(InputPath) -InputDir=\tomcat\jakarta-tomcat-connectors\jk\native2\common +InputDir=\WORK\apache\jakarta-tomcat-connectors\jk\native2\common +InputPath=..\..\common\jk_logger_win32_message.mc + +"..\..\common\jk_logger_win32_message.rc" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)" + mc -h $(InputDir) -r $(InputDir) $(InputPath) + +# End Custom Build + +!ELSEIF "$(CFG)" == "isapi - Win32 Debug Static" + +# PROP BASE Ignore_Default_Tool 1 +# PROP Ignore_Default_Tool 1 +# Begin Custom Build - Creating resources from $(InputPath) +InputDir=\WORK\apache\jakarta-tomcat-connectors\jk\native2\common +InputPath=..\..\common\jk_logger_win32_message.mc + +"..\..\common\jk_logger_win32_message.rc" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)" + mc -h $(InputDir) -r $(InputDir) $(InputPath) + +# End Custom Build + +!ELSEIF "$(CFG)" == "isapi - Win32 Release Static" + +# Begin Custom Build - Creating resources from $(InputPath) +InputDir=\WORK\apache\jakarta-tomcat-connectors\jk\native2\common InputPath=..\..\common\jk_logger_win32_message.mc "..\..\common\jk_logger_win32_message.rc" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
-- To unsubscribe, e-mail: <mailto:[EMAIL PROTECTED]> For additional commands, e-mail: <mailto:[EMAIL PROTECTED]>
