tomcat-dev mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From mt...@apache.org
Subject svn commit: r1002104 - in /tomcat/jk/trunk/native: apache-1.3/Makefile.vc apache-2.0/Makefile.vc iis/Makefile.amd64 iis/Makefile.ia64 iis/Makefile.x86 iis/pcre/dftables.x86 iis/pcre/pcre.amd64 iis/pcre/pcre.ia64 iis/pcre/pcre.x86 netscape/Makefile.vc
Date Tue, 28 Sep 2010 10:36:15 GMT
Author: mturk
Date: Tue Sep 28 10:36:15 2010
New Revision: 1002104

URL: http://svn.apache.org/viewvc?rev=1002104&view=rev
Log:
Update win32 makefile flags and add .rc to the nsapi_redirect

Modified:
    tomcat/jk/trunk/native/apache-1.3/Makefile.vc
    tomcat/jk/trunk/native/apache-2.0/Makefile.vc
    tomcat/jk/trunk/native/iis/Makefile.amd64
    tomcat/jk/trunk/native/iis/Makefile.ia64
    tomcat/jk/trunk/native/iis/Makefile.x86
    tomcat/jk/trunk/native/iis/pcre/dftables.x86
    tomcat/jk/trunk/native/iis/pcre/pcre.amd64
    tomcat/jk/trunk/native/iis/pcre/pcre.ia64
    tomcat/jk/trunk/native/iis/pcre/pcre.x86
    tomcat/jk/trunk/native/netscape/Makefile.vc

Modified: tomcat/jk/trunk/native/apache-1.3/Makefile.vc
URL: http://svn.apache.org/viewvc/tomcat/jk/trunk/native/apache-1.3/Makefile.vc?rev=1002104&r1=1002103&r2=1002104&view=diff
==============================================================================
--- tomcat/jk/trunk/native/apache-1.3/Makefile.vc (original)
+++ tomcat/jk/trunk/native/apache-1.3/Makefile.vc Tue Sep 28 10:36:15 2010
@@ -60,7 +60,7 @@ BSC32_FLAGS=/nologo /o"$(OUTDIR)\mod_jk.
 BSC32_SBRS= \
 	
 LINK32=link.exe
-LINK32_FLAGS=ApacheCore.lib kernel32.lib user32.lib advapi32.lib ws2_32.lib mswsock.lib /nologo
/base:"0x6A6B0000" /subsystem:windows /dll /incremental:no /pdb:"$(OUTDIR)\mod_jk.pdb" /debug
/machine:I386 /out:"$(OUTDIR)\mod_jk.so" /implib:"$(OUTDIR)\mod_jk.lib" /libpath:"$(APACHE1_HOME)\lib"
/libpath:"$(APACHE1_HOME)\libexec" /opt:ref 
+LINK32_FLAGS=ApacheCore.lib kernel32.lib user32.lib advapi32.lib ws2_32.lib mswsock.lib $(EXTRA_LIBS)
/nologo /base:"0x6A6B0000" /subsystem:windows /dll /incremental:no /pdb:"$(OUTDIR)\mod_jk.pdb"
/debug /machine:I386 /out:"$(OUTDIR)\mod_jk.so" /implib:"$(OUTDIR)\mod_jk.lib" /libpath:"$(APACHE1_HOME)\lib"
/libpath:"$(APACHE1_HOME)\libexec" /opt:ref 
 LINK32_OBJS= \
 	"$(INTDIR)\jk_ajp12_worker.obj" \
 	"$(INTDIR)\jk_ajp13.obj" \
@@ -90,7 +90,7 @@ LINK32_OBJS= \
   $(LINK32_FLAGS) $(LINK32_OBJS)
 <<
 
-CPP_PROJ=/nologo /MD /W3 /Zi /O2 /I "..\common" /I "$(APACHE1_HOME)\include" /I "$(JAVA_HOME)\include"
/I "$(JAVA_HOME)\include\win32" /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL"
$(DEF_EAPI) /D "MOD_JK_EXPORTS" /Fo"$(INTDIR)\\" /Fd"$(INTDIR)\mod_jk_src" /FD /c 
+CPP_PROJ=-nologo -MD -W3 -O2 -Ob2 -Oy- -Zi -EHsc /I "..\common" /I "$(APACHE1_HOME)\include"
/I "$(JAVA_HOME)\include" /I "$(JAVA_HOME)\include\win32" /D "WIN32" /D "NDEBUG" /D "_WINDOWS"
/D "_MBCS" /D "_USRDLL" $(DEF_EAPI) /D "MOD_JK_EXPORTS" /Fo"$(INTDIR)\\" /Fd"$(INTDIR)\mod_jk_src"
/FD /c 
 
 .c{$(INTDIR)}.obj::
    $(CPP) @<<

Modified: tomcat/jk/trunk/native/apache-2.0/Makefile.vc
URL: http://svn.apache.org/viewvc/tomcat/jk/trunk/native/apache-2.0/Makefile.vc?rev=1002104&r1=1002103&r2=1002104&view=diff
==============================================================================
--- tomcat/jk/trunk/native/apache-2.0/Makefile.vc (original)
+++ tomcat/jk/trunk/native/apache-2.0/Makefile.vc Tue Sep 28 10:36:15 2010
@@ -79,7 +79,7 @@ BSC32_FLAGS=/nologo /o"$(OUTDIR)\mod_jk.
 BSC32_SBRS= \
 
 LINK32=link.exe
-LINK32_FLAGS=libhttpd.lib $(APR_LIB) $(APU_LIB) kernel32.lib user32.lib advapi32.lib mswsock.lib
ws2_32.lib /nologo /base:"0x6A6B0000" /subsystem:windows /dll /incremental:no /pdb:"$(OUTDIR)\mod_jk.pdb"
/debug /machine:I386 /out:"$(OUTDIR)\mod_jk.so" /implib:"$(OUTDIR)\mod_jk.lib" /libpath:"$(APACHE2_HOME)\lib"
/opt:ref
+LINK32_FLAGS=libhttpd.lib $(APR_LIB) $(APU_LIB) kernel32.lib user32.lib advapi32.lib mswsock.lib
ws2_32.lib $(EXTRA_LIBS) /nologo /base:"0x6A6B0000" /subsystem:windows /dll /incremental:no
/pdb:"$(OUTDIR)\mod_jk.pdb" /debug /machine:I386 /out:"$(OUTDIR)\mod_jk.so" /implib:"$(OUTDIR)\mod_jk.lib"
/libpath:"$(APACHE2_HOME)\lib" /opt:ref
 LINK32_OBJS= \
 	"$(INTDIR)\jk_ajp12_worker.obj" \
 	"$(INTDIR)\jk_ajp13.obj" \
@@ -113,7 +113,7 @@ LINK32_OBJS= \
 		mt -nologo -manifest $(OUTDIR)\mod_jk.manifest -outputresource:$(OUTDIR)\mod_jk.so;2
 
 
-CPP_PROJ=/nologo /MD /W3 /Zi /O2 /I "..\common" /I "$(JAVA_HOME)\include" /I "$(JAVA_HOME)\include\win32"
/I "$(APACHE2_HOME)\include" /D "NDEBUG" /D "WIN32" /D "_WINDOWS" /Fo"$(INTDIR)\\" /Fd"$(INTDIR)\mod_jk_src"
/FD /c
+CPP_PROJ=-nologo -MD -W3 -O2 -Ob2 -Oy- -Zi -EHsc /I "..\common" /I "$(JAVA_HOME)\include"
/I "$(JAVA_HOME)\include\win32" /I "$(APACHE2_HOME)\include" /D "NDEBUG" /D "WIN32" /D "_WINDOWS"
/Fo"$(INTDIR)\\" /Fd"$(INTDIR)\mod_jk_src" /FD /c
 
 .c{$(INTDIR)}.obj::
    $(CPP) @<<

Modified: tomcat/jk/trunk/native/iis/Makefile.amd64
URL: http://svn.apache.org/viewvc/tomcat/jk/trunk/native/iis/Makefile.amd64?rev=1002104&r1=1002103&r2=1002104&view=diff
==============================================================================
--- tomcat/jk/trunk/native/iis/Makefile.amd64 (original)
+++ tomcat/jk/trunk/native/iis/Makefile.amd64 Tue Sep 28 10:36:15 2010
@@ -81,7 +81,7 @@ BSC32_FLAGS=/nologo /o"$(OUTDIR)\isapi.b
 BSC32_SBRS= \
 
 LINK32=link.exe
-LINK32_FLAGS=kernel32.lib user32.lib advapi32.lib ws2_32.lib mswsock.lib strsafe.lib bufferoverflowu.lib
/nologo /dll /incremental:no /pdb:"$(OUTDIR)\isapi_redirect.pdb" /debug /machine:AMD64 /def:".\isapi.def"
/out:"$(OUTDIR)\isapi_redirect.dll" /implib:"$(OUTDIR)\isapi_redirect.lib"
+LINK32_FLAGS=kernel32.lib user32.lib advapi32.lib ws2_32.lib mswsock.lib strsafe.lib bufferoverflowu.lib
$(EXTRA_LIBS) /nologo /dll /incremental:no /pdb:"$(OUTDIR)\isapi_redirect.pdb" /debug /machine:AMD64
/def:".\isapi.def" /out:"$(OUTDIR)\isapi_redirect.dll" /implib:"$(OUTDIR)\isapi_redirect.lib"
 DEF_FILE= \
 	".\isapi.def"
 LINK32_OBJS= \
@@ -118,7 +118,7 @@ LINK32_OBJS= \
 	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 "JK_ISAPI" /D "ISAPI_EXPORTS" /D "HAS_PCRE" /D "PCRE_STATIC" $(CFLAGS) /Fo"$(INTDIR)\\"
/Fd"$(INTDIR)\isapi_redirector_src" /FD /c
+CPP_PROJ=-nologo -MD -W3 -O2 -Ob2 -Oy- -Zi -EHsc /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 "JK_ISAPI" /D "ISAPI_EXPORTS" /D "HAS_PCRE" /D "PCRE_STATIC"
$(CFLAGS) /Fo"$(INTDIR)\\" /Fd"$(INTDIR)\isapi_redirector_src" /FD /c
 
 .c{$(INTDIR)}.obj::
    $(CPP) @<<

Modified: tomcat/jk/trunk/native/iis/Makefile.ia64
URL: http://svn.apache.org/viewvc/tomcat/jk/trunk/native/iis/Makefile.ia64?rev=1002104&r1=1002103&r2=1002104&view=diff
==============================================================================
--- tomcat/jk/trunk/native/iis/Makefile.ia64 (original)
+++ tomcat/jk/trunk/native/iis/Makefile.ia64 Tue Sep 28 10:36:15 2010
@@ -81,7 +81,7 @@ BSC32_FLAGS=/nologo /o"$(OUTDIR)\isapi.b
 BSC32_SBRS= \
 	
 LINK32=link.exe
-LINK32_FLAGS=kernel32.lib user32.lib advapi32.lib ws2_32.lib mswsock.lib strsafe.lib bufferoverflowu.lib
/nologo /dll /incremental:no /pdb:"$(OUTDIR)\isapi_redirect.pdb" /debug /machine:IA64 /def:".\isapi.def"
/out:"$(OUTDIR)\isapi_redirect.dll" /implib:"$(OUTDIR)\isapi_redirect.lib" 
+LINK32_FLAGS=kernel32.lib user32.lib advapi32.lib ws2_32.lib mswsock.lib strsafe.lib bufferoverflowu.lib
$(EXTRA_LIBS) /nologo /dll /incremental:no /pdb:"$(OUTDIR)\isapi_redirect.pdb" /debug /machine:IA64
/def:".\isapi.def" /out:"$(OUTDIR)\isapi_redirect.dll" /implib:"$(OUTDIR)\isapi_redirect.lib"

 DEF_FILE= \
 	".\isapi.def"
 LINK32_OBJS= \
@@ -118,7 +118,7 @@ LINK32_OBJS= \
 	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 "JK_ISAPI" /D "ISAPI_EXPORTS" /D "HAS_PCRE" /D "PCRE_STATIC" $(CFLAGS) /Fo"$(INTDIR)\\"
/Fd"$(INTDIR)\isapi_redirector_src" /FD /c 
+CPP_PROJ=-nologo -MD -W3 -O2 -Ob2 -Oy- -Zi -EHsc /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 "JK_ISAPI" /D "ISAPI_EXPORTS" /D "HAS_PCRE" /D "PCRE_STATIC"
$(CFLAGS) /Fo"$(INTDIR)\\" /Fd"$(INTDIR)\isapi_redirector_src" /FD /c 
 
 .c{$(INTDIR)}.obj::
    $(CPP) @<<

Modified: tomcat/jk/trunk/native/iis/Makefile.x86
URL: http://svn.apache.org/viewvc/tomcat/jk/trunk/native/iis/Makefile.x86?rev=1002104&r1=1002103&r2=1002104&view=diff
==============================================================================
--- tomcat/jk/trunk/native/iis/Makefile.x86 (original)
+++ tomcat/jk/trunk/native/iis/Makefile.x86 Tue Sep 28 10:36:15 2010
@@ -76,7 +76,7 @@ BSC32_FLAGS=/nologo /o"$(OUTDIR)\isapi.b
 BSC32_SBRS= \
 	
 LINK32=link.exe
-LINK32_FLAGS=kernel32.lib user32.lib advapi32.lib ws2_32.lib mswsock.lib strsafe.lib /nologo
/base:"0x6A6B0000" /dll /incremental:no /pdb:"$(OUTDIR)\isapi_redirect.pdb" /debug /machine:I386
/def:".\isapi.def" /out:"$(OUTDIR)\isapi_redirect.dll" /implib:"$(OUTDIR)\isapi_redirect.lib"

+LINK32_FLAGS=kernel32.lib user32.lib advapi32.lib ws2_32.lib mswsock.lib strsafe.lib $(EXTRA_LIBS)
/nologo /base:"0x6A6B0000" /dll /incremental:no /pdb:"$(OUTDIR)\isapi_redirect.pdb" /debug
/machine:I386 /def:".\isapi.def" /out:"$(OUTDIR)\isapi_redirect.dll" /implib:"$(OUTDIR)\isapi_redirect.lib"

 DEF_FILE= \
 	".\isapi.def"
 LINK32_OBJS= \
@@ -113,7 +113,7 @@ LINK32_OBJS= \
 	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"
$(CFLAGS) /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "JK_ISAPI" /D "ISAPI_EXPORTS" /D "HAS_PCRE"
/D "PCRE_STATIC" /Fo"$(INTDIR)\\" /Fd"$(INTDIR)\isapi_redirector_src" /FD /c 
+CPP_PROJ=-nologo -MD -W3 -O2 -Ob2 -Oy- -Zi -EHsc /I "..\common" /I "pcre" /I "$(JAVA_HOME)\include"
/I "$(JAVA_HOME)\include\win32" $(CFLAGS) /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "JK_ISAPI"
/D "ISAPI_EXPORTS" /D "HAS_PCRE" /D "PCRE_STATIC" /Fo"$(INTDIR)\\" /Fd"$(INTDIR)\isapi_redirector_src"
/FD /c 
 
 .c{$(INTDIR)}.obj::
    $(CPP) @<<

Modified: tomcat/jk/trunk/native/iis/pcre/dftables.x86
URL: http://svn.apache.org/viewvc/tomcat/jk/trunk/native/iis/pcre/dftables.x86?rev=1002104&r1=1002103&r2=1002104&view=diff
==============================================================================
--- tomcat/jk/trunk/native/iis/pcre/dftables.x86 (original)
+++ tomcat/jk/trunk/native/iis/pcre/dftables.x86 Tue Sep 28 10:36:15 2010
@@ -37,7 +37,7 @@ BSC32_FLAGS=/nologo /o"$(OUTDIR)\dftable
 BSC32_SBRS= \
 
 LINK32=link.exe
-LINK32_FLAGS=kernel32.lib /nologo /subsystem:console /incremental:no /pdb:"$(OUTDIR)\Release\dftables.pdb"
/machine:I386 /out:"$(OUTDIR)\dftables.exe" /opt:ref
+LINK32_FLAGS=kernel32.lib $(EXTRA_LIBS) /nologo /subsystem:console /incremental:no /pdb:"$(OUTDIR)\Release\dftables.pdb"
/machine:I386 /out:"$(OUTDIR)\dftables.exe" /opt:ref
 LINK32_OBJS= \
 	"$(INTDIR)\dftables.obj"
 
@@ -46,7 +46,7 @@ LINK32_OBJS= \
   $(LINK32_FLAGS) $(LINK32_OBJS)
 <<
 
-CPP_PROJ=/nologo /MD /W3 /O2 /D "_WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /Fo"$(INTDIR)\\"
/Fd"$(INTDIR)\dftables" /FD /wd4996 /c
+CPP_PROJ=-nologo -MD -W3 -O2 -Ob2 -Oy- -Zi -EHsc /D "_WIN32" /D "NDEBUG" /D "_CONSOLE" /D
"_MBCS" /Fo"$(INTDIR)\\" /Fd"$(INTDIR)\dftables" /FD /wd4996 /c
 
 .c{$(INTDIR)}.obj::
    $(CPP) @<<

Modified: tomcat/jk/trunk/native/iis/pcre/pcre.amd64
URL: http://svn.apache.org/viewvc/tomcat/jk/trunk/native/iis/pcre/pcre.amd64?rev=1002104&r1=1002103&r2=1002104&view=diff
==============================================================================
--- tomcat/jk/trunk/native/iis/pcre/pcre.amd64 (original)
+++ tomcat/jk/trunk/native/iis/pcre/pcre.amd64 Tue Sep 28 10:36:15 2010
@@ -54,7 +54,7 @@ BSC32_FLAGS=/nologo /o"$(OUTDIR)\pcre.bs
 BSC32_SBRS= \
 
 LIB32=link.exe -lib
-LIB32_FLAGS=/nologo /out:"$(OUTDIR)\pcre.lib"
+LIB32_FLAGS=kernel32.lib $(EXTRA_LIBS) /nologo /out:"$(OUTDIR)\pcre.lib"
 LIB32_OBJS= \
 	"$(INTDIR)\get.obj" \
 	"$(INTDIR)\maketables.obj" \
@@ -66,7 +66,7 @@ LIB32_OBJS= \
   $(LIB32_FLAGS) $(DEF_FLAGS) $(LIB32_OBJS)
 <<
 
-CPP_PROJ=/nologo /MD /W3 /Zi /O2 /D "_WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_AMD64_=1" -DWIN64
/D "_WIN64" /Wp64 /FIPRE64PRA.H /D "PCRE_STATIC" /Fo"$(INTDIR)\\" /Fd"$(INTDIR)\pcre_src"
/FD /c
+CPP_PROJ=-nologo -MD -W3 -O2 -Ob2 -Oy- -Zi -EHsc /D "_WIN32" /D "NDEBUG" /D "_WINDOWS" /D
"_AMD64_=1" -DWIN64 /D "_WIN64" /Wp64 /FIPRE64PRA.H /D "PCRE_STATIC" /Fo"$(INTDIR)\\" /Fd"$(INTDIR)\pcre_src"
/FD /c
 
 .c{$(INTDIR)}.obj::
    $(CPP) @<<

Modified: tomcat/jk/trunk/native/iis/pcre/pcre.ia64
URL: http://svn.apache.org/viewvc/tomcat/jk/trunk/native/iis/pcre/pcre.ia64?rev=1002104&r1=1002103&r2=1002104&view=diff
==============================================================================
--- tomcat/jk/trunk/native/iis/pcre/pcre.ia64 (original)
+++ tomcat/jk/trunk/native/iis/pcre/pcre.ia64 Tue Sep 28 10:36:15 2010
@@ -50,7 +50,7 @@ CLEAN :
     if not exist "$(OUTDIR)/$(NULL)" mkdir "$(OUTDIR)"
 
 BSC32=bscmake.exe
-BSC32_FLAGS=/nologo /o"$(OUTDIR)\pcre.bsc"
+BSC32_FLAGS=kernel32.lib $(EXTRA_LIBS) /nologo /o"$(OUTDIR)\pcre.bsc"
 BSC32_SBRS= \
 
 LIB32=link.exe -lib
@@ -66,7 +66,7 @@ LIB32_OBJS= \
   $(LIB32_FLAGS) $(DEF_FLAGS) $(LIB32_OBJS)
 <<
 
-CPP_PROJ=/nologo /MD /W3 /Zi /O2 /D "_WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_IA64_=1" -DWIN64
/D "_WIN64" /Wp64 /FIPRE64PRA.H /D "PCRE_STATIC" /Fo"$(INTDIR)\\" /Fd"$(INTDIR)\pcre_src"
/FD /c
+CPP_PROJ=-nologo -MD -W3 -O2 -Ob2 -Oy- -Zi -EHsc /D "_WIN32" /D "NDEBUG" /D "_WINDOWS" /D
"_IA64_=1" -DWIN64 /D "_WIN64" /Wp64 /FIPRE64PRA.H /D "PCRE_STATIC" /Fo"$(INTDIR)\\" /Fd"$(INTDIR)\pcre_src"
/FD /c
 
 .c{$(INTDIR)}.obj::
    $(CPP) @<<

Modified: tomcat/jk/trunk/native/iis/pcre/pcre.x86
URL: http://svn.apache.org/viewvc/tomcat/jk/trunk/native/iis/pcre/pcre.x86?rev=1002104&r1=1002103&r2=1002104&view=diff
==============================================================================
--- tomcat/jk/trunk/native/iis/pcre/pcre.x86 (original)
+++ tomcat/jk/trunk/native/iis/pcre/pcre.x86 Tue Sep 28 10:36:15 2010
@@ -52,7 +52,7 @@ BSC32_FLAGS=/nologo /o"$(OUTDIR)\pcre.bs
 BSC32_SBRS= \
 
 LIB32=link.exe -lib
-LIB32_FLAGS=/nologo /out:"$(OUTDIR)\pcre.lib"
+LIB32_FLAGS=kernel32.lib $(EXTRA_LIBS) /nologo /out:"$(OUTDIR)\pcre.lib"
 LIB32_OBJS= \
 	"$(INTDIR)\get.obj" \
 	"$(INTDIR)\maketables.obj" \
@@ -64,7 +64,7 @@ LIB32_OBJS= \
   $(LIB32_FLAGS) $(DEF_FLAGS) $(LIB32_OBJS)
 <<
 
-CPP_PROJ=/nologo /MD /W3 /Zi /O2 /D "_WIN32" /D "NDEBUG" /D "_WINDOWS" /D "PCRE_STATIC" /Fo"$(INTDIR)\\"
/Fd"$(INTDIR)\pcre_src" /FD /c
+CPP_PROJ=-nologo -MD -W3 -O2 -Ob2 -Oy- -Zi -EHsc /D "_WIN32" /D "NDEBUG" /D "_WINDOWS" /D
"PCRE_STATIC" /Fo"$(INTDIR)\\" /Fd"$(INTDIR)\pcre_src" /FD /c
 
 .c{$(INTDIR)}.obj::
    $(CPP) @<<

Modified: tomcat/jk/trunk/native/netscape/Makefile.vc
URL: http://svn.apache.org/viewvc/tomcat/jk/trunk/native/netscape/Makefile.vc?rev=1002104&r1=1002103&r2=1002104&view=diff
==============================================================================
--- tomcat/jk/trunk/native/netscape/Makefile.vc (original)
+++ tomcat/jk/trunk/native/netscape/Makefile.vc Tue Sep 28 10:36:15 2010
@@ -67,7 +67,7 @@ CLEAN :
     if not exist "$(OUTDIR)/$(NULL)" mkdir "$(OUTDIR)"
 
 CPP=cl.exe
-CPP_PROJ=/nologo /MD /W3 /Zi /O2 /I "..\common" /I "$(SUNONE_HOME)\include" /I "$(JAVA_HOME)\include"
/I "$(JAVA_HOME)\include\win32" /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL"
/D "JK_NSAPI" /D "NSAPI_EXPORTS" /D "XP_WIN32" /D "MCC_HTTPD" /D "SPAPI20" /Fo"$(INTDIR)\\"
/Fd"$(OUTDIR)\nsapi_redirect_src" /FD /c 
+CPP_PROJ=-nologo -MD -W3 -O2 -Ob2 -Oy- -Zi -EHsc /I "..\common" /I "$(SUNONE_HOME)\include"
/I "$(JAVA_HOME)\include" /I "$(JAVA_HOME)\include\win32" /D "WIN32" /D "NDEBUG" /D "_WINDOWS"
/D "_MBCS" /D "_USRDLL" /D "JK_NSAPI" /D "NSAPI_EXPORTS" /D "XP_WIN32" /D "MCC_HTTPD" /D "SPAPI20"
/Fo"$(INTDIR)\\" /Fd"$(OUTDIR)\nsapi_redirect_src" /FD /c 
 
 .c{$(INTDIR)}.obj::
    $(CPP) @<<
@@ -102,12 +102,13 @@ CPP_PROJ=/nologo /MD /W3 /Zi /O2 /I "..\
 MTL=midl.exe
 MTL_PROJ=/nologo /D "NDEBUG" /mktyplib203 /win32 
 RSC=rc.exe
+RSC_PROJ=/l 0x409 /fo"$(INTDIR)\jk.res" /i "..\common" /d "JK_NSAPI"  /d "NDEBUG" 
 BSC32=bscmake.exe
 BSC32_FLAGS=/nologo /o"$(OUTDIR)\nsapi.bsc" 
 BSC32_SBRS= \
 	
 LINK32=link.exe
-LINK32_FLAGS=ns-httpd40.lib kernel32.lib user32.lib advapi32.lib ws2_32.lib mswsock.lib /nologo
/base:"0x6A6B0000" /dll /incremental:no /pdb:"$(OUTDIR)\nsapi_redirect.pdb" /debug /machine:I386
/out:"$(OUTDIR)\nsapi_redirect.dll" /implib:"$(OUTDIR)\nsapi_redirect.lib" /libpath:"$(SUNONE_HOME)\lib"

+LINK32_FLAGS=ns-httpd40.lib kernel32.lib user32.lib advapi32.lib ws2_32.lib mswsock.lib $(EXTRA_LIBS)
/nologo /base:"0x6A6B0000" /dll /incremental:no /pdb:"$(OUTDIR)\nsapi_redirect.pdb" /debug
/machine:I386 /out:"$(OUTDIR)\nsapi_redirect.dll" /implib:"$(OUTDIR)\nsapi_redirect.lib" /libpath:"$(SUNONE_HOME)\lib"

 LINK32_OBJS= \
 	"$(INTDIR)\jk_ajp12_worker.obj" \
 	"$(INTDIR)\jk_ajp13.obj" \
@@ -130,6 +131,7 @@ LINK32_OBJS= \
 	"$(INTDIR)\jk_uri_worker_map.obj" \
 	"$(INTDIR)\jk_url.obj" \
 	"$(INTDIR)\jk_util.obj" \
+	"$(INTDIR)\jk.res" \
 	"$(INTDIR)\jk_worker.obj"
 
 "$(OUTDIR)\nsapi_redirect.dll" : "$(OUTDIR)" $(DEF_FILE) $(LINK32_OBJS)
@@ -141,6 +143,12 @@ LINK32_OBJS= \
 
 
 !IF "$(CFG)" == "nsapi - Win32 Release"
+SOURCE=..\common\jk.rc
+
+"$(INTDIR)\jk.res" : $(SOURCE) "$(INTDIR)"
+	$(RSC) $(RSC_PROJ) $(SOURCE)
+
+
 SOURCE=..\common\jk_ajp12_worker.c
 
 "$(INTDIR)\jk_ajp12_worker.obj" : $(SOURCE) "$(INTDIR)"



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


Mime
View raw message